Merge branch 'master' of git+ssh://gforge/gitroot/biocham/biocham

numerical_simulation.pl

@@ -285,6 +285,11 @@ convert_name(Parameter, p(ParameterIndex)) :-
   ).
 
 
+convert_expression([Object], IndexedExpression) :-
+  !,
+  convert_name(Object, IndexedExpression).
+
+
 convert_expression(if Condition then IfTrue else IfFalse, IndexedExpression) :-
   !,
   convert_condition(Condition, IndexedCondition),

reaction_rules.pl

@@ -173,7 +173,7 @@ condition(not Condition) :-
 
 
 arithmetic_expression([A]) :-
-  arithmetic_expression(A).
+  object(A).
 
 arithmetic_expression(+ ArithmeticExpression0) :-
   arithmetic_expression(ArithmeticExpression0).
@@ -238,7 +238,7 @@ arithmetic_expression(Number) :-
   number(Number).
 
 arithmetic_expression(Name) :-
-  name(Name).
+  object(Name).
 
 
 patch_arithmetic_expression(