Commit 2497e1c5 authored by Yanjun Jiang's avatar Yanjun Jiang Committed by Matthew Dawson
Browse files

Fix two typos Hiearchy and Hierarchcial. 

Modify all the files that use these two wrong spellings. The right
spelling should be Hierarchy and Hierarchical.
parent db2f084e

src/main/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3Generator.java

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ import ca.mcscert.jtet.parsers.MatlabParser; 
import ca.mcscert.jtet.expression.BooleanVariableType;

import ca.mcscert.jtet.expression.CVC3Generator;

import ca.mcscert.jtet.tablularexpression.Cell;

import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerGenerator;

import ca.mcscert.jtet.tablularexpression.HierarchicalGridCheckerGenerator;



import java.util.ArrayList;

import java.util.ArrayDeque;

import java.util.Deque;
@@ -45,7 +46,7 @@ import org.apache.commons.lang3.StringUtils; 
 *

 * @author Matthew Dawson <matthew@mjdsystems.ca>

 */

final public class HierarchicalGridCVC3Generator implements HierarchcialGridCheckerGenerator {

final public class HierarchicalGridCVC3Generator implements HierarchicalGridCheckerGenerator {



    public HierarchicalGridCVC3Generator(VariableCollection variableDefinitions, int queryCountStart) {

        m_variableDefinitions = variableDefinitions;

src/main/java/ca/mcscert/jtet/eventbgenerator/EventBTableGenerator.java

+5 −5
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ final public class EventBTableGenerator { 
            output += m_eventBGenerator.GenerateVariablesDeclaration(m_table.getInputVariables());



            //Step 3: Generate the Events Xml

            HierarchicalGridEventBGenerator hierarchcialGridEventBGenerator;

            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.

            hierarchcialGridEventBGenerator = new HierarchicalGridEventBGenerator(m_refineMode, refineLayerNo, m_table);

            output += HierarchicalGridDepthFirstCheckerWalkerGenerator.GenerateCheckerFromGrid(m_table.getLeftGrid(), hierarchcialGridEventBGenerator);

            hierarchicalGridEventBGenerator = new HierarchicalGridEventBGenerator(m_refineMode, refineLayerNo, m_table);

            output += HierarchicalGridDepthFirstCheckerWalkerGenerator.GenerateCheckerFromGrid(m_table.getLeftGrid(), hierarchicalGridEventBGenerator);



            //Step 4: Generate the file Refine Relation Xml

            if (hierarchcialGridEventBGenerator.isRefineRelationNecessary()) {

            if (hierarchicalGridEventBGenerator.isRefineRelationNecessary()) {

                output += generateFileRefineRelation(refineLayerNo);

            }
@@ -105,7 +105,7 @@ final public class EventBTableGenerator { 
    //m_maxRefineLayerNum is also the max Recursion Depth

    private int calculateMaxRefineLayerNum(SubHierarchyFetcher grid) {

        int maxRecursionDepth = 0;

        List<HierarchicalCell> cells = grid.getSubHiearchy();

        List<HierarchicalCell> cells = grid.getSubHierarchy();



        for (HierarchicalCell cell : cells) {

            int subGridMaxRefineLayerNum = calculateMaxRefineLayerNum(cell) + 1;

src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunner.java

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import ca.mcscert.jtet.smtlibchecker.antlr.SMTLibOutParserBaseListener; 
import ca.mcscert.jtet.smtlibchecker.antlr.SMTLibOutParserLexer;

import ca.mcscert.jtet.smtlibchecker.antlr.SMTLibOutParserListener;

import ca.mcscert.jtet.smtlibchecker.antlr.SMTLibOutParserParser;

import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerWalkerGenerator;

import ca.mcscert.jtet.tablularexpression.HierarchicalGridCheckerWalkerGenerator;

import ca.mcscert.jtet.tablularexpression.HierarchicalGrid;

import org.antlr.v4.runtime.ANTLRInputStream;

import org.antlr.v4.runtime.CommonTokenStream;
@@ -65,7 +65,7 @@ final public class CheckerRunner { 


        // Get the queries

        HierarchicalGridSMTLIBGenerator queryGenerator = new HierarchicalGridSMTLIBGenerator(vars);

        HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(grid, queryGenerator);

        HierarchicalGridCheckerWalkerGenerator.GenerateCheckerFromGrid(grid, queryGenerator);



        // Start Z3

        ProcessBuilder pb;

src/main/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGenerator.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import ca.mcscert.jtet.expression.VariableCollection; 
import ca.mcscert.jtet.parsers.MatlabParser;

import ca.mcscert.jtet.expression.SMTLIBGenerator;

import ca.mcscert.jtet.tablularexpression.Cell;

import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerGenerator;

import ca.mcscert.jtet.tablularexpression.HierarchicalGridCheckerGenerator;

import org.apache.commons.lang3.StringUtils;



import java.util.ArrayDeque;
@@ -45,7 +45,7 @@ import java.util.List; 
 *

 * @author Matthew Dawson <matthew@mjdsystems.ca>

 */

final public class HierarchicalGridSMTLIBGenerator implements HierarchcialGridCheckerGenerator {

final public class HierarchicalGridSMTLIBGenerator implements HierarchicalGridCheckerGenerator {



    public HierarchicalGridSMTLIBGenerator(VariableCollection variableDefinitions) {

        m_variableDefinitions = variableDefinitions;

src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalCell.java

+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ public class HierarchicalCell extends Cell implements SubHierarchyFetcher { 
    }



    @Override

    public List<HierarchicalCell> getSubHiearchy() {

        return m_subHiearchy;

    public List<HierarchicalCell> getSubHierarchy() {

        return m_subHierarchy;

    }

    

    private List<HierarchicalCell> m_subHiearchy = new ArrayList<HierarchicalCell>();

    private List<HierarchicalCell> m_subHierarchy = new ArrayList<HierarchicalCell>();

}