From ca58aa4f9d94d461dfa6da4f9ef56da68b1a8dc4 Mon Sep 17 00:00:00 2001
From: Chris Myers <myers@ece.utah.edu>
Date: Sun, 12 Apr 2020 15:17:45 -0600
Subject: [PATCH] Fixed an issue with math flattening

---
 .../ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java b/dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java
index d6a1d9ce5..3e534ec7a 100644
--- a/dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java
+++ b/dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/parser/BioModel.java
@@ -7159,6 +7159,7 @@ public class BioModel extends CoreObservable{
 		s = s.replace("/"," / ");
 		s = s.replace("-"," - ");
 		s = s.replace("%"," % ");
+		s = s.replace("^"," ^ ");
 		s = s.replace("&&"," && ");
 		s = s.replace("||"," || ");
 		s = s.replace(">", " > ").replace("> =",">=");
@@ -7171,6 +7172,7 @@ public class BioModel extends CoreObservable{
 		do { 
 			olds = s;
 			s = s.replace("," + origVar + ",", "," + newVar + ",");
+			s = s.replace(" " + origVar + ",", " " + newVar + ",");
 			s = s.replace(" " + origVar + " ", " " + newVar + " ");
 			s = s.replace("," + origVar + ")", "," + newVar + ")");
 			s = s.replace(" " + origVar + "(", " " + newVar + "(");