(somewhat) more reliably load the strings portofolios

uuverifiers · Jan 26, 2024 · 0130775 · 0130775
1 parent 814f5f3
commit 0130775
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/scala/ostrich/OstrichMain.scala b/src/main/scala/ostrich/OstrichMain.scala
@@ -47,8 +47,6 @@ object OstrichMain {
 
   private val ostrichStringTheory =
     "ostrich.OstrichStringTheory"
-  private val ceaStringTheory     =
-    "ostrich.cesolver.stringtheory.CEStringTheory"
 
   /**
    * The options forwarded to Princess. They will be overwritten by options
@@ -57,6 +55,18 @@ object OstrichMain {
    */
   val options = List("-stringSolver=" + ostrichStringTheory, "-logo")
 
+  PortfolioSetup
+
+  def main(args: Array[String]) : Unit =
+    ap.CmdlMain.main((options ++ args).toArray)
+
+}
+
+object PortfolioSetup {
+
+  private val ceaStringTheory =
+    "ostrich.cesolver.stringtheory.CEStringTheory"
+
   // Run the BW, ADT, and CEA solvers
   ParallelFileProver.addPortfolio(
     "strings", arguments => {
@@ -127,7 +137,4 @@ object OstrichMain {
                                     threadNum)
                })
 
-  def main(args: Array[String]) : Unit =
-    ap.CmdlMain.main((options ++ args).toArray)
-
 }
diff --git a/src/main/scala/ostrich/OstrichStringTheoryBuilder.scala b/src/main/scala/ostrich/OstrichStringTheoryBuilder.scala
@@ -43,6 +43,8 @@ object OstrichStringTheoryBuilder {
 
   val version = "1.3.5"
 
+  PortfolioSetup
+
 }
 
 /**