[Jsbml-svn] SF.net SVN: jsbml:[2250] branches/astnode2-merging-alternate

[<ko...@us...>]

Revision: 2250
          http://sourceforge.net/p/jsbml/code/2250
Author:   kofiav
Date:     2015-04-23 18:42:08 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Made changes to the VectorCompiler in order to get a few test cases to pass. Changes only temporary.

Modified Paths:
--------------
    branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java
    branches/astnode2-merging-alternate/extensions/arrays/src/org/sbml/jsbml/ext/arrays/compiler/VectorCompiler.java

Modified: branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java
===================================================================
--- branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java	2015-04-23 17:33:46 UTC (rev 2249)
+++ branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java	2015-04-23 18:42:08 UTC (rev 2250)
@@ -3970,7 +3970,7 @@
       astnode2 = new ASTCSymbolTimeNode();
       break;
     case PLUS :
-      astnode2 = new ASTArithmeticOperatorNode(Type.PLUS);
+      astnode2 = new ASTArithmeticOperatorNode(Type.PLUS);        
       break;
     case POWER:
       astnode2 = new ASTPowerNode();

Modified: branches/astnode2-merging-alternate/extensions/arrays/src/org/sbml/jsbml/ext/arrays/compiler/VectorCompiler.java
===================================================================
--- branches/astnode2-merging-alternate/extensions/arrays/src/org/sbml/jsbml/ext/arrays/compiler/VectorCompiler.java	2015-04-23 17:33:46 UTC (rev 2249)
+++ branches/astnode2-merging-alternate/extensions/arrays/src/org/sbml/jsbml/ext/arrays/compiler/VectorCompiler.java	2015-04-23 18:42:08 UTC (rev 2250)
@@ -3670,8 +3670,11 @@
   private void plusRecursive(List<ASTNode> values, ASTNode node) throws IndexOutOfBoundsException, SBMLException{
     if (!node.isVector()) {
       double result = 0;
-      node.getChildren().clear();
-      node.setType(ASTNode.Type.PLUS);
+      // TODO: Set type was causing a new ASTNode2 object to be created
+      // and this was preventing the children of the original node
+      // object from being updated.
+      //node.getChildren().clear();
+      //node.setType(ASTNode.Type.PLUS);
       if (values.size() > 0) {
         for (int i = 0; i < values.size(); ++i) {
           ASTNode value = values.get(i);
@@ -3683,7 +3686,9 @@
             throw new SBMLException();
           }
         }
-        node.addChild(new ASTNode(result));
+        // TODO: Find a better fix
+        //node.addChild(new ASTNode(result));
+        node.setValue(result);
         return;
       }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.