bug fix

yufongpeng · Jan 10, 2024 · 04e0f94 · 04e0f94
1 parent b485eb9
commit 04e0f94
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 342 deletions.
diff --git a/src/io.jl b/src/io.jl
@@ -216,8 +216,8 @@ end
 
 function write(file::String, qt::Quantification{A}; delim = '\t') where A
  mkpath(file)
- ChemistryQuantitativeAnalysis.write(joinpath(file, "batch.batch"), qt.batch; delim)
- JLD2.save_object(joinpath(file, "config.jld2"), set!(copy(qt.config), :analytetype, A))
+ isdefined(qt, :batch) && ChemistryQuantitativeAnalysis.write(joinpath(file, "batch.batch"), qt.batch; delim)
+ isdefined(qt, :config) && JLD2.save_object(joinpath(file, "config.jld2"), set!(copy(qt.config), :analytetype, A))
 end
 
 data_extension(::PreIS, files::Vararg{String}) = string(joinpath(files...), ".preis")
@@ -334,7 +334,7 @@ end
 
 function read_quantification(file::String)
  endswith(file, ".qt") || throw(ArgumentError("The file is not a valid Quantification directory"))
- config = JLD2.load_object(joinpath(file, "config.jld2"))
+ config = in("config.jld2", readdir(file)) ? JLD2.load_object(joinpath(file, "config.jld2")) : return Quantification()
  batch = ChemistryQuantitativeAnalysis.read(joinpath(file, "batch.batch"), Table; analytetype = config[:analytetype])
  Quantification(batch, delete!(config, :analytetype))
 end

diff --git a/test/data/complete.project/appendix.jld2 b/test/data/complete.project/appendix.jld2
diff --git a/test/data/complete.project/data/1.preis/config.jld2 b/test/data/complete.project/data/1.preis/config.jld2
diff --git a/test/data/complete.project/data/2.qcd/raw.mrm/config.jld2 b/test/data/complete.project/data/2.qcd/raw.mrm/config.jld2
diff --git a/test/data/complete.project/data/3.sdd/raw.mrm/config.jld2 b/test/data/complete.project/data/3.sdd/raw.mrm/config.jld2
diff --git a/test/data/complete.project/quantification.qt/batch.batch/method.mt/config.txt b/test/data/complete.project/quantification.qt/batch.batch/method.mt/config.txt
@@ -5,4 +5,3 @@ area
 \t
 
 [pointlevel]
-1
diff --git a/test/data/complete.project/quantification.qt/config.jld2 b/test/data/complete.project/quantification.qt/config.jld2
diff --git a/test/data/complete.project/rt_corrections.jld2 b/test/data/complete.project/rt_corrections.jld2
diff --git a/test/data/project.project/appendix.jld2 b/test/data/project.project/appendix.jld2
diff --git a/test/data/project.project/methods.jld2 b/test/data/project.project/methods.jld2
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/1.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/1.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/2.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/2.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/3.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/3.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/4.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/4.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/5.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/5.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/6.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/6.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/calibration/7.scal/config.txt b/test/data/project.project/quantification.qt/batch.batch/calibration/7.scal/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/config.txt b/test/data/project.project/quantification.qt/batch.batch/config.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/method.mt/analytetable.txt b/test/data/project.project/quantification.qt/batch.batch/method.mt/analytetable.txt
diff --git a/test/data/project.project/quantification.qt/batch.batch/method.mt/config.txt b/test/data/project.project/quantification.qt/batch.batch/method.mt/config.txt
diff --git a/.../project.project/quantification.qt/batch.batch/method.mt/true_concentration.dt/config.txt b/.../project.project/quantification.qt/batch.batch/method.mt/true_concentration.dt/config.txt
diff --git a/...a/project.project/quantification.qt/batch.batch/method.mt/true_concentration.dt/table.txt b/...a/project.project/quantification.qt/batch.batch/method.mt/true_concentration.dt/table.txt
diff --git a/test/data/project.project/quantification.qt/config.jld2 b/test/data/project.project/quantification.qt/config.jld2