Commit 6d933caf authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Make the variables be held in a proper class. 

In preparation for enumerations, a more complete handling of variable information
is required.  Thus create a VariableCollection and use it appropriately.  As
much as possible, the VariableCollection is pushed down the stack as much as
possible.

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@11083 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 8aa67421

@EMLGenerator/generate_preamble.m

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ code = []; 
function_name = EMLGenerator.parse_inputs(object.data.function_name);

%generate input list

inputs = TET.getInstance.getVariableParser.parseVariables(object.data.function_inputs);

parsed_input = inputs.values();

parsed_input = inputs.getVariables().values();

input_iter = parsed_input.iterator()

input = [];

while input_iter.hasNext()

@GUI/smtlib_ext_call.m

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ error = object.check_call([],2); 
if (~error)

    

    inputs = TET.getInstance.getVariableParser.parseVariables(object.Data.function_inputs);

    vars = inputs.values();

    vars = inputs.getVariables().values();



    HGrid = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid

    TableBlock.convert_hierarchical_grid_to_java(object.Data.Grid2.cells, HGrid.getSubHiearchy());

Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3Generator.java

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator;



import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;

import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;

import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;

import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
@@ -36,7 +37,7 @@ import org.apache.commons.lang3.StringUtils; 
 */

final public class HierarchicalGridCVC3Generator implements HierarchcialGridCheckerGenerator {



    public HierarchicalGridCVC3Generator(Map<String, Variable> variableDefinitions, int queryCountStart) {

    public HierarchicalGridCVC3Generator(VariableCollection variableDefinitions, int queryCountStart) {

        m_variableDefinitions = variableDefinitions;

        m_currentTCC = queryCountStart;

    }
@@ -157,7 +158,7 @@ final public class HierarchicalGridCVC3Generator implements HierarchcialGridChec 
    List<String> m_queries = new ArrayList<String>();



    // To fix properly.

    Map<String, Variable> m_variableDefinitions;

    VariableCollection m_variableDefinitions;

    static BooleanVariableType m_booleanType = new BooleanVariableType();

    CVC3Generator m_CVC3Generator = new CVC3Generator();

}

Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3Generator.java

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ final public class CVC3Generator implements CheckerGenerator{ 
    }



    @Override

    public String GenerateVariablesDeclaration(Map<String, Variable> vars) {

    public String GenerateVariablesDeclaration(VariableCollection variableCollection) {

        Map<String, Variable> vars = variableCollection.getVariables();



        StringBuilder ret = new StringBuilder();

        // First generate all the variables.

        for(Variable var : vars.values()) {

Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CheckerGenerator.java

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ public interface CheckerGenerator { 
    public String GenerateUnaryOperation(UnaryOperation op, String expression, VariableType usedType);

    public String GenerateBinaryOperation(BinaryOperation op, String lhsExp, String rhsExp, VariableType usedType);

    public String GenerateLiterlaValue(String value, VariableType requestedType);

    public String GenerateVariablesDeclaration(Map<String, Variable> vars);

    public String GenerateVariablesDeclaration(VariableCollection vars);

}