From 5c40dcd957530eb297f216941136bbe6f1b1a109 Mon Sep 17 00:00:00 2001
From: axelvonkamp <axelk1@gmx.de>
Date: Fri, 26 Jan 2024 08:56:56 +0100
Subject: [PATCH] fix parsing problem

---
 cnapy/gui_elements/mcs_dialog.py | 3 ---
 environment.yml                  | 2 +-
 recipes/linux/meta.yaml          | 2 +-
 recipes/noarch/meta.yaml         | 2 +-
 recipes/win/meta.yaml            | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cnapy/gui_elements/mcs_dialog.py b/cnapy/gui_elements/mcs_dialog.py
index c4938084..29ec5551 100644
--- a/cnapy/gui_elements/mcs_dialog.py
+++ b/cnapy/gui_elements/mcs_dialog.py
@@ -318,7 +318,6 @@ def compute_optlang(self):
             for i in range(0, rows):
                 p1 = self.target_list.cellWidget(i, 0).text()
                 p2 = self.target_list.cellWidget(i, 1).text()
-                p2 = p2.replace(" - ", " + -")  # Clunky fix to allow "-" in equations
                 if len(p1) > 0 and len(p2) > 0:
                     if self.target_list.cellWidget(i, 2).currentText() == '≤':
                         p3 = "<="
@@ -351,9 +350,7 @@ def compute_optlang(self):
             desired_dict = dict()
             for i in range(0, rows):
                 p1 = self.desired_list.cellWidget(i, 0).text()
-                p1 = p1.replace(" - ", " + -")
                 p2 = self.desired_list.cellWidget(i, 1).text()
-                p2 = p2.replace(" - ", " + -")  # Clunky fix to allow "-" in equations
                 if len(p1) > 0 and len(p2) > 0:
                     if self.desired_list.cellWidget(i, 2).currentText() == '≤':
                         p3 = "<="
diff --git a/environment.yml b/environment.yml
index 9aa2b008..d191fde1 100644
--- a/environment.yml
+++ b/environment.yml
@@ -21,7 +21,7 @@ dependencies:
   - requests=2.28
   - psutil=5.9
   - efmtool_link=0.0.4
-  - optlang_enumerator>=0.0.8
+  - optlang_enumerator>=0.0.9
   - straindesign>=1.9
   - nest-asyncio
   - gurobi
diff --git a/recipes/linux/meta.yaml b/recipes/linux/meta.yaml
index 7bdce832..77b09822 100644
--- a/recipes/linux/meta.yaml
+++ b/recipes/linux/meta.yaml
@@ -31,7 +31,7 @@ requirements:
     - requests=2.28
     - psutil=5.9
     - efmtool_link=0.0.4
-    - optlang_enumerator>=0.0.8
+    - optlang_enumerator>=0.0.9
     - straindesign>=1.9
     - gurobi
     - cplex
diff --git a/recipes/noarch/meta.yaml b/recipes/noarch/meta.yaml
index 3e0cbca8..9fb6bed6 100644
--- a/recipes/noarch/meta.yaml
+++ b/recipes/noarch/meta.yaml
@@ -32,7 +32,7 @@ requirements:
     - requests=2.28
     - psutil=5.9
     - efmtool_link=0.0.4
-    - optlang_enumerator>=0.0.8
+    - optlang_enumerator>=0.0.9
     - straindesign>=1.9
     - nest-asyncio
     - gurobi
diff --git a/recipes/win/meta.yaml b/recipes/win/meta.yaml
index 943990f0..1b3da778 100644
--- a/recipes/win/meta.yaml
+++ b/recipes/win/meta.yaml
@@ -32,7 +32,7 @@ requirements:
     - requests=2.28
     - psutil=5.9
     - efmtool_link=0.0.4
-    - optlang_enumerator>=0.0.8
+    - optlang_enumerator>=0.0.9
     - straindesign>=1.9
     - nest-asyncio
     - gurobi