fixed up unittests

Author: pollaro

+nla/+edge/unittests/MultiLevelPermutationTest.m

@@ -7,7 +7,7 @@
     methods (TestMethodSetup)
         function loadTestData(testCase)
             testCase.test_options = struct();
-            testCase.test_options.func_conn.v = [1:10].*ones(10,1);
+            testCase.test_options.behavior = [1:10]';
         end
     end
 
@@ -19,29 +19,29 @@ function clearTestData(testCase)
 
     methods (Test)
         function testPermutationNode(testCase)
-            node = nla.edge.permutationMethods.tree.PermutationNode(0, testCase.test_options.func_conn.v, []);
+            node = nla.edge.permutationMethods.tree.PermutationNode(0, testCase.test_options.behavior, []);
             testCase.verifyEqual(node.level, 0);
             testCase.verifyEqual(node.children, []);
             testCase.verifyEqual(node.parent, false);
             testCase.verifyEqual(node.original_data, node.data_with_indexes);
-            expected_original_data = {[1:10].*ones(10, 1), 1:10, 1:10};
+            expected_original_data = {[1:10]', [1:10]'};
             testCase.verifyEqual(node.original_data, expected_original_data);
         end
 
         function testPermutationTree(testCase)
-            tree = nla.edge.permutationMethods.tree.PermutationTree(testCase.test_options.func_conn.v, []);
+            tree = nla.edge.permutationMethods.tree.PermutationTree(testCase.test_options.behavior, []);
             testCase.verifyClass(tree, 'nla.edge.permutationMethods.tree.PermutationTree');
             testCase.verifyClass(tree.root_node, 'nla.edge.permutationMethods.tree.PermutationNode');
         end
 
         function testTwoPermutationGroups(testCase)
             testCase.test_options.permutation_groups = [1; 1; 1; 1; 1; 2; 2; 2; 2; 2];
-            tree = nla.edge.permutationMethods.tree.PermutationTree(testCase.test_options.func_conn.v, testCase.test_options.permutation_groups);
+            tree = nla.edge.permutationMethods.tree.PermutationTree(testCase.test_options.behavior, testCase.test_options.permutation_groups);
             testCase.verifyEqual(size(tree.root_node.children, 2), 2);
             testCase.verifyEqual(tree.root_node, tree.root_node.children(1).parent);
             testCase.verifyEqual(tree.root_node, tree.root_node.children(2).parent);
-            testCase.verifyEqual(tree.root_node.children(1).original_data{3}, [1:5]);
-            testCase.verifyEqual(tree.root_node.children(2).original_data{3}, [6:10]);
+            testCase.verifyEqual(tree.root_node.children(1).original_data{2}, [1:5]');
+            testCase.verifyEqual(tree.root_node.children(2).original_data{2}, [6:10]');
         end
 
         function testMultiLevel(testCase)
@@ -62,9 +62,9 @@ function testPermute(testCase)
 
             original_options = testCase.test_options;
             permuted_options = multi_level.permute(testCase.test_options);
-            testCase.verifyNotEqual(permuted_options.func_conn, original_options.func_conn);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 1:5)), 1:5);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 6:10)), 6:10);
+            testCase.verifyNotEqual(permuted_options.behavior, original_options.behavior);
+            testCase.verifyEqual(sort(permuted_options.behavior(1:5)), [1:5]');
+            testCase.verifyEqual(sort(permuted_options.behavior(6:10)), [6:10]');
         end
 
         function testMultiLevelTwoLevels(testCase)
@@ -88,11 +88,11 @@ function testMultiLevelPermute(testCase)
 
             original_options = testCase.test_options;
             permuted_options = multi_level.permute(testCase.test_options);
-            testCase.verifyNotEqual(permuted_options.func_conn, original_options.func_conn);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 1:2)), 1:2);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 3:5)), 3:5);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 6:8)), 6:8);
-            testCase.verifyEqual(sort(permuted_options.func_conn.v(1, 9:10)), 9:10);
+            testCase.verifyNotEqual(permuted_options.behavior, original_options.behavior);
+            testCase.verifyEqual(sort(permuted_options.behavior(1:2)), [1:2]');
+            testCase.verifyEqual(sort(permuted_options.behavior(3:5)), [3:5]');
+            testCase.verifyEqual(sort(permuted_options.behavior(6:8)), [6:8]');
+            testCase.verifyEqual(sort(permuted_options.behavior(9:10)), [9:10]');
         end
     end
 end