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

Move all the java code to the package ca.mcmaster.cas.tabularexpressiontoolbox. 

Since the java code is turning into entire toolbox for dealing with tabular
expressions, move the code to an appropriate package.  Even if it doesn't
become a full toolbox (for java), it is deeply used by the Matlab toolbox.
Thus pull the name from there.

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

+TableBlock/convert_hierarchical_grid_to_java.m

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
function convert_hierarchical_grid_to_java(grid, java_grid)



for i=1:size(grid,2)

    new_cell = ca.mcmaster.cas.tablularexpression.HierarchicalCell;

    new_cell = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalCell;

    

    old_cell = grid(i)

    new_cell.setContents(old_cell.cond_text)

@CVC_checker/CVC_checker.m

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ classdef CVC_checker 
        

        command = 'cvc3';

        data = [];

        generator = ca.mcmaster.cas.matlab2smt.CVC3Generator();

        boolean_type = ca.mcmaster.cas.matlab2smt.BooleanVariableType();

        generator = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.CVC3Generator();

        boolean_type = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.BooleanVariableType();

        

    end

@CVC_checker/generate_cvc_grid.m

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ function [ code , query] = generate_cvc_grid( object, grid , level, var_def) 


% New Junk

% First build grid in java

HGrid = ca.mcmaster.cas.tablularexpression.HierarchicalGrid

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

TableBlock.convert_hierarchical_grid_to_java(grid.cells, HGrid.getSubHiearchy());

% generate the formulas for the main grid



gridGenerator = ca.mcmaster.cas.cvc3generator.HierarchicalGridCVC3Generator(var_def, level);

code = char(ca.mcmaster.cas.tablularexpression.HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(HGrid, gridGenerator));

gridGenerator = ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator.HierarchicalGridCVC3Generator(var_def, level);

code = char(ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(HGrid, gridGenerator));

query = gridGenerator.getFinalQueries();

@CVC_checker/generate_file.m

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function_name = char(function_names{1}(1)); 


code = [];

% output the input variables

inputs = ca.mcmaster.cas.matlab2smt.VariableParser(object.data.function_inputs);

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser(object.data.function_inputs);

code = char(inputs.getCheckerOutput(object.generator))

@EMLGenerator/generate_preamble.m

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ function code = generate_preamble(object) 
code = [];

function_name = EMLGenerator.parse_inputs(object.data.function_name);

%generate input list

inputs = ca.mcmaster.cas.matlab2smt.VariableParser(object.data.function_inputs);

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser(object.data.function_inputs);

parsed_input = inputs.getVarList();

input_iter = parsed_input.iterator()

input = [];