use annotations to store compiled form of conservations

conservation_laws.pl

@@ -31,15 +31,16 @@ add_conservation(Conservation) :-
     a warning.'
   ),
   solution_to_conservation(Conservation, C),
-  add_item(conservation, C).
+  add_item(conservation, [], Conservation, Id),
+  set_annotation(Id, conservation_list, C).
 
 
 delete_conservation(Conservation) :-
   biocham_command,
   type(Conservation, solution),
   doc('removes the given mass conservation law.'),
-  solution_to_conservation(Conservation, C),
-  find_item([model: current_model, id: Id, type: conservation, item: C]),
+  find_item(
+    [model: current_model, id: Id, type: conservation, item: Conservation]),
   delete_item(Id).
 
 
@@ -65,7 +66,10 @@ check_conservations :-
     (see also \\command{add_conservation/1}).'
   ),
   forall(
-    item([model: current_model, kind: conservation, item: C]),
+    (
+      item([model: current_model, kind: conservation, id: Id]),
+      get_annotation(Id, conservation_list, C)
+    ),
     check_conservation(C)
   ).
 

conservation_laws.plt

@@ -9,10 +9,11 @@ test(
    [
       setup(models:clear_model),
       cleanup(models:clear_model),
-      true(Conservations == [[1*'a-a', 2*'a']])
+      forall(member(Input, ['a-a' + 2*'a', 'b', 'a' + 'b'])),
+      true(Conservations == [Input])
    ]
 ) :-
-   command(add_conservation(a-a + 2*a)),
+   command(add_conservation(Input)),
    all_items([model: current_model, kind: conservation], Conservations).
 
 %%% FIXME should test that conservations are properly used for numerical
@@ -23,7 +24,7 @@ test(
    [
       setup(set_some_conservations),
       cleanup(models:clear_model),
-      true(Conservations == [[1*'a-a', 2*'a'], [1*'c-c', 2*'c']])
+      true(Conservations == ['a-a'+2*a,'c-c'+2*c])
    ]
 ) :-
    command(delete_conservation(b-b + 2*b)),
@@ -48,7 +49,7 @@ test(
       setup(set_some_conservations),
       cleanup(models:clear_model),
       true(Conservations ==
-        '[0] [1*a-a,2*a]\n[1] [1*b-b,2*b]\n[2] [1*c-c,2*c]\n')
+        '[0] a-a+2*a\n[1] b-b+2*b\n[2] c-c+2*c\n')
    ]
 ) :-
   with_output_to(atom(Conservations), command(list_conservations)).