krlhBlupine/iBioSim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/MyersResearchGroup/iBioSim

Browse source
This commit is contained in:
Chris Myers 2024-11-26 20:28:24 -07:00
commit d4d40a9084
38 changed files with 15112 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java
View file

@ -13,7 +13,7 @@
*******************************************************************************/
package edu.utah.ece.async.ibiosim.dataModels.biomodel.parser;
import java.io.File;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
@ -6399,7 +6399,7 @@ public class BioModel extends CoreObservable{
}
}
private ArrayList<String> getListOfSubmodels() throws XMLStreamException, IOException, BioSimException {
public ArrayList<String> getListOfSubmodels() throws XMLStreamException, IOException, BioSimException { // Changed private to public (Lukas)
ArrayList<String> comps = new ArrayList<String>();
if (this.getGridEnabledFromFile(filename.replace(".gcm",".xml"))) {

3
dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/util/SBMLutilities.java
View file

@ -1969,7 +1969,8 @@ public class SBMLutilities extends CoreObservable
{
String leftStr = convertMath2PrismProperty(math.getLeftChild());
String rightStr = convertMath2PrismProperty(math.getRightChild());
return "(" + leftStr + " ^ " + rightStr + ")";
//return "(" + leftStr + " ^ " + rightStr + ")";
return "pow(" + leftStr + " , " + rightStr + ")";
}
else if (math.getType() == ASTNode.Type.RATIONAL)
{