From 6e438ef3d902b25d0b151c5e95807cfc4cca83bf Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 20:47:28 +0200 Subject: [PATCH 1/8] #196 VarOrderHelp/HyperEdgeCreator store variables as a list. --- .../varorder/helper/VarOrdererHelperTest.java | 3 ++- .../conversion/CifToSynthesisConverter.java | 5 +++-- .../varorder/helper/HyperEdgeCreator.java | 10 +++++----- .../varorder/helper/VarOrdererHelper.java | 16 ++++++++-------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java index f9e413d00..9807c057b 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java +++ b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java @@ -16,6 +16,7 @@ package org.eclipse.escet.cif.datasynth.varorder.helper; import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newInputVariable; import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newIntType; import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newSpecification; +import static org.eclipse.escet.common.java.Lists.list; import static org.junit.Assert.assertSame; import java.util.List; @@ -50,7 +51,7 @@ public class VarOrdererHelperTest { SynthesisVariable c = new SynthesisInputVariable(vc, newIntType(0, null, 0), 1, 0, 0); SynthesisVariable d = new SynthesisInputVariable(vd, newIntType(0, null, 0), 1, 0, 0); SynthesisVariable e = new SynthesisInputVariable(ve, newIntType(0, null, 0), 1, 0, 0); - SynthesisVariable[] variables = {a, b, c, d, e}; + List variables = list(a, b, c, d, e); // Reorder the variables. int[] newIndices = {0, 4, 1, 2, 3}; // For each variable in 'variables', its new 0-based index. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/conversion/CifToSynthesisConverter.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/conversion/CifToSynthesisConverter.java index 946bd9a71..f754c78b1 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/conversion/CifToSynthesisConverter.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/conversion/CifToSynthesisConverter.java @@ -931,7 +931,8 @@ public class CifToSynthesisConverter { // Only apply a variable ordering algorithm if there are hyper-edges and graph edges, to ensures that variable // relations exist for improving the variable order. It also avoids division by zero issues. - VarOrdererHelper helper = new VarOrdererHelper(spec, synthAut.variables); + List variables = Arrays.asList(synthAut.variables); + VarOrdererHelper helper = new VarOrdererHelper(spec, variables); long graphEdgeCount = helper.getGraph().edgeCount(); if (helper.getHyperEdges().length == 0) { if (dbgEnabled) { @@ -960,7 +961,7 @@ public class CifToSynthesisConverter { } VarOrderer orderer = (orderers.size() == 1) ? first(orderers) : new SequentialVarOrderer(orderers); List curOrder = Arrays.asList(synthAut.variables); - List newOrder = orderer.order(helper, Arrays.asList(synthAut.variables), dbgEnabled, 1); + List newOrder = orderer.order(helper, variables, dbgEnabled, 1); // If the new order differs from the current order, reorder. boolean orderChanged = !curOrder.equals(newOrder); diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/HyperEdgeCreator.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/HyperEdgeCreator.java index 066cc61d6..fcfc4800a 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/HyperEdgeCreator.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/HyperEdgeCreator.java @@ -48,7 +48,7 @@ import org.eclipse.escet.common.position.metamodel.position.PositionObject; /** Automatic variable ordering hyper-edge creator. */ class HyperEdgeCreator { /** The synthesis variables. */ - private SynthesisVariable[] variables; + private List variables; /** The hyper-edges created so far. */ private List hyperEdges = list(); @@ -63,7 +63,7 @@ class HyperEdgeCreator { * @param variables The synthesis variables. * @return The hyper-edges. */ - List getHyperEdges(Specification spec, SynthesisVariable[] variables) { + List getHyperEdges(Specification spec, List variables) { // Initialization. this.variables = variables; this.hyperEdges = list(); @@ -221,12 +221,12 @@ class HyperEdgeCreator { } // Create bit set. - BitSet hyperEdge = new BitSet(variables.length); + BitSet hyperEdge = new BitSet(variables.size()); for (PositionObject var: vars) { int matchIdx = -1; - for (int i = 0; i < variables.length; i++) { + for (int i = 0; i < variables.size(); i++) { // Get synthesis variable. - SynthesisVariable synthVar = variables[i]; + SynthesisVariable synthVar = variables.get(i); Assert.notNull(synthVar == null); // Check for matching variable. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java index 32108b17a..f51812273 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java @@ -46,7 +46,7 @@ public class VarOrdererHelper { private final Specification spec; /** The synthesis variables, in their original order, before applying any algorithm on it. */ - private final SynthesisVariable[] variables; + private final List variables; /** For each synthesis variable in the original variable order, its 0-based index within that order. */ private final Map origIndices; @@ -69,11 +69,11 @@ public class VarOrdererHelper { * @param spec The CIF specification. * @param variables The synthesis variables, in their original order, before applying any algorithm on it. */ - public VarOrdererHelper(Specification spec, SynthesisVariable[] variables) { + public VarOrdererHelper(Specification spec, List variables) { this.spec = spec; this.variables = variables; - this.origIndices = IntStream.range(0, variables.length).boxed() - .collect(Collectors.toMap(i -> variables[i], i -> i)); + this.origIndices = IntStream.range(0, variables.size()).boxed() + .collect(Collectors.toMap(i -> variables.get(i), i -> i)); this.hyperEdges = createHyperEdges(); this.graph = createGraph(); } @@ -123,7 +123,7 @@ public class VarOrdererHelper { } // Create undirected weighted graph. - Graph graph = new Graph(variables.length); + Graph graph = new Graph(variables.size()); for (Entry, Integer> graphEdge: graphEdges.entrySet()) { Node ni = graph.node(graphEdge.getKey().left); Node nj = graph.node(graphEdge.getKey().right); @@ -309,10 +309,10 @@ public class VarOrdererHelper { * @return The synthesis variables, in their new order. */ public List reorderForNewIndices(int[] newIndices) { - Assert.areEqual(variables.length, newIndices.length); - SynthesisVariable[] result = new SynthesisVariable[variables.length]; + Assert.areEqual(variables.size(), newIndices.length); + SynthesisVariable[] result = new SynthesisVariable[variables.size()]; for (int i = 0; i < newIndices.length; i++) { - result[newIndices[i]] = variables[i]; + result[newIndices[i]] = variables.get(i); } return Arrays.asList(result); } -- GitLab From bee5ce86d99da029e505e0fb551c552bfb0bc7ae Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 20:53:28 +0200 Subject: [PATCH 2/8] #196 Prepare for more metrics besides total span. - Dynamic metric width, to reduce width and make room for extra metric. - Renamed 'dbgTotalSpan*' to 'dbgMetrics*' and updated JavaDoc. --- .../datasynth/varorder/ForceVarOrderer.java | 6 +- .../datasynth/varorder/ReverseVarOrderer.java | 2 +- .../varorder/SlidingWindowVarOrderer.java | 6 +- .../datasynth/varorder/SloanVarOrderer.java | 4 +- .../WeightedCuthillMcKeeVarOrderer.java | 4 +- .../varorder/helper/VarOrdererHelper.java | 59 +++++++++++++------ 6 files changed, 51 insertions(+), 30 deletions(-) diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java index 4035bdac8..1f69a22d9 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java @@ -86,7 +86,7 @@ public class ForceVarOrderer implements VarOrderer { long curTotalSpan = helper.computeTotalSpanForNewIndices(curIndices); long bestTotalSpan = curTotalSpan; if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, curTotalSpan, "before"); + helper.dbgMetrics(dbgLevel, curTotalSpan, "before"); } // Perform iterations of the algorithm. @@ -127,7 +127,7 @@ public class ForceVarOrderer implements VarOrderer { // Get new total span. long newTotalSpan = helper.computeTotalSpanForNewIndices(curIndices); if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, newTotalSpan, fmt("iteration %,d", curIter + 1)); + helper.dbgMetrics(dbgLevel, newTotalSpan, fmt("iteration %,d", curIter + 1)); } // Stop when total span stops changing. We could stop as soon as it stops decreasing. However, we may end @@ -151,7 +151,7 @@ public class ForceVarOrderer implements VarOrderer { // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, bestTotalSpan, "after"); + helper.dbgMetrics(dbgLevel, bestTotalSpan, "after"); } // Return the best order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ReverseVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ReverseVarOrderer.java index 87a337203..c9235d194 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ReverseVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ReverseVarOrderer.java @@ -51,7 +51,7 @@ public class ReverseVarOrderer implements VarOrderer { // Debug output after applying the algorithm. if (dbgEnabled) { helper.dbg(dbgLevel, "Reversed the variable order."); - helper.dbgTotalSpanForVarOrder(dbgLevel, order, "reversed"); + helper.dbgMetricsForVarOrder(dbgLevel, order, "reversed"); } // Return the resulting variable order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java index d99fe2118..36c03ffca 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java @@ -57,7 +57,7 @@ public class SlidingWindowVarOrderer implements VarOrderer { int[] curIndices = helper.getNewIndicesForVarOrder(inputOrder); long curSpan = helper.computeTotalSpanForNewIndices(curIndices); if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, curSpan, "before"); + helper.dbgMetrics(dbgLevel, curSpan, "before"); } // Process all windows. @@ -87,14 +87,14 @@ public class SlidingWindowVarOrderer implements VarOrderer { System.arraycopy(windowPerms[bestIdx], 0, curIndices, offset, length); if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, curSpan, fmt("window %d..%d", offset, offset + length - 1)); + helper.dbgMetrics(dbgLevel, curSpan, fmt("window %d..%d", offset, offset + length - 1)); } } } // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgTotalSpan(dbgLevel, curSpan, "after"); + helper.dbgMetrics(dbgLevel, curSpan, "after"); } // Return the resulting order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SloanVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SloanVarOrderer.java index c05087cc3..d4432dd28 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SloanVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SloanVarOrderer.java @@ -37,7 +37,7 @@ public class SloanVarOrderer implements VarOrderer { // Debug output before applying the algorithm. if (dbgEnabled) { helper.dbg(dbgLevel, "Applying Sloan algorithm."); - helper.dbgTotalSpanForVarOrder(dbgLevel, inputOrder, "before"); + helper.dbgMetricsForVarOrder(dbgLevel, inputOrder, "before"); } // Apply algorithm. @@ -45,7 +45,7 @@ public class SloanVarOrderer implements VarOrderer { // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgTotalSpanForNodeOrder(dbgLevel, order, "after"); + helper.dbgMetricsForNodeOrder(dbgLevel, order, "after"); } // Return the resulting order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/WeightedCuthillMcKeeVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/WeightedCuthillMcKeeVarOrderer.java index 7acfddb93..8177cf007 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/WeightedCuthillMcKeeVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/WeightedCuthillMcKeeVarOrderer.java @@ -37,7 +37,7 @@ public class WeightedCuthillMcKeeVarOrderer implements VarOrderer { // Debug output before applying the algorithm. if (dbgEnabled) { helper.dbg(dbgLevel, "Applying Weighted Cuthill-McKee algorithm."); - helper.dbgTotalSpanForVarOrder(dbgLevel, inputOrder, "before"); + helper.dbgMetricsForVarOrder(dbgLevel, inputOrder, "before"); } // Apply algorithm. @@ -45,7 +45,7 @@ public class WeightedCuthillMcKeeVarOrderer implements VarOrderer { // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgTotalSpanForNodeOrder(dbgLevel, order, "after"); + helper.dbgMetricsForNodeOrder(dbgLevel, order, "after"); } // Return the resulting order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java index f51812273..e0fd7c0ed 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java @@ -15,6 +15,7 @@ package org.eclipse.escet.cif.datasynth.varorder.helper; import static org.eclipse.escet.common.java.Maps.mapc; import static org.eclipse.escet.common.java.Pair.pair; +import static org.eclipse.escet.common.java.Strings.fmt; import java.util.Arrays; import java.util.BitSet; @@ -63,6 +64,12 @@ public class VarOrdererHelper { */ private final Graph graph; + /** The number of characters to use for printing the total span metric in debug output. */ + private final int metricLengthTotalSpan; + + /** The number of characters to use for printing the total span metric, as average per edge, in debug output. */ + private final int metricLengthTotalSpanAvg; + /** * Constructor for the {@link VarOrdererHelper} class. * @@ -70,12 +77,25 @@ public class VarOrdererHelper { * @param variables The synthesis variables, in their original order, before applying any algorithm on it. */ public VarOrdererHelper(Specification spec, List variables) { + // Store the input. this.spec = spec; this.variables = variables; - this.origIndices = IntStream.range(0, variables.size()).boxed() - .collect(Collectors.toMap(i -> variables.get(i), i -> i)); + + // Compute and store different representations of the specification. this.hyperEdges = createHyperEdges(); this.graph = createGraph(); + + // 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)); + + // Store the number of characters to use to print various metrics. We compute the length needed to print the + // current value of each metric, and allow for two additional characters. Based on the assumption that the + // metrics won't get a 100 times worse, this should provide enough space to neatly print them. If they do get + // over a 100 times worse, printing may be slightly less neat, but will still work. + this.metricLengthTotalSpan = fmt("%,d", computeTotalSpanForVarOrder(variables)).length() + 2; + this.metricLengthTotalSpanAvg = fmt("%,.2f", (double)computeTotalSpanForVarOrder(variables) / hyperEdges.length) + .length() + 2; } /** @@ -216,51 +236,52 @@ public class VarOrdererHelper { } /** - * Prints the total span as debug output, for the given variable order. + * Print various metrics as debug output, for the given variable order. * * @param dbgLevel The debug indentation level. * @param order The variable order. - * @param annotation A human-readable text indicating the reason for printing the total span. + * @param annotation A human-readable text indicating the reason for printing the metrics. */ - public void dbgTotalSpanForVarOrder(int dbgLevel, List order, String annotation) { + public void dbgMetricsForVarOrder(int dbgLevel, List order, String annotation) { int[] newIndices = getNewIndicesForVarOrder(order); - dbgTotalSpanForNewIndices(dbgLevel, newIndices, annotation); + dbgMetricsForNewIndices(dbgLevel, newIndices, annotation); } /** - * Prints the total span as debug output, for the given node order. + * Print various metrics as debug output, for the given node order. * * @param dbgLevel The debug indentation level. * @param order The node order. - * @param annotation A human-readable text indicating the reason for printing the total span. + * @param annotation A human-readable text indicating the reason for printing the metrics. */ - public void dbgTotalSpanForNodeOrder(int dbgLevel, List order, String annotation) { + public void dbgMetricsForNodeOrder(int dbgLevel, List order, String annotation) { int[] newIndices = getNewIndicesForNodeOrder(order); - dbgTotalSpanForNewIndices(dbgLevel, newIndices, annotation); + dbgMetricsForNewIndices(dbgLevel, newIndices, annotation); } /** - * Prints the total span as debug output, for the given new indices of the variables. + * Print various metrics as debug output, for the given new indices of the variables. * * @param dbgLevel The debug indentation level. * @param newIndices For each variable, its new 0-based index. - * @param annotation A human-readable text indicating the reason for printing the total span. + * @param annotation A human-readable text indicating the reason for printing the metrics. */ - public void dbgTotalSpanForNewIndices(int dbgLevel, int[] newIndices, String annotation) { + public void dbgMetricsForNewIndices(int dbgLevel, int[] newIndices, String annotation) { long totalSpan = computeTotalSpanForNewIndices(newIndices); - dbgTotalSpan(dbgLevel, totalSpan, annotation); + dbgMetrics(dbgLevel, totalSpan, annotation); } /** - * Prints the given total span as debug output. + * Print various metrics as debug output. * * @param dbgLevel The debug indentation level. * @param totalSpan The given total span. - * @param annotation A human-readable text indicating the reason for printing the total span. + * @param annotation A human-readable text indicating the reason for printing the metrics. */ - public void dbgTotalSpan(int dbgLevel, long totalSpan, String annotation) { - dbg(dbgLevel, "Total span: %,20d (total) %,20.2f (avg/edge) [%s]", totalSpan, - (double)totalSpan / hyperEdges.length, annotation); + public void dbgMetrics(int dbgLevel, long totalSpan, String annotation) { + String fmtTotalSpan = fmt("%," + metricLengthTotalSpan + "d", totalSpan); + String fmtTotalSpanAvg = fmt("%," + metricLengthTotalSpanAvg + ".2f", (double)totalSpan / hyperEdges.length); + dbg(dbgLevel, "Total span: %s (total) %s (avg/edge) [%s]", fmtTotalSpan, fmtTotalSpanAvg, annotation); } /** -- GitLab From b22ef6d24474e0a437888f699a87c246513ab1b7 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 20:56:50 +0200 Subject: [PATCH 3/8] #196 Updated expected test output. --- .../tests/datasynth/alg_vars.cif.out | 10 +++++----- .../tests/datasynth/asgn_div.cif.out | 14 +++++++------- .../tests/datasynth/asgn_mod.cif.out | 14 +++++++------- .../tests/datasynth/asgn_var_copy.cif.out | 12 ++++++------ .../tests/datasynth/bad_locs.cif.out | 10 +++++----- .../tests/datasynth/bdd_out_nodes.cif.out | 12 ++++++------ .../tests/datasynth/booleans.cif.out | 12 ++++++------ .../tests/datasynth/channel.cif.out | 10 +++++----- .../tests/datasynth/ctrl_sys.cif.out | 10 +++++----- .../tests/datasynth/diamond.cif.out | 12 ++++++------ .../datasynth/dining_philosophers4.cif.out | 14 +++++++------- .../tests/datasynth/double_loop.cif.out | 10 +++++----- .../tests/datasynth/event_warnings.cif.out | 12 ++++++------ .../datasynth/example_button_lamp.cif.out | 12 ++++++------ .../tests/datasynth/fig2a.cif.out | 10 +++++----- .../tests/datasynth/fig2b.cif.out | 10 +++++----- .../tests/datasynth/forward_reach_off.cif.out | 10 +++++----- .../tests/datasynth/forward_reach_on.cif.out | 10 +++++----- .../tests/datasynth/guards_upds.cif.out | 10 +++++----- .../tests/datasynth/if_expr.cif.out | 12 ++++++------ .../tests/datasynth/if_preds.cif.out | 12 ++++++------ .../tests/datasynth/input_vars1.cif.out | 10 +++++----- .../tests/datasynth/input_vars3.cif.out | 10 +++++----- .../tests/datasynth/input_vars7.cif.out | 10 +++++----- .../inv_state_evt_exclusion_plant_loc.cif.out | 10 +++++----- .../inv_state_evt_exclusion_req_loc.cif.out | 10 +++++----- .../tests/datasynth/invalid8.cif.out | 10 +++++----- .../tests/datasynth/loop.cif.out | 10 +++++----- .../tests/datasynth/many_rounds.cif.out | 10 +++++----- .../tests/datasynth/marking1.cif.out | 12 ++++++------ .../tests/datasynth/multi_plants.cif.out | 10 +++++----- .../tests/datasynth/multi_req_auts.cif.out | 10 +++++----- .../tests/datasynth/multi_req_invs1.cif.out | 10 +++++----- .../tests/datasynth/multi_req_invs2.cif.out | 10 +++++----- .../tests/datasynth/mutex1.cif.out | 12 ++++++------ .../tests/datasynth/mutex2.cif.out | 10 +++++----- .../tests/datasynth/namespace.cif.out | 12 ++++++------ .../tests/datasynth/no_marked1.cif.out | 12 ++++++------ .../tests/datasynth/non_determinism.cif.out | 12 ++++++------ .../tests/datasynth/predicates.cif.out | 16 ++++++++-------- .../tests/datasynth/req_counter.cif.out | 10 +++++----- .../req_evt_not_in_plant_ctrl.cif.out | 10 +++++----- .../req_evt_not_in_plant_unctrl.cif.out | 10 +++++----- .../tests/datasynth/req_loc_no_name.cif.out | 10 +++++----- .../tests/datasynth/req_monitor.cif.out | 10 +++++----- .../tests/datasynth/scopes.cif.out | 10 +++++----- .../tests/datasynth/seq.cif.out | 10 +++++----- .../datasynth/simplify_ctrl_beh_off.cif.out | 10 +++++----- .../datasynth/simplify_ctrl_beh_on.cif.out | 10 +++++----- .../datasynth/simplify_propagation_all.cif.out | 10 +++++----- .../simplify_propagation_none.cif.out | 10 +++++----- .../simplify_state_plant_invs_off.cif.out | 10 +++++----- .../simplify_state_plant_invs_on.cif.out | 10 +++++----- .../simplify_state_req_invs_off.cif.out | 10 +++++----- .../simplify_state_req_invs_on.cif.out | 10 +++++----- .../tests/datasynth/switch_expr.cif.out | 12 ++++++------ .../tests/datasynth/switch_preds.cif.out | 12 ++++++------ .../tests/datasynth/update_complex.cif.out | 10 +++++----- .../tests/datasynth/updates.cif.out | 10 +++++----- .../var_order_custom_force_on.cif.out | 16 ++++++++-------- .../datasynth/var_order_model_force_on.cif.out | 12 ++++++------ .../var_order_random_force_on.cif.out | 18 +++++++++--------- .../var_order_reverse_model_force_on.cif.out | 12 ++++++------ .../var_order_reverse_sorted_force_on.cif.out | 12 ++++++------ .../var_order_sorted_force_on.cif.out | 12 ++++++------ 65 files changed, 360 insertions(+), 360 deletions(-) diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out index 33b444d73..648bc5976 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out @@ -20,14 +20,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.15 (avg/edge) [before] - Total span: 2 (total) 0.15 (avg/edge) [iteration 1] - Total span: 2 (total) 0.15 (avg/edge) [after] + Total span: 2 (total) 0.15 (avg/edge) [before] + Total span: 2 (total) 0.15 (avg/edge) [iteration 1] + Total span: 2 (total) 0.15 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.15 (avg/edge) [before] - Total span: 2 (total) 0.15 (avg/edge) [after] + Total span: 2 (total) 0.15 (avg/edge) [before] + Total span: 2 (total) 0.15 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out index 517211a81..8b820b413 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out @@ -21,16 +21,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 15 (total) 1.50 (avg/edge) [before] - Total span: 11 (total) 1.10 (avg/edge) [iteration 1] - Total span: 9 (total) 0.90 (avg/edge) [iteration 2] - Total span: 9 (total) 0.90 (avg/edge) [iteration 3] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 15 (total) 1.50 (avg/edge) [before] + Total span: 11 (total) 1.10 (avg/edge) [iteration 1] + Total span: 9 (total) 0.90 (avg/edge) [iteration 2] + Total span: 9 (total) 0.90 (avg/edge) [iteration 3] + Total span: 9 (total) 0.90 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 9 (total) 0.90 (avg/edge) [before] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 9 (total) 0.90 (avg/edge) [before] + Total span: 9 (total) 0.90 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out index e3831ae0a..f2bde3894 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out @@ -21,16 +21,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 15 (total) 1.50 (avg/edge) [before] - Total span: 11 (total) 1.10 (avg/edge) [iteration 1] - Total span: 9 (total) 0.90 (avg/edge) [iteration 2] - Total span: 9 (total) 0.90 (avg/edge) [iteration 3] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 15 (total) 1.50 (avg/edge) [before] + Total span: 11 (total) 1.10 (avg/edge) [iteration 1] + Total span: 9 (total) 0.90 (avg/edge) [iteration 2] + Total span: 9 (total) 0.90 (avg/edge) [iteration 3] + Total span: 9 (total) 0.90 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 9 (total) 0.90 (avg/edge) [before] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 9 (total) 0.90 (avg/edge) [before] + Total span: 9 (total) 0.90 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out index 70ff3f981..e988c386f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out @@ -20,15 +20,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 8 (total) 1.00 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [iteration 2] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 8 (total) 1.00 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) [iteration 2] + Total span: 6 (total) 0.75 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out index d6ef68431..ebfdd46d7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [iteration 1] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) [iteration 1] + Total span: 2 (total) 0.22 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out index ec9dc893c..90db9f3b1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.38 (avg/edge) [window 0..3] - Total span: 3 (total) 0.38 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) [before] + Total span: 3 (total) 0.38 (avg/edge) [window 0..3] + Total span: 3 (total) 0.38 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out index b5b418b95..eb63b5932 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out @@ -20,15 +20,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 1 (total) 0.13 (avg/edge) [iteration 1] - Total span: 1 (total) 0.13 (avg/edge) [iteration 2] - Total span: 1 (total) 0.13 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 1 (total) 0.13 (avg/edge) [iteration 1] + Total span: 1 (total) 0.13 (avg/edge) [iteration 2] + Total span: 1 (total) 0.13 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 1 (total) 0.13 (avg/edge) [before] - Total span: 1 (total) 0.13 (avg/edge) [after] + Total span: 1 (total) 0.13 (avg/edge) [before] + Total span: 1 (total) 0.13 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out index 577ea0d27..2e27a5936 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.27 (avg/edge) [before] - Total span: 3 (total) 0.27 (avg/edge) [iteration 1] - Total span: 3 (total) 0.27 (avg/edge) [after] + Total span: 3 (total) 0.27 (avg/edge) [before] + Total span: 3 (total) 0.27 (avg/edge) [iteration 1] + Total span: 3 (total) 0.27 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.27 (avg/edge) [before] - Total span: 3 (total) 0.27 (avg/edge) [after] + Total span: 3 (total) 0.27 (avg/edge) [before] + Total span: 3 (total) 0.27 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out index 0b939529a..95cff9965 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out index 219fd1e6a..f8aca2b89 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 1.50 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [iteration 1] - Total span: 4 (total) 1.00 (avg/edge) [iteration 2] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 6 (total) 1.50 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) [iteration 1] + Total span: 4 (total) 1.00 (avg/edge) [iteration 2] + Total span: 4 (total) 1.00 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 1.00 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 4 (total) 1.00 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out index af7962436..0af96c335 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out @@ -23,16 +23,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 30 - Total span: 51 (total) 4.25 (avg/edge) [before] - Total span: 27 (total) 2.25 (avg/edge) [iteration 1] - Total span: 26 (total) 2.17 (avg/edge) [iteration 2] - Total span: 26 (total) 2.17 (avg/edge) [iteration 3] - Total span: 26 (total) 2.17 (avg/edge) [after] + Total span: 51 (total) 4.25 (avg/edge) [before] + Total span: 27 (total) 2.25 (avg/edge) [iteration 1] + Total span: 26 (total) 2.17 (avg/edge) [iteration 2] + Total span: 26 (total) 2.17 (avg/edge) [iteration 3] + Total span: 26 (total) 2.17 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 26 (total) 2.17 (avg/edge) [before] - Total span: 26 (total) 2.17 (avg/edge) [after] + Total span: 26 (total) 2.17 (avg/edge) [before] + Total span: 26 (total) 2.17 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out index d2b2428e2..c27943408 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 5 (total) 0.23 (avg/edge) [before] - Total span: 5 (total) 0.23 (avg/edge) [iteration 1] - Total span: 5 (total) 0.23 (avg/edge) [after] + Total span: 5 (total) 0.23 (avg/edge) [before] + Total span: 5 (total) 0.23 (avg/edge) [iteration 1] + Total span: 5 (total) 0.23 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 5 (total) 0.23 (avg/edge) [before] - Total span: 5 (total) 0.23 (avg/edge) [after] + Total span: 5 (total) 0.23 (avg/edge) [before] + Total span: 5 (total) 0.23 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out index 4e9c5df3f..bca057aed 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out @@ -22,15 +22,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 18 (total) 0.45 (avg/edge) [before] - Total span: 18 (total) 0.45 (avg/edge) [iteration 1] - Total span: 18 (total) 0.45 (avg/edge) [after] + Total span: 18 (total) 0.45 (avg/edge) [before] + Total span: 18 (total) 0.45 (avg/edge) [iteration 1] + Total span: 18 (total) 0.45 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 18 (total) 0.45 (avg/edge) [before] - Total span: 11 (total) 0.28 (avg/edge) [window 0..3] - Total span: 11 (total) 0.28 (avg/edge) [after] + Total span: 18 (total) 0.45 (avg/edge) [before] + Total span: 11 (total) 0.28 (avg/edge) [window 0..3] + Total span: 11 (total) 0.28 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out index 7ff2dc461..07e58161e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 1.50 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [iteration 1] - Total span: 4 (total) 1.00 (avg/edge) [iteration 2] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 6 (total) 1.50 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) [iteration 1] + Total span: 4 (total) 1.00 (avg/edge) [iteration 2] + Total span: 4 (total) 1.00 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 1.00 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 4 (total) 1.00 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out index 8b08b1943..ad1ebc0db 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out index 3215049ab..7293068c3 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [iteration 1] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) [iteration 1] + Total span: 2 (total) 0.22 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out index 6d4f37741..325ed40ed 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [iteration 1] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) [iteration 1] + Total span: 2 (total) 0.12 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out index ee58aa1e1..b439009b7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [iteration 1] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) [iteration 1] + Total span: 2 (total) 0.12 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out index e89f310d8..6ffe409fd 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.43 (avg/edge) [before] - Total span: 3 (total) 0.43 (avg/edge) [iteration 1] - Total span: 3 (total) 0.43 (avg/edge) [after] + Total span: 3 (total) 0.43 (avg/edge) [before] + Total span: 3 (total) 0.43 (avg/edge) [iteration 1] + Total span: 3 (total) 0.43 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.43 (avg/edge) [before] - Total span: 3 (total) 0.43 (avg/edge) [after] + Total span: 3 (total) 0.43 (avg/edge) [before] + Total span: 3 (total) 0.43 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out index d52aa0087..0e6a077c8 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out index 3d5b46a26..23c2d0581 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out index ea27ddff4..c1ce2d31b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 2 (total) 2.00 (avg/edge) [iteration 1] - Total span: 2 (total) 2.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) [before] + Total span: 2 (total) 2.00 (avg/edge) [iteration 1] + Total span: 2 (total) 2.00 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 2 (total) 2.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) [before] + Total span: 2 (total) 2.00 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out index 82953ac4d..3c464c14d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [iteration 1] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) [iteration 1] + Total span: 2 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out index de1859420..f0467b10e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [iteration 1] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) [iteration 1] + Total span: 1 (total) 1.00 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out index cfa52eed9..22e8a5afa 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 4 (total) 0.08 (avg/edge) [before] - Total span: 4 (total) 0.08 (avg/edge) [iteration 1] - Total span: 4 (total) 0.08 (avg/edge) [after] + Total span: 4 (total) 0.08 (avg/edge) [before] + Total span: 4 (total) 0.08 (avg/edge) [iteration 1] + Total span: 4 (total) 0.08 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 4 (total) 0.08 (avg/edge) [before] - Total span: 4 (total) 0.08 (avg/edge) [after] + Total span: 4 (total) 0.08 (avg/edge) [before] + Total span: 4 (total) 0.08 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out index 37daa0dbc..7bc44f2d4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.08 (avg/edge) [before] - Total span: 2 (total) 0.08 (avg/edge) [iteration 1] - Total span: 2 (total) 0.08 (avg/edge) [after] + Total span: 2 (total) 0.08 (avg/edge) [before] + Total span: 2 (total) 0.08 (avg/edge) [iteration 1] + Total span: 2 (total) 0.08 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.08 (avg/edge) [before] - Total span: 2 (total) 0.08 (avg/edge) [after] + Total span: 2 (total) 0.08 (avg/edge) [before] + Total span: 2 (total) 0.08 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out index f7d105d58..dd107657b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.04 (avg/edge) [before] - Total span: 1 (total) 0.04 (avg/edge) [iteration 1] - Total span: 1 (total) 0.04 (avg/edge) [after] + Total span: 1 (total) 0.04 (avg/edge) [before] + Total span: 1 (total) 0.04 (avg/edge) [iteration 1] + Total span: 1 (total) 0.04 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.04 (avg/edge) [before] - Total span: 1 (total) 0.04 (avg/edge) [after] + Total span: 1 (total) 0.04 (avg/edge) [before] + Total span: 1 (total) 0.04 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out index 368310711..1e63ae31b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [iteration 1] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) [iteration 1] + Total span: 2 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out index c66390b50..bd63105a1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 7 (total) 0.37 (avg/edge) [before] - Total span: 7 (total) 0.37 (avg/edge) [iteration 1] - Total span: 7 (total) 0.37 (avg/edge) [after] + Total span: 7 (total) 0.37 (avg/edge) [before] + Total span: 7 (total) 0.37 (avg/edge) [iteration 1] + Total span: 7 (total) 0.37 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 7 (total) 0.37 (avg/edge) [before] - Total span: 7 (total) 0.37 (avg/edge) [after] + Total span: 7 (total) 0.37 (avg/edge) [before] + Total span: 7 (total) 0.37 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out index c58f63877..9e3c696e6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [iteration 2] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 1.00 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) [iteration 2] + Total span: 1 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out index 168897453..c1b193f0c 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [iteration 1] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) [iteration 1] + Total span: 4 (total) 0.67 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out index 48125be1b..4ad038a35 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.75 (avg/edge) [iteration 1] - Total span: 3 (total) 0.75 (avg/edge) [after] + Total span: 3 (total) 0.75 (avg/edge) [before] + Total span: 3 (total) 0.75 (avg/edge) [iteration 1] + Total span: 3 (total) 0.75 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.75 (avg/edge) [after] + Total span: 3 (total) 0.75 (avg/edge) [before] + Total span: 3 (total) 0.75 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out index c91875edb..d1a0a9297 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.09 (avg/edge) [before] - Total span: 1 (total) 0.09 (avg/edge) [iteration 1] - Total span: 1 (total) 0.09 (avg/edge) [after] + Total span: 1 (total) 0.09 (avg/edge) [before] + Total span: 1 (total) 0.09 (avg/edge) [iteration 1] + Total span: 1 (total) 0.09 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.09 (avg/edge) [before] - Total span: 1 (total) 0.09 (avg/edge) [after] + Total span: 1 (total) 0.09 (avg/edge) [before] + Total span: 1 (total) 0.09 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out index 5ff2eea12..53d64d1be 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 5 (total) 0.45 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [iteration 1] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 5 (total) 0.45 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) [iteration 1] + Total span: 5 (total) 0.45 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 5 (total) 0.45 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 5 (total) 0.45 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out index 24bda63e7..8cee0e738 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out @@ -19,15 +19,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.55 (avg/edge) [before] - Total span: 6 (total) 0.55 (avg/edge) [iteration 1] - Total span: 6 (total) 0.55 (avg/edge) [after] + Total span: 6 (total) 0.55 (avg/edge) [before] + Total span: 6 (total) 0.55 (avg/edge) [iteration 1] + Total span: 6 (total) 0.55 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.55 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [window 0..3] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 6 (total) 0.55 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) [window 0..3] + Total span: 5 (total) 0.45 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out index e37a61d6a..e8476ad3b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out index cca55d3ec..19fce39ba 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [iteration 1] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) [iteration 1] + Total span: 4 (total) 0.67 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 3 (total) 0.50 (avg/edge) [window 0..2] - Total span: 3 (total) 0.50 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) [before] + Total span: 3 (total) 0.50 (avg/edge) [window 0..2] + Total span: 3 (total) 0.50 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out index c8162a7be..683d04dd7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [iteration 1] - Total span: 1 (total) 1.00 (avg/edge) [iteration 2] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) [iteration 1] + Total span: 1 (total) 1.00 (avg/edge) [iteration 2] + Total span: 1 (total) 1.00 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out index 618f456da..4df0ba894 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 5 (total) 0.83 (avg/edge) [before] - Total span: 5 (total) 0.83 (avg/edge) [iteration 1] - Total span: 5 (total) 0.83 (avg/edge) [after] + Total span: 5 (total) 0.83 (avg/edge) [before] + Total span: 5 (total) 0.83 (avg/edge) [iteration 1] + Total span: 5 (total) 0.83 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 5 (total) 0.83 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [window 0..2] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 5 (total) 0.83 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) [window 0..2] + Total span: 4 (total) 0.67 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out index 6d842a541..c22d07a0d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out @@ -24,17 +24,17 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 30 - Total span: 183 (total) 1.74 (avg/edge) [before] - Total span: 103 (total) 0.98 (avg/edge) [iteration 1] - Total span: 92 (total) 0.88 (avg/edge) [iteration 2] - Total span: 92 (total) 0.88 (avg/edge) [iteration 3] - Total span: 92 (total) 0.88 (avg/edge) [after] + Total span: 183 (total) 1.74 (avg/edge) [before] + Total span: 103 (total) 0.98 (avg/edge) [iteration 1] + Total span: 92 (total) 0.88 (avg/edge) [iteration 2] + Total span: 92 (total) 0.88 (avg/edge) [iteration 3] + Total span: 92 (total) 0.88 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 92 (total) 0.88 (avg/edge) [before] - Total span: 88 (total) 0.84 (avg/edge) [window 3..6] - Total span: 88 (total) 0.84 (avg/edge) [after] + Total span: 92 (total) 0.88 (avg/edge) [before] + Total span: 88 (total) 0.84 (avg/edge) [window 3..6] + Total span: 88 (total) 0.84 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out index 57d0cb9a9..26c7d35d5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.33 (avg/edge) [before] - Total span: 2 (total) 0.33 (avg/edge) [iteration 1] - Total span: 2 (total) 0.33 (avg/edge) [after] + Total span: 2 (total) 0.33 (avg/edge) [before] + Total span: 2 (total) 0.33 (avg/edge) [iteration 1] + Total span: 2 (total) 0.33 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.33 (avg/edge) [before] - Total span: 2 (total) 0.33 (avg/edge) [after] + Total span: 2 (total) 0.33 (avg/edge) [before] + Total span: 2 (total) 0.33 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out index 70fbdf69d..a2fe93f2c 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out index b14526ed0..8d7012423 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out index 0d83673e4..7db99aa19 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.67 (avg/edge) [before] - Total span: 2 (total) 0.67 (avg/edge) [iteration 1] - Total span: 2 (total) 0.67 (avg/edge) [after] + Total span: 2 (total) 0.67 (avg/edge) [before] + Total span: 2 (total) 0.67 (avg/edge) [iteration 1] + Total span: 2 (total) 0.67 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.67 (avg/edge) [before] - Total span: 2 (total) 0.67 (avg/edge) [after] + Total span: 2 (total) 0.67 (avg/edge) [before] + Total span: 2 (total) 0.67 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out index 3050084e5..6829edfbd 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out index 76fbb676d..0c1a0fc88 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.40 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [iteration 1] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 2 (total) 0.40 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [iteration 1] + Total span: 2 (total) 0.40 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.40 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 2 (total) 0.40 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out index 7c7b6d12d..0b79217e5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 3 (total) 0.33 (avg/edge) [before] - Total span: 3 (total) 0.33 (avg/edge) [iteration 1] - Total span: 3 (total) 0.33 (avg/edge) [after] + Total span: 3 (total) 0.33 (avg/edge) [before] + Total span: 3 (total) 0.33 (avg/edge) [iteration 1] + Total span: 3 (total) 0.33 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 3 (total) 0.33 (avg/edge) [before] - Total span: 3 (total) 0.33 (avg/edge) [after] + Total span: 3 (total) 0.33 (avg/edge) [before] + Total span: 3 (total) 0.33 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out index e8bf5570d..b23a5837d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out index 77f622380..f81f32f3e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out index 923b22a14..bc550876c 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [iteration 1] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) [iteration 1] + Total span: 1 (total) 0.20 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out index 956f49a51..2035c3da4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [iteration 1] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) [iteration 1] + Total span: 1 (total) 0.20 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out index 21aba9eae..b77e34b44 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out index dfd5b82b1..7dffbd27a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out index a98d3aea6..e6d90281f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out index 3d718549e..f1e8afd6e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out index e386589d4..602475e63 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out index e3cfda218..7be617ba6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out index 5873a9724..d61e58ebb 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out @@ -20,14 +20,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 7 (total) 3.50 (avg/edge) [before] - Total span: 7 (total) 3.50 (avg/edge) [iteration 1] - Total span: 7 (total) 3.50 (avg/edge) [after] + Total span: 7 (total) 3.50 (avg/edge) [before] + Total span: 7 (total) 3.50 (avg/edge) [iteration 1] + Total span: 7 (total) 3.50 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 7 (total) 3.50 (avg/edge) [before] - Total span: 7 (total) 3.50 (avg/edge) [after] + Total span: 7 (total) 3.50 (avg/edge) [before] + Total span: 7 (total) 3.50 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out index 8a131254f..680570b77 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.04 (avg/edge) [before] - Total span: 2 (total) 0.04 (avg/edge) [iteration 1] - Total span: 2 (total) 0.04 (avg/edge) [after] + Total span: 2 (total) 0.04 (avg/edge) [before] + Total span: 2 (total) 0.04 (avg/edge) [iteration 1] + Total span: 2 (total) 0.04 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.04 (avg/edge) [before] - Total span: 2 (total) 0.04 (avg/edge) [after] + Total span: 2 (total) 0.04 (avg/edge) [before] + Total span: 2 (total) 0.04 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out index 824740ca4..0e0f031ba 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out @@ -21,17 +21,17 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 29 (total) 1.32 (avg/edge) [before] - Total span: 24 (total) 1.09 (avg/edge) [iteration 1] - Total span: 18 (total) 0.82 (avg/edge) [iteration 2] - Total span: 13 (total) 0.59 (avg/edge) [iteration 3] - Total span: 13 (total) 0.59 (avg/edge) [iteration 4] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 29 (total) 1.32 (avg/edge) [before] + Total span: 24 (total) 1.09 (avg/edge) [iteration 1] + Total span: 18 (total) 0.82 (avg/edge) [iteration 2] + Total span: 13 (total) 0.59 (avg/edge) [iteration 3] + Total span: 13 (total) 0.59 (avg/edge) [iteration 4] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out index 0a5acd6c2..b78e1c0f4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 2..5] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) [window 2..5] + Total span: 12 (total) 0.55 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out index d3a639a24..25e62ac95 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out @@ -21,18 +21,18 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 31 (total) 1.41 (avg/edge) [before] - Total span: 20 (total) 0.91 (avg/edge) [iteration 1] - Total span: 14 (total) 0.64 (avg/edge) [iteration 2] - Total span: 13 (total) 0.59 (avg/edge) [iteration 3] - Total span: 13 (total) 0.59 (avg/edge) [iteration 4] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 31 (total) 1.41 (avg/edge) [before] + Total span: 20 (total) 0.91 (avg/edge) [iteration 1] + Total span: 14 (total) 0.64 (avg/edge) [iteration 2] + Total span: 13 (total) 0.59 (avg/edge) [iteration 3] + Total span: 13 (total) 0.59 (avg/edge) [iteration 4] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out index 9308d78c3..a8221dec1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out index d10b7522f..bbe963d4e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out index 3f9f0156f..c49b7bebf 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 2..5] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) [window 2..5] + Total span: 12 (total) 0.55 (avg/edge) [after] Variable order changed. -- GitLab From 8fbe0f743f6805cfc0e2bfb9e3a2e16d61a7540a Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 21:09:08 +0200 Subject: [PATCH 4/8] #196 Add WES as variable ordering metric. --- .../datasynth/varorder/ForceVarOrderer.java | 6 +- .../varorder/SlidingWindowVarOrderer.java | 7 +- .../varorder/helper/VarOrdererHelper.java | 100 ++++++++++++++++-- 3 files changed, 96 insertions(+), 17 deletions(-) diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java index 1f69a22d9..413158e8c 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ForceVarOrderer.java @@ -86,7 +86,7 @@ public class ForceVarOrderer implements VarOrderer { long curTotalSpan = helper.computeTotalSpanForNewIndices(curIndices); long bestTotalSpan = curTotalSpan; if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, curTotalSpan, "before"); + helper.dbgMetricsForNewIndices(dbgLevel, curIndices, "before"); } // Perform iterations of the algorithm. @@ -127,7 +127,7 @@ public class ForceVarOrderer implements VarOrderer { // Get new total span. long newTotalSpan = helper.computeTotalSpanForNewIndices(curIndices); if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, newTotalSpan, fmt("iteration %,d", curIter + 1)); + helper.dbgMetricsForNewIndices(dbgLevel, curIndices, fmt("iteration %,d", curIter + 1)); } // Stop when total span stops changing. We could stop as soon as it stops decreasing. However, we may end @@ -151,7 +151,7 @@ public class ForceVarOrderer implements VarOrderer { // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, bestTotalSpan, "after"); + helper.dbgMetricsForNewIndices(dbgLevel, bestIndices, "after"); } // Return the best order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java index 36c03ffca..8ea85adf6 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/SlidingWindowVarOrderer.java @@ -57,7 +57,7 @@ public class SlidingWindowVarOrderer implements VarOrderer { int[] curIndices = helper.getNewIndicesForVarOrder(inputOrder); long curSpan = helper.computeTotalSpanForNewIndices(curIndices); if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, curSpan, "before"); + helper.dbgMetricsForNewIndices(dbgLevel, curIndices, "before"); } // Process all windows. @@ -87,14 +87,15 @@ public class SlidingWindowVarOrderer implements VarOrderer { System.arraycopy(windowPerms[bestIdx], 0, curIndices, offset, length); if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, curSpan, fmt("window %d..%d", offset, offset + length - 1)); + helper.dbgMetricsForNewIndices(dbgLevel, curIndices, + fmt("window %d..%d", offset, offset + length - 1)); } } } // Debug output after applying the algorithm. if (dbgEnabled) { - helper.dbgMetrics(dbgLevel, curSpan, "after"); + helper.dbgMetricsForNewIndices(dbgLevel, curIndices, "after"); } // Return the resulting order. diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java index e0fd7c0ed..16399aa4b 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelper.java @@ -70,6 +70,15 @@ public class VarOrdererHelper { /** The number of characters to use for printing the total span metric, as average per edge, in debug output. */ private final int metricLengthTotalSpanAvg; + /** The number of characters to use for printing the Weighted Event Span (WES) metric in debug output. */ + private final int metricLengthWes; + + /** + * The number of characters to use for printing the Weighted Event Span (WES) metric, as average per edge, in debug + * output. + */ + private final int metricLengthWesAvg; + /** * Constructor for the {@link VarOrdererHelper} class. * @@ -96,6 +105,8 @@ public class VarOrdererHelper { this.metricLengthTotalSpan = fmt("%,d", computeTotalSpanForVarOrder(variables)).length() + 2; this.metricLengthTotalSpanAvg = fmt("%,.2f", (double)computeTotalSpanForVarOrder(variables) / hyperEdges.length) .length() + 2; + this.metricLengthWes = fmt("%,.6f", computeWesForVarOrder(variables)).length() + 2; + this.metricLengthWesAvg = fmt("%,.6f", computeWesForVarOrder(variables) / hyperEdges.length).length() + 2; } /** @@ -188,7 +199,7 @@ public class VarOrdererHelper { } /** - * Computes the total span metric. + * Compute the total span metric. * * @param order The variable order. * @return The total span. @@ -199,7 +210,7 @@ public class VarOrdererHelper { } /** - * Computes the total span metric. + * Compute the total span metric. * * @param order The node order. * @return The total span. @@ -210,7 +221,7 @@ public class VarOrdererHelper { } /** - * Computes the total span metric. + * Compute the total span metric. * * @param newIndices For each variable, its new 0-based index. * @return The total span. @@ -235,6 +246,68 @@ public class VarOrdererHelper { return totalSpan; } + /** + * Compute the Weighted Event Span (WES) metric. + * + * @param order The variable order. + * @return The Weighted Event Span (WES). + */ + public double computeWesForVarOrder(List order) { + int[] newIndices = getNewIndicesForVarOrder(order); + return computeWesForNewIndices(newIndices); + } + + /** + * Compute the Weighted Event Span (WES) metric. + * + * @param order The node order. + * @return The Weighted Event Span (WES). + */ + public double computeWesForNodeOrder(List order) { + int[] newIndices = getNewIndicesForNodeOrder(order); + return computeWesForNewIndices(newIndices); + } + + /** + * Compute the Weighted Event Span (WES) metric. + * + * @param newIndices For each variable, its new 0-based index. + * @return The Weighted Event Span (WES). + */ + public double computeWesForNewIndices(int[] newIndices) { + // This method is based on formula 7 from: Sam Lousberg, Sander Thuijsman and Michel Reniers, "DSM-based + // variable ordering heuristic for reduced computational effort of symbolic supervisor synthesis", + // IFAC-PapersOnLine, volume 53, issue 4, pages 429-436, 2020, https://doi.org/10.1016/j.ifacol.2021.04.058. + // + // The formula is: WES = SUM_{e in E} (2 * x_b) / |x| * (x_b - x_t + 1) / (|x| * |E|) + // Where: + // 1) 'E' is the set of edges. We use the hyper-edges. + // 2) 'x' the current-state variables. We use the synthesis variables. + // 3) 'x_b'/'x_t' the indices of the bottom/top BDD-variable in 'T_e(X)', the transition relation of edge 'e'. + // Note that we use hyper-edges as edges. Also, variables in the variable order with lower indices are higher + // (less deep, closer to the root) in the BDDs, while variables with higher indices are lower (deeper, closer + // to the leafs) in the BDDs. Therefore, we use for each hyper-edge: the highest index of a variable with an + // enabled bit in that hyper-edge as 'x_b', and the lowest index of a variable with an enabled bit in that + // hyper-edge as 'x_t'. + double nx = variables.size(); + double nE = hyperEdges.length; + double wes = 0; + for (BitSet edge: hyperEdges) { + // Compute 'x_t' and 'x_b' for this edge. + int xT = Integer.MAX_VALUE; + int xB = 0; + for (int i: BitSets.iterateTrueBits(edge)) { + int newIdx = newIndices[i]; + xT = Math.min(xT, newIdx); + xB = Math.max(xB, newIdx); + } + + // Update WES for this edge. + wes += (2 * xB) / nx * (xB - xT + 1) / (nx * nE); + } + return wes; + } + /** * Print various metrics as debug output, for the given variable order. * @@ -267,21 +340,26 @@ public class VarOrdererHelper { * @param annotation A human-readable text indicating the reason for printing the metrics. */ public void dbgMetricsForNewIndices(int dbgLevel, int[] newIndices, String annotation) { - long totalSpan = computeTotalSpanForNewIndices(newIndices); - dbgMetrics(dbgLevel, totalSpan, annotation); + String msg = fmtMetrics(newIndices, annotation); + dbg(dbgLevel, msg); } /** - * Print various metrics as debug output. + * Format various metrics, for the given new indices of the variables. * - * @param dbgLevel The debug indentation level. - * @param totalSpan The given total span. - * @param annotation A human-readable text indicating the reason for printing the metrics. + * @param newIndices For each variable, its new 0-based index. + * @param annotation A human-readable text indicating the reason for formatting the metrics. + * @return The formatted metrics. */ - public void dbgMetrics(int dbgLevel, long totalSpan, String annotation) { + public String fmtMetrics(int[] newIndices, String annotation) { + long totalSpan = computeTotalSpanForNewIndices(newIndices); + double wes = computeWesForNewIndices(newIndices); String fmtTotalSpan = fmt("%," + metricLengthTotalSpan + "d", totalSpan); String fmtTotalSpanAvg = fmt("%," + metricLengthTotalSpanAvg + ".2f", (double)totalSpan / hyperEdges.length); - dbg(dbgLevel, "Total span: %s (total) %s (avg/edge) [%s]", fmtTotalSpan, fmtTotalSpanAvg, annotation); + String fmtWes = fmt("%," + metricLengthWes + ".6f", wes); + String fmtWesAvg = fmt("%," + metricLengthWesAvg + ".6f", wes / hyperEdges.length); + return fmt("Total span: %s (total) %s (avg/edge) / WES: %s (total) %s (avg/edge) [%s]", fmtTotalSpan, + fmtTotalSpanAvg, fmtWes, fmtWesAvg, annotation); } /** -- GitLab From f10ff5600de414047867f5fe86a616b42a24b846 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 21:09:35 +0200 Subject: [PATCH 5/8] #196 Update expected test output. --- .../tests/datasynth/alg_vars.cif.out | 10 +++++----- .../tests/datasynth/asgn_div.cif.out | 14 +++++++------- .../tests/datasynth/asgn_mod.cif.out | 14 +++++++------- .../tests/datasynth/asgn_var_copy.cif.out | 12 ++++++------ .../tests/datasynth/bad_locs.cif.out | 10 +++++----- .../tests/datasynth/bdd_out_nodes.cif.out | 12 ++++++------ .../tests/datasynth/booleans.cif.out | 12 ++++++------ .../tests/datasynth/channel.cif.out | 10 +++++----- .../tests/datasynth/ctrl_sys.cif.out | 10 +++++----- .../tests/datasynth/diamond.cif.out | 12 ++++++------ .../datasynth/dining_philosophers4.cif.out | 14 +++++++------- .../tests/datasynth/double_loop.cif.out | 10 +++++----- .../tests/datasynth/event_warnings.cif.out | 12 ++++++------ .../datasynth/example_button_lamp.cif.out | 12 ++++++------ .../tests/datasynth/fig2a.cif.out | 10 +++++----- .../tests/datasynth/fig2b.cif.out | 10 +++++----- .../tests/datasynth/forward_reach_off.cif.out | 10 +++++----- .../tests/datasynth/forward_reach_on.cif.out | 10 +++++----- .../tests/datasynth/guards_upds.cif.out | 10 +++++----- .../tests/datasynth/if_expr.cif.out | 12 ++++++------ .../tests/datasynth/if_preds.cif.out | 12 ++++++------ .../tests/datasynth/input_vars1.cif.out | 10 +++++----- .../tests/datasynth/input_vars3.cif.out | 10 +++++----- .../tests/datasynth/input_vars7.cif.out | 10 +++++----- .../inv_state_evt_exclusion_plant_loc.cif.out | 10 +++++----- .../inv_state_evt_exclusion_req_loc.cif.out | 10 +++++----- .../tests/datasynth/invalid8.cif.out | 10 +++++----- .../tests/datasynth/loop.cif.out | 10 +++++----- .../tests/datasynth/many_rounds.cif.out | 10 +++++----- .../tests/datasynth/marking1.cif.out | 12 ++++++------ .../tests/datasynth/multi_plants.cif.out | 10 +++++----- .../tests/datasynth/multi_req_auts.cif.out | 10 +++++----- .../tests/datasynth/multi_req_invs1.cif.out | 10 +++++----- .../tests/datasynth/multi_req_invs2.cif.out | 10 +++++----- .../tests/datasynth/mutex1.cif.out | 12 ++++++------ .../tests/datasynth/mutex2.cif.out | 10 +++++----- .../tests/datasynth/namespace.cif.out | 12 ++++++------ .../tests/datasynth/no_marked1.cif.out | 12 ++++++------ .../tests/datasynth/non_determinism.cif.out | 12 ++++++------ .../tests/datasynth/predicates.cif.out | 16 ++++++++-------- .../tests/datasynth/req_counter.cif.out | 10 +++++----- .../req_evt_not_in_plant_ctrl.cif.out | 10 +++++----- .../req_evt_not_in_plant_unctrl.cif.out | 10 +++++----- .../tests/datasynth/req_loc_no_name.cif.out | 10 +++++----- .../tests/datasynth/req_monitor.cif.out | 10 +++++----- .../tests/datasynth/scopes.cif.out | 10 +++++----- .../tests/datasynth/seq.cif.out | 10 +++++----- .../datasynth/simplify_ctrl_beh_off.cif.out | 10 +++++----- .../datasynth/simplify_ctrl_beh_on.cif.out | 10 +++++----- .../datasynth/simplify_propagation_all.cif.out | 10 +++++----- .../simplify_propagation_none.cif.out | 10 +++++----- .../simplify_state_plant_invs_off.cif.out | 10 +++++----- .../simplify_state_plant_invs_on.cif.out | 10 +++++----- .../simplify_state_req_invs_off.cif.out | 10 +++++----- .../simplify_state_req_invs_on.cif.out | 10 +++++----- .../tests/datasynth/switch_expr.cif.out | 12 ++++++------ .../tests/datasynth/switch_preds.cif.out | 12 ++++++------ .../tests/datasynth/update_complex.cif.out | 10 +++++----- .../tests/datasynth/updates.cif.out | 10 +++++----- .../var_order_custom_force_on.cif.out | 16 ++++++++-------- .../datasynth/var_order_model_force_on.cif.out | 12 ++++++------ .../var_order_random_force_on.cif.out | 18 +++++++++--------- .../var_order_reverse_model_force_on.cif.out | 12 ++++++------ .../var_order_reverse_sorted_force_on.cif.out | 12 ++++++------ .../var_order_sorted_force_on.cif.out | 12 ++++++------ 65 files changed, 360 insertions(+), 360 deletions(-) diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out index 648bc5976..753b0732e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/alg_vars.cif.out @@ -20,14 +20,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.15 (avg/edge) [before] - Total span: 2 (total) 0.15 (avg/edge) [iteration 1] - Total span: 2 (total) 0.15 (avg/edge) [after] + Total span: 2 (total) 0.15 (avg/edge) / WES: 0.196923 (total) 0.015148 (avg/edge) [before] + Total span: 2 (total) 0.15 (avg/edge) / WES: 0.196923 (total) 0.015148 (avg/edge) [iteration 1] + Total span: 2 (total) 0.15 (avg/edge) / WES: 0.196923 (total) 0.015148 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.15 (avg/edge) [before] - Total span: 2 (total) 0.15 (avg/edge) [after] + Total span: 2 (total) 0.15 (avg/edge) / WES: 0.196923 (total) 0.015148 (avg/edge) [before] + Total span: 2 (total) 0.15 (avg/edge) / WES: 0.196923 (total) 0.015148 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out index 8b820b413..53253a0c7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_div.cif.out @@ -21,16 +21,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 15 (total) 1.50 (avg/edge) [before] - Total span: 11 (total) 1.10 (avg/edge) [iteration 1] - Total span: 9 (total) 0.90 (avg/edge) [iteration 2] - Total span: 9 (total) 0.90 (avg/edge) [iteration 3] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 15 (total) 1.50 (avg/edge) / WES: 0.472222 (total) 0.047222 (avg/edge) [before] + Total span: 11 (total) 1.10 (avg/edge) / WES: 0.388889 (total) 0.038889 (avg/edge) [iteration 1] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [iteration 2] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [iteration 3] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 9 (total) 0.90 (avg/edge) [before] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [before] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out index f2bde3894..3cef743ad 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_mod.cif.out @@ -21,16 +21,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 15 (total) 1.50 (avg/edge) [before] - Total span: 11 (total) 1.10 (avg/edge) [iteration 1] - Total span: 9 (total) 0.90 (avg/edge) [iteration 2] - Total span: 9 (total) 0.90 (avg/edge) [iteration 3] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 15 (total) 1.50 (avg/edge) / WES: 0.472222 (total) 0.047222 (avg/edge) [before] + Total span: 11 (total) 1.10 (avg/edge) / WES: 0.388889 (total) 0.038889 (avg/edge) [iteration 1] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [iteration 2] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [iteration 3] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 9 (total) 0.90 (avg/edge) [before] - Total span: 9 (total) 0.90 (avg/edge) [after] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [before] + Total span: 9 (total) 0.90 (avg/edge) / WES: 0.338889 (total) 0.033889 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out index e988c386f..227541d8e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/asgn_var_copy.cif.out @@ -20,15 +20,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 8 (total) 1.00 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [iteration 2] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 8 (total) 1.00 (avg/edge) / WES: 0.420000 (total) 0.052500 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.340000 (total) 0.042500 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.340000 (total) 0.042500 (avg/edge) [iteration 2] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.340000 (total) 0.042500 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.340000 (total) 0.042500 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.340000 (total) 0.042500 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out index ebfdd46d7..e1b436788 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bad_locs.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [iteration 1] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [iteration 1] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out index 90db9f3b1..2692fba4b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/bdd_out_nodes.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.291667 (total) 0.036458 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.291667 (total) 0.036458 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.291667 (total) 0.036458 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.38 (avg/edge) [window 0..3] - Total span: 3 (total) 0.38 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.291667 (total) 0.036458 (avg/edge) [before] + Total span: 3 (total) 0.38 (avg/edge) / WES: 0.166667 (total) 0.020833 (avg/edge) [window 0..3] + Total span: 3 (total) 0.38 (avg/edge) / WES: 0.166667 (total) 0.020833 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out index eb63b5932..11947cde9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/booleans.cif.out @@ -20,15 +20,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 1 (total) 0.13 (avg/edge) [iteration 1] - Total span: 1 (total) 0.13 (avg/edge) [iteration 2] - Total span: 1 (total) 0.13 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.190000 (total) 0.023750 (avg/edge) [before] + Total span: 1 (total) 0.13 (avg/edge) / WES: 0.110000 (total) 0.013750 (avg/edge) [iteration 1] + Total span: 1 (total) 0.13 (avg/edge) / WES: 0.110000 (total) 0.013750 (avg/edge) [iteration 2] + Total span: 1 (total) 0.13 (avg/edge) / WES: 0.110000 (total) 0.013750 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 1 (total) 0.13 (avg/edge) [before] - Total span: 1 (total) 0.13 (avg/edge) [after] + Total span: 1 (total) 0.13 (avg/edge) / WES: 0.110000 (total) 0.013750 (avg/edge) [before] + Total span: 1 (total) 0.13 (avg/edge) / WES: 0.110000 (total) 0.013750 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out index 2e27a5936..0bc8433c1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/channel.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.27 (avg/edge) [before] - Total span: 3 (total) 0.27 (avg/edge) [iteration 1] - Total span: 3 (total) 0.27 (avg/edge) [after] + Total span: 3 (total) 0.27 (avg/edge) / WES: 0.262626 (total) 0.023875 (avg/edge) [before] + Total span: 3 (total) 0.27 (avg/edge) / WES: 0.262626 (total) 0.023875 (avg/edge) [iteration 1] + Total span: 3 (total) 0.27 (avg/edge) / WES: 0.262626 (total) 0.023875 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.27 (avg/edge) [before] - Total span: 3 (total) 0.27 (avg/edge) [after] + Total span: 3 (total) 0.27 (avg/edge) / WES: 0.262626 (total) 0.023875 (avg/edge) [before] + Total span: 3 (total) 0.27 (avg/edge) / WES: 0.262626 (total) 0.023875 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out index 95cff9965..8875514c6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/ctrl_sys.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out index f8aca2b89..97744f727 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/diamond.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 1.50 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [iteration 1] - Total span: 4 (total) 1.00 (avg/edge) [iteration 2] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 6 (total) 1.50 (avg/edge) / WES: 1.111111 (total) 0.277778 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [iteration 1] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [iteration 2] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 1.00 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out index 0af96c335..42cd702f9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/dining_philosophers4.cif.out @@ -23,16 +23,16 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 30 - Total span: 51 (total) 4.25 (avg/edge) [before] - Total span: 27 (total) 2.25 (avg/edge) [iteration 1] - Total span: 26 (total) 2.17 (avg/edge) [iteration 2] - Total span: 26 (total) 2.17 (avg/edge) [iteration 3] - Total span: 26 (total) 2.17 (avg/edge) [after] + Total span: 51 (total) 4.25 (avg/edge) / WES: 0.929688 (total) 0.077474 (avg/edge) [before] + Total span: 27 (total) 2.25 (avg/edge) / WES: 0.494792 (total) 0.041233 (avg/edge) [iteration 1] + Total span: 26 (total) 2.17 (avg/edge) / WES: 0.466146 (total) 0.038845 (avg/edge) [iteration 2] + Total span: 26 (total) 2.17 (avg/edge) / WES: 0.466146 (total) 0.038845 (avg/edge) [iteration 3] + Total span: 26 (total) 2.17 (avg/edge) / WES: 0.466146 (total) 0.038845 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 26 (total) 2.17 (avg/edge) [before] - Total span: 26 (total) 2.17 (avg/edge) [after] + Total span: 26 (total) 2.17 (avg/edge) / WES: 0.466146 (total) 0.038845 (avg/edge) [before] + Total span: 26 (total) 2.17 (avg/edge) / WES: 0.466146 (total) 0.038845 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out index c27943408..5378300f4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/double_loop.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 5 (total) 0.23 (avg/edge) [before] - Total span: 5 (total) 0.23 (avg/edge) [iteration 1] - Total span: 5 (total) 0.23 (avg/edge) [after] + Total span: 5 (total) 0.23 (avg/edge) / WES: 0.424242 (total) 0.019284 (avg/edge) [before] + Total span: 5 (total) 0.23 (avg/edge) / WES: 0.424242 (total) 0.019284 (avg/edge) [iteration 1] + Total span: 5 (total) 0.23 (avg/edge) / WES: 0.424242 (total) 0.019284 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 5 (total) 0.23 (avg/edge) [before] - Total span: 5 (total) 0.23 (avg/edge) [after] + Total span: 5 (total) 0.23 (avg/edge) / WES: 0.424242 (total) 0.019284 (avg/edge) [before] + Total span: 5 (total) 0.23 (avg/edge) / WES: 0.424242 (total) 0.019284 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out index bca057aed..ea65c8ac0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/event_warnings.cif.out @@ -22,15 +22,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 18 (total) 0.45 (avg/edge) [before] - Total span: 18 (total) 0.45 (avg/edge) [iteration 1] - Total span: 18 (total) 0.45 (avg/edge) [after] + Total span: 18 (total) 0.45 (avg/edge) / WES: 0.150000 (total) 0.003750 (avg/edge) [before] + Total span: 18 (total) 0.45 (avg/edge) / WES: 0.150000 (total) 0.003750 (avg/edge) [iteration 1] + Total span: 18 (total) 0.45 (avg/edge) / WES: 0.150000 (total) 0.003750 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 18 (total) 0.45 (avg/edge) [before] - Total span: 11 (total) 0.28 (avg/edge) [window 0..3] - Total span: 11 (total) 0.28 (avg/edge) [after] + Total span: 18 (total) 0.45 (avg/edge) / WES: 0.150000 (total) 0.003750 (avg/edge) [before] + Total span: 11 (total) 0.28 (avg/edge) / WES: 0.131633 (total) 0.003291 (avg/edge) [window 0..3] + Total span: 11 (total) 0.28 (avg/edge) / WES: 0.131633 (total) 0.003291 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out index 07e58161e..db5b759c7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/example_button_lamp.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 1.50 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [iteration 1] - Total span: 4 (total) 1.00 (avg/edge) [iteration 2] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 6 (total) 1.50 (avg/edge) / WES: 1.111111 (total) 0.277778 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [iteration 1] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [iteration 2] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 1.00 (avg/edge) [before] - Total span: 4 (total) 1.00 (avg/edge) [after] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [before] + Total span: 4 (total) 1.00 (avg/edge) / WES: 0.666667 (total) 0.166667 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out index ad1ebc0db..1e178b86a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2a.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.625000 (total) 0.078125 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out index 7293068c3..ce27d5e1b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/fig2b.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [iteration 1] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [iteration 1] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.22 (avg/edge) [before] - Total span: 2 (total) 0.22 (avg/edge) [after] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 2 (total) 0.22 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out index 325ed40ed..b371fca54 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [iteration 1] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [iteration 1] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out index b439009b7..0447036d4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/forward_reach_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [iteration 1] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [iteration 1] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.12 (avg/edge) [before] - Total span: 2 (total) 0.12 (avg/edge) [after] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [before] + Total span: 2 (total) 0.12 (avg/edge) / WES: 0.117647 (total) 0.006920 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out index 6ffe409fd..8c4855f73 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/guards_upds.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.43 (avg/edge) [before] - Total span: 3 (total) 0.43 (avg/edge) [iteration 1] - Total span: 3 (total) 0.43 (avg/edge) [after] + Total span: 3 (total) 0.43 (avg/edge) / WES: 0.476190 (total) 0.068027 (avg/edge) [before] + Total span: 3 (total) 0.43 (avg/edge) / WES: 0.476190 (total) 0.068027 (avg/edge) [iteration 1] + Total span: 3 (total) 0.43 (avg/edge) / WES: 0.476190 (total) 0.068027 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.43 (avg/edge) [before] - Total span: 3 (total) 0.43 (avg/edge) [after] + Total span: 3 (total) 0.43 (avg/edge) / WES: 0.476190 (total) 0.068027 (avg/edge) [before] + Total span: 3 (total) 0.43 (avg/edge) / WES: 0.476190 (total) 0.068027 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out index 0e6a077c8..d5c42c2d6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_expr.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out index 23c2d0581..5a2b4fa63 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/if_preds.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out index c1ce2d31b..180a0e72b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars1.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 2 (total) 2.00 (avg/edge) [iteration 1] - Total span: 2 (total) 2.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [before] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [iteration 1] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 2 (total) 2.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [before] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out index 3c464c14d..f82efbd7c 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars3.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [iteration 1] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.444444 (total) 0.111111 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.444444 (total) 0.111111 (avg/edge) [iteration 1] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.444444 (total) 0.111111 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.444444 (total) 0.111111 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.444444 (total) 0.111111 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out index f0467b10e..807656b5e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/input_vars7.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [iteration 1] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.888889 (total) 0.888889 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [iteration 1] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.888889 (total) 0.888889 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.888889 (total) 0.888889 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.888889 (total) 0.888889 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out index 22e8a5afa..6424fe68b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_plant_loc.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 4 (total) 0.08 (avg/edge) [before] - Total span: 4 (total) 0.08 (avg/edge) [iteration 1] - Total span: 4 (total) 0.08 (avg/edge) [after] + Total span: 4 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.009600 (avg/edge) [before] + Total span: 4 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.009600 (avg/edge) [iteration 1] + Total span: 4 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.009600 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 4 (total) 0.08 (avg/edge) [before] - Total span: 4 (total) 0.08 (avg/edge) [after] + Total span: 4 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.009600 (avg/edge) [before] + Total span: 4 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.009600 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out index 7bc44f2d4..3bd34b7ee 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/inv_state_evt_exclusion_req_loc.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.08 (avg/edge) [before] - Total span: 2 (total) 0.08 (avg/edge) [iteration 1] - Total span: 2 (total) 0.08 (avg/edge) [after] + Total span: 2 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.019200 (avg/edge) [before] + Total span: 2 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.019200 (avg/edge) [iteration 1] + Total span: 2 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.019200 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.08 (avg/edge) [before] - Total span: 2 (total) 0.08 (avg/edge) [after] + Total span: 2 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.019200 (avg/edge) [before] + Total span: 2 (total) 0.08 (avg/edge) / WES: 0.480000 (total) 0.019200 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out index dd107657b..31a6d20f0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/invalid8.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.04 (avg/edge) [before] - Total span: 1 (total) 0.04 (avg/edge) [iteration 1] - Total span: 1 (total) 0.04 (avg/edge) [after] + Total span: 1 (total) 0.04 (avg/edge) / WES: 0.077295 (total) 0.003361 (avg/edge) [before] + Total span: 1 (total) 0.04 (avg/edge) / WES: 0.077295 (total) 0.003361 (avg/edge) [iteration 1] + Total span: 1 (total) 0.04 (avg/edge) / WES: 0.077295 (total) 0.003361 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.04 (avg/edge) [before] - Total span: 1 (total) 0.04 (avg/edge) [after] + Total span: 1 (total) 0.04 (avg/edge) / WES: 0.077295 (total) 0.003361 (avg/edge) [before] + Total span: 1 (total) 0.04 (avg/edge) / WES: 0.077295 (total) 0.003361 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out index 1e63ae31b..5e674055d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/loop.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [iteration 1] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.750000 (total) 0.187500 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.750000 (total) 0.187500 (avg/edge) [iteration 1] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.750000 (total) 0.187500 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.50 (avg/edge) [before] - Total span: 2 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.750000 (total) 0.187500 (avg/edge) [before] + Total span: 2 (total) 0.50 (avg/edge) / WES: 0.750000 (total) 0.187500 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out index bd63105a1..66faedd41 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/many_rounds.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 7 (total) 0.37 (avg/edge) [before] - Total span: 7 (total) 0.37 (avg/edge) [iteration 1] - Total span: 7 (total) 0.37 (avg/edge) [after] + Total span: 7 (total) 0.37 (avg/edge) / WES: 0.684211 (total) 0.036011 (avg/edge) [before] + Total span: 7 (total) 0.37 (avg/edge) / WES: 0.684211 (total) 0.036011 (avg/edge) [iteration 1] + Total span: 7 (total) 0.37 (avg/edge) / WES: 0.684211 (total) 0.036011 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 7 (total) 0.37 (avg/edge) [before] - Total span: 7 (total) 0.37 (avg/edge) [after] + Total span: 7 (total) 0.37 (avg/edge) / WES: 0.684211 (total) 0.036011 (avg/edge) [before] + Total span: 7 (total) 0.37 (avg/edge) / WES: 0.684211 (total) 0.036011 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out index 9e3c696e6..85d299c06 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/marking1.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [iteration 2] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 2 (total) 1.00 (avg/edge) / WES: 0.888889 (total) 0.444444 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.333333 (total) 0.166667 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.333333 (total) 0.166667 (avg/edge) [iteration 2] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.333333 (total) 0.166667 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.333333 (total) 0.166667 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.333333 (total) 0.166667 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out index c1b193f0c..1c89838e8 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_plants.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [iteration 1] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [iteration 1] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out index 4ad038a35..8e55a9251 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_auts.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.75 (avg/edge) [iteration 1] - Total span: 3 (total) 0.75 (avg/edge) [after] + Total span: 3 (total) 0.75 (avg/edge) / WES: 0.555556 (total) 0.138889 (avg/edge) [before] + Total span: 3 (total) 0.75 (avg/edge) / WES: 0.555556 (total) 0.138889 (avg/edge) [iteration 1] + Total span: 3 (total) 0.75 (avg/edge) / WES: 0.555556 (total) 0.138889 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.75 (avg/edge) [before] - Total span: 3 (total) 0.75 (avg/edge) [after] + Total span: 3 (total) 0.75 (avg/edge) / WES: 0.555556 (total) 0.138889 (avg/edge) [before] + Total span: 3 (total) 0.75 (avg/edge) / WES: 0.555556 (total) 0.138889 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out index d1a0a9297..5f42c0988 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs1.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.09 (avg/edge) [before] - Total span: 1 (total) 0.09 (avg/edge) [iteration 1] - Total span: 1 (total) 0.09 (avg/edge) [after] + Total span: 1 (total) 0.09 (avg/edge) / WES: 0.272727 (total) 0.024793 (avg/edge) [before] + Total span: 1 (total) 0.09 (avg/edge) / WES: 0.272727 (total) 0.024793 (avg/edge) [iteration 1] + Total span: 1 (total) 0.09 (avg/edge) / WES: 0.272727 (total) 0.024793 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.09 (avg/edge) [before] - Total span: 1 (total) 0.09 (avg/edge) [after] + Total span: 1 (total) 0.09 (avg/edge) / WES: 0.272727 (total) 0.024793 (avg/edge) [before] + Total span: 1 (total) 0.09 (avg/edge) / WES: 0.272727 (total) 0.024793 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out index 53d64d1be..d8299fd1b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/multi_req_invs2.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 5 (total) 0.45 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [iteration 1] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.590909 (total) 0.053719 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.590909 (total) 0.053719 (avg/edge) [iteration 1] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.590909 (total) 0.053719 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 5 (total) 0.45 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.590909 (total) 0.053719 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.590909 (total) 0.053719 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out index 8cee0e738..1dc41ed5b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex1.cif.out @@ -19,15 +19,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.55 (avg/edge) [before] - Total span: 6 (total) 0.55 (avg/edge) [iteration 1] - Total span: 6 (total) 0.55 (avg/edge) [after] + Total span: 6 (total) 0.55 (avg/edge) / WES: 0.397727 (total) 0.036157 (avg/edge) [before] + Total span: 6 (total) 0.55 (avg/edge) / WES: 0.397727 (total) 0.036157 (avg/edge) [iteration 1] + Total span: 6 (total) 0.55 (avg/edge) / WES: 0.397727 (total) 0.036157 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.55 (avg/edge) [before] - Total span: 5 (total) 0.45 (avg/edge) [window 0..3] - Total span: 5 (total) 0.45 (avg/edge) [after] + Total span: 6 (total) 0.55 (avg/edge) / WES: 0.397727 (total) 0.036157 (avg/edge) [before] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.329545 (total) 0.029959 (avg/edge) [window 0..3] + Total span: 5 (total) 0.45 (avg/edge) / WES: 0.329545 (total) 0.029959 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out index e8476ad3b..55e32e992 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/mutex2.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.357143 (total) 0.051020 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.357143 (total) 0.051020 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.357143 (total) 0.051020 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.357143 (total) 0.051020 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.357143 (total) 0.051020 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out index 19fce39ba..6f5683aac 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/namespace.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [iteration 1] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.518519 (total) 0.086420 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.518519 (total) 0.086420 (avg/edge) [iteration 1] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.518519 (total) 0.086420 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 4 (total) 0.67 (avg/edge) [before] - Total span: 3 (total) 0.50 (avg/edge) [window 0..2] - Total span: 3 (total) 0.50 (avg/edge) [after] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.518519 (total) 0.086420 (avg/edge) [before] + Total span: 3 (total) 0.50 (avg/edge) / WES: 0.370370 (total) 0.061728 (avg/edge) [window 0..2] + Total span: 3 (total) 0.50 (avg/edge) / WES: 0.370370 (total) 0.061728 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out index 683d04dd7..c14736765 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/no_marked1.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 2.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [iteration 1] - Total span: 1 (total) 1.00 (avg/edge) [iteration 2] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 2 (total) 2.00 (avg/edge) / WES: 1.333333 (total) 1.333333 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [iteration 1] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [iteration 2] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 1.00 (avg/edge) [before] - Total span: 1 (total) 1.00 (avg/edge) [after] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [before] + Total span: 1 (total) 1.00 (avg/edge) / WES: 0.444444 (total) 0.444444 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out index 4df0ba894..fa1ccf756 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/non_determinism.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 5 (total) 0.83 (avg/edge) [before] - Total span: 5 (total) 0.83 (avg/edge) [iteration 1] - Total span: 5 (total) 0.83 (avg/edge) [after] + Total span: 5 (total) 0.83 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [before] + Total span: 5 (total) 0.83 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [iteration 1] + Total span: 5 (total) 0.83 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 5 (total) 0.83 (avg/edge) [before] - Total span: 4 (total) 0.67 (avg/edge) [window 0..2] - Total span: 4 (total) 0.67 (avg/edge) [after] + Total span: 5 (total) 0.83 (avg/edge) / WES: 0.629630 (total) 0.104938 (avg/edge) [before] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.555556 (total) 0.092593 (avg/edge) [window 0..2] + Total span: 4 (total) 0.67 (avg/edge) / WES: 0.555556 (total) 0.092593 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out index c22d07a0d..631306e85 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/predicates.cif.out @@ -24,17 +24,17 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 30 - Total span: 183 (total) 1.74 (avg/edge) [before] - Total span: 103 (total) 0.98 (avg/edge) [iteration 1] - Total span: 92 (total) 0.88 (avg/edge) [iteration 2] - Total span: 92 (total) 0.88 (avg/edge) [iteration 3] - Total span: 92 (total) 0.88 (avg/edge) [after] + Total span: 183 (total) 1.74 (avg/edge) / WES: 0.295591 (total) 0.002815 (avg/edge) [before] + Total span: 103 (total) 0.98 (avg/edge) / WES: 0.217519 (total) 0.002072 (avg/edge) [iteration 1] + Total span: 92 (total) 0.88 (avg/edge) / WES: 0.193768 (total) 0.001845 (avg/edge) [iteration 2] + Total span: 92 (total) 0.88 (avg/edge) / WES: 0.193768 (total) 0.001845 (avg/edge) [iteration 3] + Total span: 92 (total) 0.88 (avg/edge) / WES: 0.193768 (total) 0.001845 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 92 (total) 0.88 (avg/edge) [before] - Total span: 88 (total) 0.84 (avg/edge) [window 3..6] - Total span: 88 (total) 0.84 (avg/edge) [after] + Total span: 92 (total) 0.88 (avg/edge) / WES: 0.193768 (total) 0.001845 (avg/edge) [before] + Total span: 88 (total) 0.84 (avg/edge) / WES: 0.186008 (total) 0.001772 (avg/edge) [window 3..6] + Total span: 88 (total) 0.84 (avg/edge) / WES: 0.186008 (total) 0.001772 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out index 26c7d35d5..217f3ed03 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_counter.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.33 (avg/edge) [before] - Total span: 2 (total) 0.33 (avg/edge) [iteration 1] - Total span: 2 (total) 0.33 (avg/edge) [after] + Total span: 2 (total) 0.33 (avg/edge) / WES: 0.666667 (total) 0.111111 (avg/edge) [before] + Total span: 2 (total) 0.33 (avg/edge) / WES: 0.666667 (total) 0.111111 (avg/edge) [iteration 1] + Total span: 2 (total) 0.33 (avg/edge) / WES: 0.666667 (total) 0.111111 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.33 (avg/edge) [before] - Total span: 2 (total) 0.33 (avg/edge) [after] + Total span: 2 (total) 0.33 (avg/edge) / WES: 0.666667 (total) 0.111111 (avg/edge) [before] + Total span: 2 (total) 0.33 (avg/edge) / WES: 0.666667 (total) 0.111111 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out index a2fe93f2c..91381dd30 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_ctrl.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out index 8d7012423..9f075b640 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_evt_not_in_plant_unctrl.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [iteration 1] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [iteration 1] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.14 (avg/edge) [before] - Total span: 1 (total) 0.14 (avg/edge) [after] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [before] + Total span: 1 (total) 0.14 (avg/edge) / WES: 0.214286 (total) 0.030612 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out index 7db99aa19..0fb3596c7 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_loc_no_name.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.67 (avg/edge) [before] - Total span: 2 (total) 0.67 (avg/edge) [iteration 1] - Total span: 2 (total) 0.67 (avg/edge) [after] + Total span: 2 (total) 0.67 (avg/edge) / WES: 0.833333 (total) 0.277778 (avg/edge) [before] + Total span: 2 (total) 0.67 (avg/edge) / WES: 0.833333 (total) 0.277778 (avg/edge) [iteration 1] + Total span: 2 (total) 0.67 (avg/edge) / WES: 0.833333 (total) 0.277778 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.67 (avg/edge) [before] - Total span: 2 (total) 0.67 (avg/edge) [after] + Total span: 2 (total) 0.67 (avg/edge) / WES: 0.833333 (total) 0.277778 (avg/edge) [before] + Total span: 2 (total) 0.67 (avg/edge) / WES: 0.833333 (total) 0.277778 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out index 6829edfbd..f98041cc2 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/req_monitor.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [iteration 1] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.562500 (total) 0.070313 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.515625 (total) 0.064453 (avg/edge) [iteration 1] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.562500 (total) 0.070313 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 6 (total) 0.75 (avg/edge) [before] - Total span: 6 (total) 0.75 (avg/edge) [after] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.562500 (total) 0.070313 (avg/edge) [before] + Total span: 6 (total) 0.75 (avg/edge) / WES: 0.562500 (total) 0.070313 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out index 0c1a0fc88..9c7e981a1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/scopes.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.40 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [iteration 1] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.500000 (total) 0.100000 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.500000 (total) 0.100000 (avg/edge) [iteration 1] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.500000 (total) 0.100000 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.40 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.500000 (total) 0.100000 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.500000 (total) 0.100000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out index 0b79217e5..ec929b091 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/seq.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 3 (total) 0.33 (avg/edge) [before] - Total span: 3 (total) 0.33 (avg/edge) [iteration 1] - Total span: 3 (total) 0.33 (avg/edge) [after] + Total span: 3 (total) 0.33 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 3 (total) 0.33 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [iteration 1] + Total span: 3 (total) 0.33 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 3 (total) 0.33 (avg/edge) [before] - Total span: 3 (total) 0.33 (avg/edge) [after] + Total span: 3 (total) 0.33 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [before] + Total span: 3 (total) 0.33 (avg/edge) / WES: 0.611111 (total) 0.067901 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out index b23a5837d..e59d80eb6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_off.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out index f81f32f3e..5c0add15b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_ctrl_beh_on.cif.out @@ -19,14 +19,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [iteration 1] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [iteration 1] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 2 (total) 0.25 (avg/edge) [before] - Total span: 2 (total) 0.25 (avg/edge) [after] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [before] + Total span: 2 (total) 0.25 (avg/edge) / WES: 0.281250 (total) 0.035156 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out index bc550876c..3b343014b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_all.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [iteration 1] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [iteration 1] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out index 2035c3da4..dc905e7b0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_propagation_none.cif.out @@ -18,14 +18,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [iteration 1] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [iteration 1] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 1 (total) 0.20 (avg/edge) [before] - Total span: 1 (total) 0.20 (avg/edge) [after] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [before] + Total span: 1 (total) 0.20 (avg/edge) / WES: 0.311111 (total) 0.062222 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out index b77e34b44..b03160aa1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out index 7dffbd27a..b43c7bc43 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_plant_invs_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out index e6d90281f..7c9c825b5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_off.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out index f1e8afd6e..f7b287db9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/simplify_state_req_invs_on.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [iteration 1] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [iteration 1] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 1 (total) 0.50 (avg/edge) [before] - Total span: 1 (total) 0.50 (avg/edge) [after] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [before] + Total span: 1 (total) 0.50 (avg/edge) / WES: 0.500000 (total) 0.250000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out index 602475e63..d70ad2804 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_expr.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out index 7be617ba6..b98ce9587 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/switch_preds.cif.out @@ -18,15 +18,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 3 (total) 0.60 (avg/edge) [iteration 1] - Total span: 3 (total) 0.60 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [iteration 1] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [after] Applying sliding window algorithm. Window length: 3 - Total span: 3 (total) 0.60 (avg/edge) [before] - Total span: 2 (total) 0.40 (avg/edge) [window 0..2] - Total span: 2 (total) 0.40 (avg/edge) [after] + Total span: 3 (total) 0.60 (avg/edge) / WES: 0.488889 (total) 0.097778 (avg/edge) [before] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [window 0..2] + Total span: 2 (total) 0.40 (avg/edge) / WES: 0.400000 (total) 0.080000 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out index d61e58ebb..736717615 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/update_complex.cif.out @@ -20,14 +20,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 7 (total) 3.50 (avg/edge) [before] - Total span: 7 (total) 3.50 (avg/edge) [iteration 1] - Total span: 7 (total) 3.50 (avg/edge) [after] + Total span: 7 (total) 3.50 (avg/edge) / WES: 1.440000 (total) 0.720000 (avg/edge) [before] + Total span: 7 (total) 3.50 (avg/edge) / WES: 1.440000 (total) 0.720000 (avg/edge) [iteration 1] + Total span: 7 (total) 3.50 (avg/edge) / WES: 1.440000 (total) 0.720000 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 7 (total) 3.50 (avg/edge) [before] - Total span: 7 (total) 3.50 (avg/edge) [after] + Total span: 7 (total) 3.50 (avg/edge) / WES: 1.440000 (total) 0.720000 (avg/edge) [before] + Total span: 7 (total) 3.50 (avg/edge) / WES: 1.440000 (total) 0.720000 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out index 680570b77..aeb1f0e62 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/updates.cif.out @@ -17,14 +17,14 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 10 - Total span: 2 (total) 0.04 (avg/edge) [before] - Total span: 2 (total) 0.04 (avg/edge) [iteration 1] - Total span: 2 (total) 0.04 (avg/edge) [after] + Total span: 2 (total) 0.04 (avg/edge) / WES: 0.039216 (total) 0.000769 (avg/edge) [before] + Total span: 2 (total) 0.04 (avg/edge) / WES: 0.039216 (total) 0.000769 (avg/edge) [iteration 1] + Total span: 2 (total) 0.04 (avg/edge) / WES: 0.039216 (total) 0.000769 (avg/edge) [after] Applying sliding window algorithm. Window length: 2 - Total span: 2 (total) 0.04 (avg/edge) [before] - Total span: 2 (total) 0.04 (avg/edge) [after] + Total span: 2 (total) 0.04 (avg/edge) / WES: 0.039216 (total) 0.000769 (avg/edge) [before] + Total span: 2 (total) 0.04 (avg/edge) / WES: 0.039216 (total) 0.000769 (avg/edge) [after] Variable order unchanged. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out index 0e0f031ba..4ef34513f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_custom_force_on.cif.out @@ -21,17 +21,17 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 29 (total) 1.32 (avg/edge) [before] - Total span: 24 (total) 1.09 (avg/edge) [iteration 1] - Total span: 18 (total) 0.82 (avg/edge) [iteration 2] - Total span: 13 (total) 0.59 (avg/edge) [iteration 3] - Total span: 13 (total) 0.59 (avg/edge) [iteration 4] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 29 (total) 1.32 (avg/edge) / WES: 0.431818 (total) 0.019628 (avg/edge) [before] + Total span: 24 (total) 1.09 (avg/edge) / WES: 0.366162 (total) 0.016644 (avg/edge) [iteration 1] + Total span: 18 (total) 0.82 (avg/edge) / WES: 0.300505 (total) 0.013659 (avg/edge) [iteration 2] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 3] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 4] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out index b78e1c0f4..648ac0995 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_model_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 2..5] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [window 2..5] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out index 25e62ac95..b33340e59 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_random_force_on.cif.out @@ -21,18 +21,18 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 31 (total) 1.41 (avg/edge) [before] - Total span: 20 (total) 0.91 (avg/edge) [iteration 1] - Total span: 14 (total) 0.64 (avg/edge) [iteration 2] - Total span: 13 (total) 0.59 (avg/edge) [iteration 3] - Total span: 13 (total) 0.59 (avg/edge) [iteration 4] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 31 (total) 1.41 (avg/edge) / WES: 0.472222 (total) 0.021465 (avg/edge) [before] + Total span: 20 (total) 0.91 (avg/edge) / WES: 0.366162 (total) 0.016644 (avg/edge) [iteration 1] + Total span: 14 (total) 0.64 (avg/edge) / WES: 0.282828 (total) 0.012856 (avg/edge) [iteration 2] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 3] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 4] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out index a8221dec1..b2e26165e 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_model_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out index bbe963d4e..d335fb1c0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_reverse_sorted_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 0..3] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [window 0..3] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. diff --git a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out index c49b7bebf..85484ebb8 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out +++ b/cif/org.eclipse.escet.cif.tests/tests/datasynth/var_order_sorted_force_on.cif.out @@ -21,15 +21,15 @@ Applying automatic variable ordering: Applying 2 algorithms, sequentially: Applying FORCE algorithm. Maximum number of iterations: 20 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 13 (total) 0.59 (avg/edge) [iteration 1] - Total span: 13 (total) 0.59 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [before] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [iteration 1] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [after] Applying sliding window algorithm. Window length: 4 - Total span: 13 (total) 0.59 (avg/edge) [before] - Total span: 12 (total) 0.55 (avg/edge) [window 2..5] - Total span: 12 (total) 0.55 (avg/edge) [after] + Total span: 13 (total) 0.59 (avg/edge) / WES: 0.290404 (total) 0.013200 (avg/edge) [before] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [window 2..5] + Total span: 12 (total) 0.55 (avg/edge) / WES: 0.247475 (total) 0.011249 (avg/edge) [after] Variable order changed. -- GitLab From f785b14e9041e250a255640da060238ca59de0fb Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 21:20:37 +0200 Subject: [PATCH 6/8] #196 Add more unit tests. --- .../varorder/helper/BddVarOrderTest.java | 95 +++++++++++++++++++ .../varorder/helper/VarOrdererHelperTest.java | 92 ++++++++++++++++++ 2 files changed, 187 insertions(+) create mode 100644 cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java diff --git a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java new file mode 100644 index 000000000..c0d27a551 --- /dev/null +++ b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java @@ -0,0 +1,95 @@ +////////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2022 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// This program and the accompanying materials are made available +// under the terms of the MIT License which is available at +// https://opensource.org/licenses/MIT +// +// SPDX-License-Identifier: MIT +////////////////////////////////////////////////////////////////////////////// + +package org.eclipse.escet.cif.datasynth.varorder.helper; + +import static org.eclipse.escet.common.java.Lists.list; +import static org.junit.Assert.assertEquals; + +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.Test; + +import com.github.javabdd.BDD; +import com.github.javabdd.BDDFactory; + +/** BDD variable order tests. */ +public class BddVarOrderTest { + @Test + @SuppressWarnings("javadoc") + public void testHighLowBit() { + // Create factory with 3 variables: a < b < c. + BDDFactory factory = BDDFactory.init("java", 100, 100); + factory.setVarNum(3); + + // Get each variable. + BDD a = factory.ithVar(0); + BDD b = factory.ithVar(1); + BDD c = factory.ithVar(2); + + // Each variable's 0-based index corresponds to its level. + assertEquals(0, a.level()); + assertEquals(1, b.level()); + assertEquals(2, c.level()); + + // Create '(!a and b and c) or (a and !b and !c)' BDD. + BDD pred = a.not().and(b).and(c).or(a.and(b.not()).and(c.not())); + + // Check satisfying assignments. + assertEquals("!a b c, a !b !c", bddToAllSatText(pred)); + + // Reverse variable order. + factory.setVarOrder(new int[] {2, 1, 0}); // New order: c < b < a. + + // Check reverse levels. + assertEquals(2, a.level()); + assertEquals(1, b.level()); + assertEquals(0, c.level()); + + // Check reverse satisfying assignments. + assertEquals("!c !b a, c b !a", bddToAllSatText(pred)); + } + + /** + * Get text representing all satisfying assignments to the given BDD. + * + * @param bdd The BDD. + * @return The text. + */ + private static String bddToAllSatText(BDD bdd) { + List sats = list(); + bddToAllSatTexts(bdd, "", sats); + return sats.stream().map(String::trim).collect(Collectors.joining(", ")); + } + + /** + * Get texts representing all satisfying assignments to the given BDD. + * + * @param bdd The BDD. + * @param cursat The current satisfying assignment based on ancestor BDD nodes. + * @param sats The satisfying assignments. + */ + private static void bddToAllSatTexts(BDD bdd, String cursat, List sats) { + if (bdd.isOne()) { + sats.add(cursat); + } else if (bdd.isZero()) { + // Ignore. + } else { + int var = bdd.getFactory().level2Var(bdd.level()); + char c = (char)(97 + var); + bddToAllSatTexts(bdd.low(), cursat + " !" + c, sats); + bddToAllSatTexts(bdd.high(), cursat + " " + c, sats); + } + } +} diff --git a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java index 9807c057b..50dd08f41 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java +++ b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererHelperTest.java @@ -17,14 +17,24 @@ import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newInputVaria import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newIntType; import static org.eclipse.escet.cif.metamodel.java.CifConstructors.newSpecification; import static org.eclipse.escet.common.java.Lists.list; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import java.util.Arrays; +import java.util.BitSet; import java.util.List; +import org.eclipse.escet.cif.datasynth.spec.SynthesisDiscVariable; import org.eclipse.escet.cif.datasynth.spec.SynthesisInputVariable; import org.eclipse.escet.cif.datasynth.spec.SynthesisVariable; +import org.eclipse.escet.cif.datasynth.varorder.graph.Graph; +import org.eclipse.escet.cif.io.CifReader; import org.eclipse.escet.cif.metamodel.cif.Specification; +import org.eclipse.escet.cif.metamodel.cif.automata.Automaton; +import org.eclipse.escet.cif.metamodel.cif.declarations.DiscVariable; import org.eclipse.escet.cif.metamodel.cif.declarations.InputVariable; +import org.eclipse.escet.common.box.CodeBox; +import org.eclipse.escet.common.box.MemoryCodeBox; import org.junit.Test; /** Tests for {@link VarOrdererHelper}. */ @@ -65,4 +75,86 @@ public class VarOrdererHelperTest { assertSame(e, ordered.get(3)); assertSame(b, ordered.get(4)); } + + @SuppressWarnings("javadoc") + @Test + public void testRepresentationsAndMetrics() { + // CIF specification. + CodeBox box = new MemoryCodeBox(); + box.add("input int[0..2] a;"); + box.add("input int[0..2] b;"); + box.add("input int[0..2] d;"); + box.add("input int[0..2] e;"); + box.add("controllable c_e;"); + box.add("plant p:"); + box.add(" disc int[0..2] c;"); + box.add(" location:"); + box.add(" initial; marked;"); + box.add(" edge c_e when a = b or b = a;"); + box.add(" edge c_e when a = c;"); + box.add(" edge c_e do c := d;"); + box.add(" edge c_e do c := d;"); + box.add(" edge c_e do c := d;"); + box.add("end"); + box.add("invariant p.c != e;"); + + // Read CIF specification. + CifReader reader = new CifReader(); + reader.init("memory", "/memory", false); + Specification spec = reader.read(box.toString()); + + // Create synthesis variables. + Automaton p = (Automaton)spec.getComponents().get(0); + InputVariable va = (InputVariable)spec.getDeclarations().get(0); + InputVariable vb = (InputVariable)spec.getDeclarations().get(1); + InputVariable vd = (InputVariable)spec.getDeclarations().get(2); + InputVariable ve = (InputVariable)spec.getDeclarations().get(3); + DiscVariable vc = (DiscVariable)p.getDeclarations().get(0); + SynthesisVariable a = new SynthesisInputVariable(va, newIntType(0, null, 2), 3, 0, 2); + SynthesisVariable b = new SynthesisInputVariable(vb, newIntType(0, null, 2), 3, 0, 2); + SynthesisVariable c = new SynthesisDiscVariable(vc, newIntType(0, null, 2), 3, 0, 2); + SynthesisVariable d = new SynthesisInputVariable(vd, newIntType(0, null, 2), 3, 0, 2); + SynthesisVariable e = new SynthesisInputVariable(ve, newIntType(0, null, 2), 3, 0, 2); + List variables = list(a, b, c, d, e); + + // Create helper. + VarOrdererHelper helper = new VarOrdererHelper(spec, variables); + + // Test hyper-edges: c/e (invariant), a/b (guard), b/a (guard), a/c (guard), c/d (update), c/d (update), c/d + // (update), a/b/c/d (event c_e). + BitSet[] hyperEdges = helper.getHyperEdges(); + assertEquals("[{2, 4}, {0, 1}, {0, 1}, {0, 2}, {2, 3}, {2, 3}, {2, 3}, {0, 1, 2, 3}]", + Arrays.toString(hyperEdges)); + + // Test graph edges: (b, 3, a), (a, 2, c), (a, 1, d), (b, 1, c), (b, 1, d), (c, 4, d), (c, 1, e). + Graph graph = helper.getGraph(); + String expectedGraphText = String.join("\n", list( // + ".321.", // + "3.11.", // + "21.41", // + "114..", // + "..1..")); + assertEquals(expectedGraphText, graph.toString()); + + // Test metrics for original order. + // Total span = 2 + 1 + 1 + 2 + 1 + 1 + 1 + 3 = 12. + // WES = 8/5*3/40 + 2/5*2/40 + 2/5*2/40 + 4/5*3/40 + 6/5*2/40 + 6/5*2/40 + 6/5*2/40 + 6/5*4/40 = 0.52. + int[] defaultIndices = {0, 1, 2, 3, 4}; // For each variable in 'variables', its new 0-based index. + assertEquals("Total span: 12 (total) 1.50 (avg/edge) / WES: 0.520000 (total) 0.065000 (avg/edge) [x]", + helper.fmtMetrics(defaultIndices, "x")); + + // Test metrics for reverse order. + // Total span: unchanged from original order. + // WES = 4/5*3/40 + 8/5*2/40 + 8/5*2/40 + 8/5*3/40 + 4/5*2/40 + 4/5*2/40 + 4/5*2/40 + 8/5*4/40 = 0.52. + int[] reverseIndices = {4, 3, 2, 1, 0}; // For each variable in 'variables', its new 0-based index. + assertEquals("Total span: 12 (total) 1.50 (avg/edge) / WES: 0.620000 (total) 0.077500 (avg/edge) [x]", + helper.fmtMetrics(reverseIndices, "x")); + + // Test metrics for a random order. + // Total span: 2 + 4 + 4 + 1 + 1 + 1 + 1 + 4 = 18. + // WES: 6/5*3/40 + 8/5*5/40 + 8/5*5/40 + 2/5*2/40 + 4/5*2/40 + 4/5*2/40 + 4/5*2/40 + 8/5*5/40 = 0.83. + int[] randomIndices = {0, 4, 1, 2, 3}; // For each variable in 'variables', its new 0-based index. + assertEquals("Total span: 18 (total) 2.25 (avg/edge) / WES: 0.830000 (total) 0.103750 (avg/edge) [x]", + helper.fmtMetrics(randomIndices, "x")); + } } -- GitLab From 04661e682d56efee091c6d96f79d4632081c12a4 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Sat, 25 Jun 2022 21:31:42 +0200 Subject: [PATCH 7/8] #196 ChoiceVarOrderer support for arbitrary metrics + DCSH uses WES. --- .../datasynth/varorder/ChoiceVarOrderer.java | 27 ++++++++++------- .../datasynth/varorder/DcshVarOrderer.java | 4 ++- .../varorder/helper/VarOrdererMetric.java | 30 +++++++++++++++++++ .../asciidoc/tools/datasynth.asciidoc | 2 +- 4 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ChoiceVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ChoiceVarOrderer.java index 7479b6a4c..11b41a7b2 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ChoiceVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/ChoiceVarOrderer.java @@ -17,9 +17,10 @@ import java.util.List; import org.eclipse.escet.cif.datasynth.spec.SynthesisVariable; import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererHelper; +import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererMetric; import org.eclipse.escet.common.java.Assert; -/** Variable ordering algorithm that applies multiple other algorithms, and picks the one with the lowest total span. */ +/** Variable ordering algorithm that applies multiple other algorithms, and picks the best order. */ public class ChoiceVarOrderer implements VarOrderer { /** The name of the choice-based algorithm, or {@code null} if no name is given. */ private final String name; @@ -27,13 +28,17 @@ public class ChoiceVarOrderer implements VarOrderer { /** The algorithms to apply. At least two algorithms. */ private final List algorithms; + /** The metric to use to pick the best order. */ + private final VarOrdererMetric metric; + /** * Constructor for the {@link ChoiceVarOrderer} class. Does not name the choice-based algorithm. * * @param algorithms The sequence of algorithms to apply. Must be at least two algorithms. + * @param metric The metric to use to pick the best order. */ - public ChoiceVarOrderer(List algorithms) { - this(null, algorithms); + public ChoiceVarOrderer(List algorithms, VarOrdererMetric metric) { + this(null, algorithms, metric); } /** @@ -41,10 +46,12 @@ public class ChoiceVarOrderer implements VarOrderer { * * @param name The name of the choice-based algorithm. * @param algorithms The sequence of algorithms to apply. Must be at least two algorithms. + * @param metric The metric to use to pick the best order. */ - public ChoiceVarOrderer(String name, List algorithms) { + public ChoiceVarOrderer(String name, List algorithms, VarOrdererMetric metric) { this.name = name; this.algorithms = algorithms; + this.metric = metric; Assert.check(algorithms.size() >= 2); } @@ -61,9 +68,9 @@ public class ChoiceVarOrderer implements VarOrderer { } } - // Initialize best order (with lowest span). + // Initialize best order (the lower the metric value the better). List bestOrder = null; - long bestSpan = Long.MAX_VALUE; + double bestMetric = Double.POSITIVE_INFINITY; // Apply each algorithm. for (int i = 0; i < algorithms.size(); i++) { @@ -76,11 +83,11 @@ public class ChoiceVarOrderer implements VarOrderer { VarOrderer algorithm = algorithms.get(i); List algoOrder = algorithm.order(helper, inputOrder, dbgEnabled, dbgLevel + 1); - // Update best order (with lowest span). - long algoSpan = helper.computeTotalSpanForVarOrder(algoOrder); - if (algoSpan < bestSpan) { + // Update best order (with lowest metric value). + double algoMetric = metric.compute(helper, algoOrder); + if (algoMetric < bestMetric) { bestOrder = algoOrder; - bestSpan = algoSpan; + bestMetric = algoMetric; if (dbgEnabled) { helper.dbg(dbgLevel + 1, "Found new best variable order."); diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/DcshVarOrderer.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/DcshVarOrderer.java index 2aa7e8987..4dbb97ba8 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/DcshVarOrderer.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/DcshVarOrderer.java @@ -15,6 +15,8 @@ package org.eclipse.escet.cif.datasynth.varorder; import static org.eclipse.escet.common.java.Lists.list; +import org.eclipse.escet.cif.datasynth.varorder.helper.VarOrdererHelper; + /** * DSM-based Cuthill-McKee/Sloan variable ordering Heuristic (DCSH). * @@ -32,6 +34,6 @@ public class DcshVarOrderer extends ChoiceVarOrderer { new SloanVarOrderer(), // Second algorithm. new ReverseVarOrderer(new WeightedCuthillMcKeeVarOrderer()), // Reverse first algorithm. new ReverseVarOrderer(new SloanVarOrderer()) // Reverse second algorithm. - )); + ), VarOrdererHelper::computeWesForVarOrder); } } diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java new file mode 100644 index 000000000..1e33d6e0b --- /dev/null +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java @@ -0,0 +1,30 @@ +////////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2022 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// This program and the accompanying materials are made available +// under the terms of the MIT License which is available at +// https://opensource.org/licenses/MIT +// +// SPDX-License-Identifier: MIT +////////////////////////////////////////////////////////////////////////////// + +package org.eclipse.escet.cif.datasynth.varorder.helper; + +import java.util.List; + +import org.eclipse.escet.cif.datasynth.spec.SynthesisVariable; + +/** Variable orderer metric. Lower metric values (heuristically) indicate better variable orders. */ +public interface VarOrdererMetric { + /** + * Compute the metric. + * + * @param helper Helper for variable ordering algorithms. + * @param order The variable order. + * @return The metric. + */ + public double compute(VarOrdererHelper helper, List order); +} diff --git a/cif/org.eclipse.escet.cif.documentation/asciidoc/tools/datasynth.asciidoc b/cif/org.eclipse.escet.cif.documentation/asciidoc/tools/datasynth.asciidoc index 97bad42db..225a7ad91 100644 --- a/cif/org.eclipse.escet.cif.documentation/asciidoc/tools/datasynth.asciidoc +++ b/cif/org.eclipse.escet.cif.documentation/asciidoc/tools/datasynth.asciidoc @@ -1128,7 +1128,7 @@ The following variable ordering algorithms are available: The DCSH algorithm of <> aims to find good global variable orders. + DCSH applies two algorithms, the Weighted Cuthill-McKee bandwidth-reducing algorithm and the Sloan profile/wavefront-reducing algorithm. -It then chooses the best order out of the orders produced by these two algorithms as well as their reverse orders, based on the total span metric. +It then chooses the best order out of the orders produced by these two algorithms as well as their reverse orders, based on the Weighted Event Span (WES) metric. + The DCSH algorithm is currently considered experimental. It is therefore disabled by default, but can be enabled using the _BDD DCSH variable ordering algorithm_ option (see <> section above). -- GitLab From abfbcf0b87c92565e4ccf4ffd1e96658f246d31b Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 27 Jun 2022 21:13:44 +0200 Subject: [PATCH 8/8] #196 Some small variable ordering improvements, from review comments. - Metric vs metric value made more clear. - Use char literal instead of magic number. --- .../escet/cif/datasynth/varorder/helper/BddVarOrderTest.java | 2 +- .../escet/cif/datasynth/varorder/helper/VarOrdererMetric.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java index c0d27a551..86a6f4bad 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java +++ b/cif/org.eclipse.escet.cif.datasynth/src-test/org/eclipse/escet/cif/datasynth/varorder/helper/BddVarOrderTest.java @@ -87,7 +87,7 @@ public class BddVarOrderTest { // Ignore. } else { int var = bdd.getFactory().level2Var(bdd.level()); - char c = (char)(97 + var); + char c = (char)('a' + var); bddToAllSatTexts(bdd.low(), cursat + " !" + c, sats); bddToAllSatTexts(bdd.high(), cursat + " " + c, sats); } diff --git a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java index 1e33d6e0b..9f1dabfa7 100644 --- a/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java +++ b/cif/org.eclipse.escet.cif.datasynth/src/org/eclipse/escet/cif/datasynth/varorder/helper/VarOrdererMetric.java @@ -20,11 +20,11 @@ import org.eclipse.escet.cif.datasynth.spec.SynthesisVariable; /** Variable orderer metric. Lower metric values (heuristically) indicate better variable orders. */ public interface VarOrdererMetric { /** - * Compute the metric. + * Compute the metric value. Lower metric values (heuristically) indicate better variable orders. * * @param helper Helper for variable ordering algorithms. * @param order The variable order. - * @return The metric. + * @return The metric value. */ public double compute(VarOrdererHelper helper, List order); } -- GitLab