fix test

hetalang · Feb 22, 2022 · 219c695 · 219c695
1 parent 4ffd1fd
commit 219c695
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.6.11
 
+- optimize saving_generator in julia export
 - Implement `include ... type table`
 - Implement export to CSV and other tabular formats
 

diff --git a/cases/0-hello-world/master/mm_julia/model.jl b/cases/0-hello-world/master/mm_julia/model.jl
@@ -70,6 +70,15 @@ end
 
 ### output function
 function mm_saving_generator_(outputIds::Vector{Symbol})
+    # XXX: currently force amounts: s1_, s2_ are not supported
+    __actual_indexes__ = indexin(outputIds, [:default_comp,:S,:P,:r1,])
+    # check nothing in actual_indexes
+    wrongIndexes = findall(x -> x===nothing, __actual_indexes__)
+    if length(wrongIndexes) > 0
+      wrongIds = outputIds[wrongIndexes]
+      throw("Wrong identifiers: $(wrongIds)")
+    end
+
     function saving_(u, t, integrator)
         cons = integrator.p.constants
         (default_comp,) = integrator.p.static
@@ -82,8 +91,7 @@ function mm_saving_generator_(outputIds::Vector{Symbol})
 
         # force amount
 
-        d = Base.@locals
-        return [d[id] for id in outputIds]
+        return [default_comp,S,P,r1,][__actual_indexes__]
     end
 end