flags

uuverifiers · Jun 7, 2024 · c1419ca · c1419ca
1 parent b804e23
commit c1419ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/ostrich b/ostrich
@@ -21,7 +21,7 @@ ostrichParams=""
 
 for p; do
     case "$p" in
-        [+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh  | -regexTranslator=* | [+-]backwardOnly | [+-]forwardOnly | [+-]forwardBackward)
+        [+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh  | -regexTranslator=* | [+-]forwardPropagation | [+-]backwardPropagation | [+-]nielsenSplitter)
             if [ x"$ostrichParams" = x"" ]; then
                 ostrichParams=$p
             else

diff --git a/ostrich-client b/ostrich-client
@@ -94,7 +94,7 @@ until [ $success -eq 0 ]; do
 
         for var; do
 	    case "$var" in
-                [+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh | -regexTranslator=*)
+                [+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh | -regexTranslator=* | [+-]forwardPropagation | [+-]backwardPropagation | [+-]nielsenSplitter)
                     if [ x"$ostrichParams" = x"" ]; then
                         ostrichParams=$var
                     else

diff --git a/src/main/scala/ostrich/OstrichMain.scala b/src/main/scala/ostrich/OstrichMain.scala
@@ -64,6 +64,8 @@ object OstrichMain {
 
 object PortfolioSetup {
 
+  private val ostrichStringTheory =
+    "ostrich.OstrichStringTheory"
   private val ceaStringTheory =
     "ostrich.cesolver.stringtheory.CEStringTheory"
 
@@ -74,33 +76,31 @@ object PortfolioSetup {
       val strategies =
         List(
           ParallelFileProver.Configuration(
-          baseSettings,
-          "-stringSolver=" +
-            Param.STRING_THEORY_DESC(baseSettings),
-          1000000000,
-          2000),
+            Param.STRING_THEORY_DESC.set(baseSettings, ostrichStringTheory),
+            f"-stringSolver=$ostrichStringTheory",
+            1000000000,
+            2000),
           ParallelFileProver.Configuration(
             Param.STRING_THEORY_DESC.set(
               baseSettings,
-              Param.STRING_THEORY_DESC.defau),
-            "-stringSolver=" +
-              Param.STRING_THEORY_DESC.defau,
+              ceaStringTheory),
+            "+cea",
+            1000000000,
+            2000),
+          ParallelFileProver.Configuration(
+            Param.STRING_THEORY_DESC.set(baseSettings,
+              ostrichStringTheory + ":+forwardPropagation,+backwardPropagation,-nielsenSplitter"),
+            f"-stringSolver=$ostrichStringTheory:+forwardPropagation,+backwardPropagation,-nielsenSplitter",
             1000000000,
             2000),
           ParallelFileProver.Configuration(
             Param.STRING_THEORY_DESC.set(
               baseSettings,
-              ceaStringTheory),
+              Param.STRING_THEORY_DESC.defau),
             "-stringSolver=" +
-              ceaStringTheory,
+              Param.STRING_THEORY_DESC.defau,
             1000000000,
-            2000),
-            ParallelFileProver.Configuration(
-          Param.STRING_THEORY_DESC.set(baseSettings, Param.STRING_THEORY_DESC(baseSettings) + ":+forwardPropagation,+backwardPropagation,-nielsenSplitter"),
-          "-stringSolver=" +
-            Param.STRING_THEORY_DESC(baseSettings) + ":+forwardPropagation,+backwardPropagation",
-          1000000000,
-          2000))
+            2000))
       ParallelFileProver(createReader,
         timeout,
         true,