Small changes

integratedmodelling · Oct 18, 2024 · efbfb59 · efbfb59
1 parent 621a85d
commit efbfb59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...solver/src/main/java/org/integratedmodelling/klab/services/resolver/DataflowCompiler.java b/...solver/src/main/java/org/integratedmodelling/klab/services/resolver/DataflowCompiler.java
@@ -162,7 +162,7 @@ void compileStrategy(Actuator observationActuator, Observation observation, Scal
     void compileModel(Actuator observationActuator, Observation observation, Scale scale,
                       ObservationStrategy observationStrategy, Model model) {
 
-        for (var edge : resolutionGraph.graph().outgoingEdgesOf(observationStrategy)) {
+        for (var edge : resolutionGraph.graph().outgoingEdgesOf(model)) {
 
             var child = resolutionGraph.graph().getEdgeTarget(edge);
             var coverage = edge.coverage;

diff --git a/...esolver/src/main/java/org/integratedmodelling/klab/services/resolver/DataflowEncoder.java b/...esolver/src/main/java/org/integratedmodelling/klab/services/resolver/DataflowEncoder.java
@@ -35,9 +35,9 @@ public void encode(PrintWriter outWriter) {
     private void encodeActuator(Actuator actuator, PrintWriter outWriter, int indent) {
 
         String spacer = Utils.Strings.spaces(indent);
-        String dspacer = Utils.Strings.spaces(indent * 2);
+        String dspacer = Utils.Strings.spaces(indent + 3);
 
-        outWriter.append(spacer).append(actuator.getActuatorType().name().toLowerCase());
+        outWriter.append(spacer).append(actuator.getActuatorType().name().toLowerCase()).append(" ");
         outWriter.append(actuator.getActuatorType() == Actuator.Type.RESOLVE
                 ? ("obs" + actuator.getId())
                 : actuator.getObservable().getUrn())
@@ -52,7 +52,7 @@ private void encodeActuator(Actuator actuator, PrintWriter outWriter, int indent
         if (!actuator.getChildren().isEmpty()) {
             outWriter.append(dspacer).append("(\n");
             for (var child : actuator.getChildren()) {
-                encodeActuator(child, outWriter, indent * 3);
+                encodeActuator(child, outWriter, indent + 3);
             }
             outWriter.append(dspacer).append(")\n");
         }