Commit f88b7666 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Remove the Table parameter from the HierarchicalGirdEventBGenerator.

The table is no longer used inside the EventB grid generator, so remove it.
A field that was also there, but otherwise unused, is now removed as well.
parent 73ba00d8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ final public class EventBTableGenerator {
            //Step 3: Generate the Events Xml
            HierarchicalGridEventBGenerator hierarchicalGridEventBGenerator;
            int refineLayerNo = (RefinementMode.WithoutRefinement == m_refineMode) ? Integer.MAX_VALUE : i;//No Refinement mode layerCount is set to infinity so that handleLeafCell is always executed.
            hierarchicalGridEventBGenerator = new HierarchicalGridEventBGenerator(m_refineMode, refineLayerNo, m_table);
            hierarchicalGridEventBGenerator = new HierarchicalGridEventBGenerator(m_refineMode, refineLayerNo);
            output += m_table.walk(hierarchicalGridEventBGenerator);

            //Step 4: Generate the file Refine Relation Xml
+1 −4
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import ca.mcscert.jtet.expression.Variable;
import ca.mcscert.jtet.expression.VariableType;
import ca.mcscert.jtet.tablularexpression.HierarchicalGridDepthFirstCheckerGenerator;
import org.apache.commons.lang3.StringUtils;
import ca.mcscert.jtet.tablularexpression.Table;

import java.util.*;

@@ -44,10 +43,9 @@ import java.util.*;
 */
final public class HierarchicalGridEventBGenerator implements HierarchicalGridDepthFirstCheckerGenerator {

    public HierarchicalGridEventBGenerator(RefinementMode refineMode, int refineLayerNo, Table table) {
    public HierarchicalGridEventBGenerator(RefinementMode refineMode, int refineLayerNo) {
        m_refineMode = refineMode;
        m_refineLayerNo = refineLayerNo;
        m_tableName = table.getTableName();
    }

    private String generateEventGuardXml(int guardNo, String guard) {
@@ -222,7 +220,6 @@ final public class HierarchicalGridEventBGenerator implements HierarchicalGridDe
    int m_subGridCellIndex = 0;
    int m_refineLayerNo = 0;//is also the current column number
    String m_eventsXml = "";
    String m_tableName = "";
    String m_eventNo = "";//like evt1_3_2
    String m_parentEventNo = "";//like evt1_3
    Map<Variable, List<String>> m_collectedOutputValues = new LinkedHashMap<Variable, List<String>>();