Separate output for multiple solver calls

lorenzleutgeb · Apr 28, 2021 · cbc8225 · cbc8225
1 parent f663f4b
commit cbc8225
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/gradle-env.json b/gradle-env.json
@@ -1,7 +1,7 @@
 {
   "": {
     "name": "atlas",
-    "version": "v0.0.4",
+    "version": "v0.0.5",
     "path": "",
     "gradle": {
       "version": "7.0",
@@ -3841,4 +3841,4 @@
       ]
     }
   }
-}
+}
diff --git a/src/main/java/xyz/leutgeb/lorenz/atlas/ast/Program.java b/src/main/java/xyz/leutgeb/lorenz/atlas/ast/Program.java
@@ -193,13 +193,19 @@ public ConstraintSystemSolver.Result solve(
             this.condensation,
             (scc) ->
                 () -> {
-                  final var prover = new Prover(name + randomHex(), null, basePath);
-
                   Set<FunctionDefinition> fds =
                       scc.vertexSet().stream()
                           .map(functionDefinitions::get)
                           .collect(Collectors.toSet());
 
+                  final var sccName =
+                      fds.stream()
+                          .map(FunctionDefinition::getFullyQualifiedName)
+                          .map(Util::fqnToFlatFilename)
+                          .collect(joining("+"));
+
+                  final var prover = new Prover(sccName, null, basePath);
+
                   // Stub annotations.
                   for (var fd : fds) {
                     fd.stubAnnotations(

diff --git a/src/main/java/xyz/leutgeb/lorenz/atlas/typing/resources/proving/Prover.java b/src/main/java/xyz/leutgeb/lorenz/atlas/typing/resources/proving/Prover.java
@@ -509,7 +509,7 @@ public ConstraintSystemSolver.Result solve(
       Set<Constraint> outsideConstraints, List<UnknownCoefficient> target) {
     return ConstraintSystemSolver.solve(
         Sets.union(outsideConstraints, Sets.union(accumulatedConstraints, externalConstraints)),
-        basePath,
+        basePath.resolve(name),
         target);
   }