remove whitespaces from df colnames

hetalang · Dec 12, 2023 · acf9556 · acf9556
1 parent cd818a0
commit acf9556
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/src/measurements.jl b/src/measurements.jl
@@ -162,7 +162,7 @@ function read_measurements(filepath::String, sheet=1; kwargs...)
   else  
     error("Extension $ext is not supported.")
   end
-  return df
+  return sanitizenames!(df)
 end
 
 function assert_measurements(df)

diff --git a/src/monte_carlo.jl b/src/monte_carlo.jl
@@ -474,4 +474,4 @@ Arguments:
 
 - `filepath`: path to the file with pre-generated parameters
 """
-read_mcvecs(filepath::String) = DataFrame(CSV.File(filepath; typemap=Dict(Int => Float64)))
+read_mcvecs(filepath::String) = sanitizenames!(DataFrame(CSV.File(filepath; typemap=Dict(Int => Float64))))
diff --git a/src/scenario.jl b/src/scenario.jl
@@ -245,7 +245,7 @@ function read_scenarios(filepath::String, sheet=1; kwargs...)
   else  
     error("Extension $ext is not supported.")
   end
-  return df
+  return sanitizenames!(df)
 end
 
 function assert_scenarios(df)

diff --git a/src/utils.jl b/src/utils.jl
@@ -91,4 +91,6 @@ function bool(s::AbstractString)
   s == "FALSE" && return false
   return parse(Bool, s)
 end
-bool(b::Bool) = b
+bool(b::Bool) = b
+
+sanitizenames!(df::DataFrame) = rename!(df, strip.(names(df)))
diff --git a/test/examples/single_comp/scenarios_table.csv b/test/examples/single_comp/scenarios_table.csv
@@ -1,2 +1,2 @@
-id,parameters.k1,saveat[],tspan
+id,parameters.k1, saveat[],tspan
 scn3,0.017,12;17;30:10:50;60:20:120,150
diff --git a/test/single_comp_test.jl b/test/single_comp_test.jl
@@ -46,7 +46,8 @@ cs3 = sim(scenarios(platform)[:scn3])
 @test length(parameters(cs1))==0
 @test parameters(last(cs2[:one]))[:k1] == 0.03
 @test parameters(scenarios(platform)[:scn3])[:k1] == 0.017
-@test times(cs3) == [12.,17.,30.,40.,50.,60.,80.,100.,120.]
+# tests both saveat times and sanitize whitespaces in colnames
+@test times(cs3) == [12.,17.,30.,40.,50.,60.,80.,100.,120.] 
 
 # Monte-Carlo simulation tests
 mciter = 100