cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/CifDataSynthesis.java

@@ -44,6 +44,7 @@ import org.eclipse.escet.cif.datasynth.spec.SynthesisEdge;
 import org.eclipse.escet.cif.datasynth.spec.SynthesisVariable;
 import org.eclipse.escet.cif.metamodel.cif.declarations.Event;
 import org.eclipse.escet.common.app.framework.exceptions.InvalidInputException;
+import org.eclipse.escet.common.app.framework.output.OutputProvider;
 import org.eclipse.escet.common.java.Assert;
 import org.eclipse.escet.common.java.Sets;
 import org.eclipse.escet.common.java.Strings;

cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/conversion/CifToSynthesisConverter.java

@@ -153,6 +153,7 @@ import org.eclipse.escet.cif.metamodel.cif.types.IntType;
 import org.eclipse.escet.common.app.framework.exceptions.InvalidInputException;
 import org.eclipse.escet.common.app.framework.exceptions.InvalidOptionException;
 import org.eclipse.escet.common.app.framework.exceptions.UnsupportedException;
+import org.eclipse.escet.common.app.framework.output.OutputProvider;
 import org.eclipse.escet.common.box.GridBox;
 import org.eclipse.escet.common.box.GridBox.GridBoxLayout;
 import org.eclipse.escet.common.java.Assert;
@@ -705,6 +706,13 @@ public class CifToSynthesisConverter {
         VarOrder curOrder = VarOrder.createFromOrderedVars(varsInModelOrder);
         List<SynthesisVariable> varsInCurOrder = curOrder.getOrderedVars();
 
+        OutputProvider.out("start order:");
+        OutputProvider.out("");
+        for (SynthesisVariable var: varsInCurOrder) {
+            OutputProvider.out(var.name);
+        }
+        OutputProvider.out("");
+
         // Create variable order data for input to first orderer.
         VarOrdererData data = new VarOrdererData(varsInModelOrder, curOrder, helper);
 
@@ -717,6 +725,11 @@ public class CifToSynthesisConverter {
         VarOrder newOrder = orderingResult.varOrder;
         List<SynthesisVariable> varsInNewOrder = newOrder.getOrderedVars();
 
+        OutputProvider.out("final order:");
+        for (SynthesisVariable var: varsInNewOrder) {
+            OutputProvider.out(var.name);
+        }
+
         // Check sanity of current and new variable orders.
         Assert.check(curOrder.getVarOrder().stream().allMatch(grp -> !grp.isEmpty())); // No empty groups.
         Assert.check(newOrder.getVarOrder().stream().allMatch(grp -> !grp.isEmpty())); // No empty groups.

cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrderHelper.java

@@ -120,6 +120,14 @@ public class VarOrderHelper {
         this.spec = spec;
         this.variables = Collections.unmodifiableList(variables);
 
+        OutputProvider.out("graph variable order:");
+        OutputProvider.out("");
+        for (SynthesisVariable var: variables) {
+            OutputProvider.out(var.name);
+        }
+        OutputProvider.out("");
+
+
         // Compute and store different representations of the relations from the specification.
         List<BitSet> legacyHyperEdges = createHyperEdges(new LegacyHyperEdgeCreator(spec, variables));
         List<BitSet> linearizedHyperEdges = createHyperEdges(new LinearizedHyperEdgeCreator(spec, variables));
@@ -129,6 +137,11 @@ public class VarOrderHelper {
         Graph linearizedGraph = createGraph(linearizedHyperEdges);
         this.graphs = list(legacyGraph, linearizedGraph);
 
+        OutputProvider.out("linearized graph to string:");
+        OutputProvider.out("");
+        OutputProvider.out(linearizedGraph.toString());
+        OutputProvider.out("");
+
         // Store additional derivative information used to improve performance of some helper operations.
         this.origIndices = IntStream.range(0, variables.size()).boxed()
                 .collect(Collectors.toMap(i -> variables.get(i), i -> i));

cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/orderers/SlidingWindowVarOrderer.java

@@ -25,6 +25,7 @@ import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererData;
 import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererEffect;
 import org.eclipse.escet.cif.datasynth.varorder.metrics.VarOrderMetric;
 import org.eclipse.escet.cif.datasynth.varorder.metrics.VarOrderMetricKind;
+import org.eclipse.escet.common.app.framework.output.OutputProvider;
 import org.eclipse.escet.common.java.Assert;
 import org.eclipse.escet.common.java.PermuteUtils;
 

cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/orderers/WeightedCuthillMcKeeVarOrderer.java

@@ -27,6 +27,7 @@ import org.eclipse.escet.cif.datasynth.varorder.helper.RepresentationKind;
 import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrder;
 import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererData;
 import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererEffect;
+import org.eclipse.escet.common.app.framework.output.OutputProvider;
 
 /**
  * Weighted Cuthill-McKee bandwidth-reducing variable ordering heuristic.