diff --git a/+TableBlock/convert_hierarchical_grid_to_java.m b/+TableBlock/convert_hierarchical_grid_to_java.m index e719c07f79738ba5e821ec721c81316f24ead53c..6254b15178ef259661b7ed1e5cb23c3bbe4b50f7 100644 --- a/+TableBlock/convert_hierarchical_grid_to_java.m +++ b/+TableBlock/convert_hierarchical_grid_to_java.m @@ -13,15 +13,15 @@ function convert_hierarchical_grid_to_java(grid, java_grid) for i=1:size(grid,2) - new_cell = ca.mcscert.jtet.tablularexpression.HierarchicalCell; + new_cell = ca.mcscert.jtet.tabularexpression.HierarchicalCell; - old_cell = grid(i) + old_cell = grid(i); new_cell.setContents(old_cell.cond_text) if ~isempty(old_cell.subgrid) - TableBlock.convert_hierarchical_grid_to_java(old_cell.subgrid.cells, new_cell.getSubHiearchy()) + TableBlock.convert_hierarchical_grid_to_java(old_cell.subgrid.cells, new_cell.getSubHierarchy()) end - java_grid.add(new_cell) + java_grid.add(new_cell); end end diff --git a/+TableBlock/convert_table_to_java_table.m b/+TableBlock/convert_table_to_java_table.m index b0464e0738a263a8a7ec55bf701098347898ac37..d42315a6607e8940b5104234399f8a903abe9535 100644 --- a/+TableBlock/convert_table_to_java_table.m +++ b/+TableBlock/convert_table_to_java_table.m @@ -7,5 +7,5 @@ function outtable = convert_table_to_java_table( intable ) vc = ca.mcscert.jtet.expression.VariableCollection(TET.getInstance.getVariableParser.parseVariables(intable.function_inputs), ca.mcscert.jtet.expression.PartialVariableCollection(outputVariables)); outtable = ca.mcscert.jtet.tabularexpression.Table(intable.function_name, vc); + TableBlock.convert_hierarchical_grid_to_java(intable.Grid2.cells, outtable.getLeftGrid().getSubHierarchy()) end - diff --git a/Tests/ConversionTest1.m b/Tests/ConversionTest1.m index 052d589cf59028338633b216cdad38caddad58d1..d15d8ef69846ace578f7e163824d540e529f8b2e 100644 --- a/Tests/ConversionTest1.m +++ b/Tests/ConversionTest1.m @@ -21,6 +21,21 @@ classdef ConversionTest1 < BaseConversionTest testcase.assertEqual(char(outVar.get('output').name()), 'output'); end + function testLeftGridConversion(testcase) + grid = testcase.ConvertedTable.getLeftGrid().getSubHierarchy(); + testcase.assertEqual(grid.size(), 2) + testcase.assertEqual(char(grid.get(0).contents()), 'Start') + testcase.assertEqual(grid.get(0).getSubHierarchy().size(), 0) + testcase.assertEqual(char(grid.get(1).contents()), '~Start') + + grid = grid.get(1).getSubHierarchy(); + testcase.assertEqual(grid.size(), 2) + testcase.assertEqual(char(grid.get(0).contents()), 'Input < 1000') + testcase.assertEqual(grid.get(0).getSubHierarchy().size(), 0) + testcase.assertEqual(char(grid.get(1).contents()), 'Input >= 1000') + testcase.assertEqual(grid.get(1).getSubHierarchy().size(), 0) + end + function testTopGridConversion(testcase) testcase.assertEqual(testcase.ConvertedTable.getTopGrid().getSubHierarchy().size(), 0) end