Loading Data.m +8 Changes for Data.m: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -74,8 +74,16 @@ classdef Data < handle % creates copy of object function copy = clone(obj,handle) % assume that dialog is closed if ~obj.valid copy = []; return; end copy = Data(); if ~isempty(handle) copy.function_name = get(handle,'Name'); else copy.function_name = ''; end copy.function_inputs = obj.function_inputs; copy.checked = obj.checked; copy.settings = obj.settings; Loading EMLGenerator.m +1 −2 Changes for EMLGenerator.m: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -32,14 +32,13 @@ classdef EMLGenerator < handle %new_inputs{i}(1) = inputs{i}(1:c_locations{i}(1)) %new_inputs{i}(2) = inputs{i}(c_locations{i}(1):end) end end %inputs = regexp(inputs,':','split') for i=1:size(new_inputs,2) valid = regexp(new_inputs{i}(1),'[a-zA-Z][_a-zA-Z0-9]*','match'); if ~strcmp(new_inputs{i}(1),valid{1}) if isempty(char(new_inputs{i}(1))) || ~strcmp(new_inputs{i}(1),valid{1}) new_inputs{i}(2) = {'error'}; %revised_input = cat(2,revised_input,[char(inputs{i}(1)); 'error']) end Loading RGrid.m +1 −1 Changes for RGrid.m: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ classdef RGrid < handle % outputs; % cell:boolean - 1 if cell is found, 0 if cell is not found function cell = search(obj,cell1,cell2) cell = 0 cell = 0; for i=1:size(obj.Cells,2) if (obj.Cells(i).Cell1 == cell1 && obj.Cells(i).Cell2 == cell2); cell = 1; Loading Tests/Untitled.m +7 Changes for Tests/Untitled.m: 7 added lines, 0 removed lines. Original line number Diff line number Diff line function [ output_args ] = Untitled( input_args ) %UNTITLED Summary of this function goes here % Detailed explanation goes here end Tests/testData.m +45 Changes for Tests/testData.m: 45 added lines, 0 removed lines. Original line number Diff line number Diff line function test_suite = testData initTestSuite; end function testConstructor d = Data; assertEqual(class(d),'Data'); end function testInit d = Data; d.init; assertEqual(size(d.Grid2.cells,2),1); assertEqual(size(d.Grid1.cells,2),1); assertEqual(size(d.Grid0.Cells,2),1); end function testClone d = Data; d.init; d.function_name = 'test_name'; d.function_inputs = 'input_test'; d.checked = 1; d.Grid1.cells(1).cond_text = 'test_cond'; d2 = d.clone([]); assertEqual(d2.function_name,''); assertEqual(d2.function_inputs,d.function_inputs); assertEqual(d2.Grid1.cells(1).cond_text,'test_cond'); end function testClone2 d = Data; d2 = d.clone; assertEqual(d2,[]); end function testSave d = Data; d.init; d.function_name = 'test_file'; d.save; assertEqual(exist('test_file.table'),2); delete('test_file.table'); end No newline at end of file Loading
Data.m +8 Changes for Data.m: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -74,8 +74,16 @@ classdef Data < handle % creates copy of object function copy = clone(obj,handle) % assume that dialog is closed if ~obj.valid copy = []; return; end copy = Data(); if ~isempty(handle) copy.function_name = get(handle,'Name'); else copy.function_name = ''; end copy.function_inputs = obj.function_inputs; copy.checked = obj.checked; copy.settings = obj.settings; Loading
EMLGenerator.m +1 −2 Changes for EMLGenerator.m: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -32,14 +32,13 @@ classdef EMLGenerator < handle %new_inputs{i}(1) = inputs{i}(1:c_locations{i}(1)) %new_inputs{i}(2) = inputs{i}(c_locations{i}(1):end) end end %inputs = regexp(inputs,':','split') for i=1:size(new_inputs,2) valid = regexp(new_inputs{i}(1),'[a-zA-Z][_a-zA-Z0-9]*','match'); if ~strcmp(new_inputs{i}(1),valid{1}) if isempty(char(new_inputs{i}(1))) || ~strcmp(new_inputs{i}(1),valid{1}) new_inputs{i}(2) = {'error'}; %revised_input = cat(2,revised_input,[char(inputs{i}(1)); 'error']) end Loading
RGrid.m +1 −1 Changes for RGrid.m: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ classdef RGrid < handle % outputs; % cell:boolean - 1 if cell is found, 0 if cell is not found function cell = search(obj,cell1,cell2) cell = 0 cell = 0; for i=1:size(obj.Cells,2) if (obj.Cells(i).Cell1 == cell1 && obj.Cells(i).Cell2 == cell2); cell = 1; Loading
Tests/Untitled.m +7 Changes for Tests/Untitled.m: 7 added lines, 0 removed lines. Original line number Diff line number Diff line function [ output_args ] = Untitled( input_args ) %UNTITLED Summary of this function goes here % Detailed explanation goes here end
Tests/testData.m +45 Changes for Tests/testData.m: 45 added lines, 0 removed lines. Original line number Diff line number Diff line function test_suite = testData initTestSuite; end function testConstructor d = Data; assertEqual(class(d),'Data'); end function testInit d = Data; d.init; assertEqual(size(d.Grid2.cells,2),1); assertEqual(size(d.Grid1.cells,2),1); assertEqual(size(d.Grid0.Cells,2),1); end function testClone d = Data; d.init; d.function_name = 'test_name'; d.function_inputs = 'input_test'; d.checked = 1; d.Grid1.cells(1).cond_text = 'test_cond'; d2 = d.clone([]); assertEqual(d2.function_name,''); assertEqual(d2.function_inputs,d.function_inputs); assertEqual(d2.Grid1.cells(1).cond_text,'test_cond'); end function testClone2 d = Data; d2 = d.clone; assertEqual(d2,[]); end function testSave d = Data; d.init; d.function_name = 'test_file'; d.save; assertEqual(exist('test_file.table'),2); delete('test_file.table'); end No newline at end of file