Merge pull request #32 from haoxingz/list_test

WIP... This branch is used for testing arrays

Author: arokem

pymatbridge/matlab/functions/json2mat.m

@@ -36,11 +36,12 @@
 
 function y=extract_struct(x)
 %detag arrays first
+PRECISION = 10;
 indOC=extract_embed(x,'[',']');
 n=size(indOC,1);
 for i=n:-1:1
 	tag{i}=json2mat(x(indOC(i,1):indOC(i,2)));
-	x=[x(1:indOC(i,1)-1),'tag{',num2str(i),'}',x(indOC(i,2)+1:end)];
+	x=[x(1:indOC(i,1)-1),'tag{',num2str(i, PRECISION),'}',x(indOC(i,2)+1:end)];
 end
 
 
@@ -66,19 +67,20 @@
 
 function y=extract_cell(x)
 
+PRECISION = 10;
 indOC=extract_embed(x,'{','}');
 n=size(indOC,1);
 for i=n:-1:1
 	tag{i}=json2mat(x(indOC(i,1):indOC(i,2)));
-	x=[x(1:indOC(i,1)-1),'tag~<',num2str(i),'>~',x(indOC(i,2)+1:end)];
+	x=[x(1:indOC(i,1)-1),'tag~<',num2str(i, PRECISION),'>~',x(indOC(i,2)+1:end)];
 end
 indOC=extract_embed(x,'[',']');
 m=size(indOC,1);
 for j=m:-1:1
 	i=n+j;
 	tag{i}=json2mat(x(indOC(i,1):indOC(i,2)));
 	try;tag{i}=cell2mat(tag{i});end
-	x=[x(1:indOC(i,1)-1),'tag{',num2str(i),'}',x(indOC(i,2)+1:end)];
+	x=[x(1:indOC(i,1)-1),'tag{',num2str(i, PRECISION),'}',x(indOC(i,2)+1:end)];
 end
 x=strrep(x,'~<','{');
 x=strrep(x,'>~','}');

pymatbridge/matlab/functions/mat2json.m

@@ -42,7 +42,7 @@
 			else
 				s=size(M);
 				if (length(s)==2)&(s(1)<2) % horizontal or null vector
-					J=['[',num2str(M),']']; % and of destroying dimensionality
+					J=['[',num2str(M, PRECISION),']']; % and of destroying dimensionality
 					J=regexprep(J,'\s+',',');
 				elseif length(s)==2 %2D solution
 					J='[';
@@ -51,7 +51,7 @@
 					end
 					J(end)=']';
 				elseif length(s)>2 % for now treat higher dimensions as linear vectors
-					J=['[',num2str(M(:)'),']']; % and of destroying dimensionality
+					J=['[',num2str(M(:)', PRECISION),']']; % and of destroying dimensionality
 					J=regexprep(J,'\s+',',');
 				end
 			end

pymatbridge/matlab/www/tests/array_size.m

@@ -0,0 +1,6 @@
+function res = array_size(args)
+% Simply returns the input array
+
+    res = args.val;
+
+end %end

pymatbridge/tests/test_array.py

@@ -0,0 +1,26 @@
+import pymatbridge as pymat
+import random as rd
+import numpy as np
+import numpy.testing as npt
+import test_utils as tu
+
+class TestArray:
+
+    # Start a Matlab session before any tests
+    @classmethod
+    def setup_class(cls):
+        cls.mlab = tu.connect_to_matlab()
+
+    # Tear down the Matlab session after all the tests are done
+    @classmethod
+    def teardown_class(cls):
+        tu.stop_matlab(cls.mlab)
+
+
+    # Pass a 50*50 array to Matlab
+    def test_array_size(self):
+        array = np.random.random_sample((50,50)).tolist()
+        res = self.mlab.run_func("array_size.m",{'val':array})['result']
+        npt.assert_almost_equal(res, array, decimal=8, err_msg = "test_array_size: error")
+
+

pymatbridge/tests/test_json.py

@@ -1,68 +1,69 @@
 import pymatbridge as pymat
 import numpy.testing as npt
+import test_utils as tu
 
-# Add 1 to the argument and return it
-def test_demo_func():
-    mlab = pymat.Matlab()
-    mlab.start()
-    npt.assert_(mlab.is_connected(), msg = "Connection failed")
+class TestJson:
 
-    for i in range(5):
-        res = mlab.run_func('demo_func.m', {'a': i})['result']
-        ans = i + 1
-        npt.assert_equal(res, ans, err_msg = "demo_func.m test failed")
+    # Start a Matlab session before doing any tests
+    @classmethod
+    def setup_class(cls):
+        cls.mlab = tu.connect_to_matlab()
 
-    mlab.stop()
-    npt.assert_(not mlab.is_connected(), msg = "Disconnection failed")
+    # Tear down the Matlab session after all the tests are done
+    @classmethod
+    def teardown_class(cls):
+        tu.stop_matlab(cls.mlab)
 
-# Print some strange characters in Matlab, get them back and compare.
-def test_special_character():
-    mlab = pymat.Matlab()
-    mlab.start()
-    npt.assert_(mlab.is_connected(), msg = "Connection failed")
 
-    # Test 1:"hi"\n
-    res = mlab.run_code('fprintf(1, char([34, 104, 105, 34, 10]));')['content']['stdout']
-    ans = unichr(34) + unichr(104) + unichr(105) + unichr(34) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 1 failed")
+    # Add 1 to the argument and return it
+    def test_demo_func(self):
+        for i in range(5):
+            res = self.mlab.run_func('demo_func.m', {'a': i})['result']
+            ans = i + 1
+            npt.assert_equal(res, ans, err_msg = "demo_func.m test failed")
 
-    # Test 2:\b\n
-    res = mlab.run_code('fprintf(1, char([8,10]));')['content']['stdout']
-    ans = unichr(8) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 2 failed")
+    # Print some strange characters in Matlab, get them back and compare.
+    def test_special_character(self):
 
-    # Test 3:\f\n
-    res = mlab.run_code('fprintf(1, char([12,10]));')['content']['stdout']
-    ans = unichr(12) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 3 failed")
+        # Test 1:"hi"\n
+        res = self.mlab.run_code('fprintf(1, char([34, 104, 105, 34, 10]));')['content']['stdout']
+        ans = unichr(34) + unichr(104) + unichr(105) + unichr(34) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 1 failed")
 
-    # Test 4:\r\n
-    res = mlab.run_code('fprintf(1, char([13,10]));')['content']['stdout']
-    ans = unichr(13) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 4 failed")
+        # Test 2:\b\n
+        res = self.mlab.run_code('fprintf(1, char([8,10]));')['content']['stdout']
+        ans = unichr(8) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 2 failed")
 
-    # Test 5:\t\n
-    res = mlab.run_code('fprintf(1, char([9,10]));')['content']['stdout']
-    ans = unichr(9) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 5 failed")
+        # Test 3:\f\n
+        res = self.mlab.run_code('fprintf(1, char([12,10]));')['content']['stdout']
+        ans = unichr(12) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 3 failed")
 
-    # Test 6:\\\n
-    res = mlab.run_code('fprintf(1, char([92,92,10]));')['content']['stdout']
-    ans = unichr(92) + unichr(10)   # Python already encoded double-slash as 92
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 6 failed")
+        # Test 4:\r\n
+        res = self.mlab.run_code('fprintf(1, char([13,10]));')['content']['stdout']
+        ans = unichr(13) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 4 failed")
 
-    # Test 7:/\n
-    res = mlab.run_code('fprintf(1, char([47,10]));')['content']['stdout']
-    ans = unichr(47) + unichr(10)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 7 failed")
+        # Test 5:\t\n
+        res = self.mlab.run_code('fprintf(1, char([9,10]));')['content']['stdout']
+        ans = unichr(9) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 5 failed")
 
-    # Test 8: Lots of strange characters
-    res = mlab.run_code('fprintf(1,char([47,92,92,47,8,12,10,13,9,12,8,8,12,47,34,47,10,10,47,34]));')['content']['stdout']
-    ans = unichr(47) + unichr(92) + unichr(47) + unichr(8) + unichr(12) + unichr(10) \
-            + unichr(13) + unichr(9) + unichr(12) + unichr(8) + unichr(8) + unichr(12) \
-            + unichr(47) + unichr(34) + unichr(47) + unichr(10) + unichr(10) + unichr(47) + unichr(34)
-    npt.assert_equal(res, ans, err_msg = "Special Character Test 8 failed")
+        # Test 6:\\\n
+        res = self.mlab.run_code('fprintf(1, char([92,92,10]));')['content']['stdout']
+        ans = unichr(92) + unichr(10)   # Python already encoded double-slash as 92
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 6 failed")
 
-    mlab.stop()
-    npt.assert_(not mlab.is_connected(), msg = "Disconnection failed")
+        # Test 7:/\n
+        res = self.mlab.run_code('fprintf(1, char([47,10]));')['content']['stdout']
+        ans = unichr(47) + unichr(10)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 7 failed")
+
+        # Test 8: Lots of strange characters
+        res = self.mlab.run_code('fprintf(1,char([47,92,92,47,8,12,10,13,9,12,8,8,12,47,34,47,10,10,47,34]));')['content']['stdout']
+        ans = unichr(47) + unichr(92) + unichr(47) + unichr(8) + unichr(12) + unichr(10) \
+                + unichr(13) + unichr(9) + unichr(12) + unichr(8) + unichr(8) + unichr(12) \
+                + unichr(47) + unichr(34) + unichr(47) + unichr(10) + unichr(10) + unichr(47) + unichr(34)
+        npt.assert_equal(res, ans, err_msg = "Special Character Test 8 failed")
 

pymatbridge/tests/test_precision.py

@@ -4,79 +4,58 @@
 import numpy.testing as npt
 import test_utils as tu
 
-# Pass a 64-bit floating number through the signal path
-def test_float64_roundtrip():
-    mlab = tu.connect_to_matlab()
 
-    for i in range(0,10):
-        val = np.float64(rd.random())
-        res = mlab.run_func('precision_pass.m', {'val':val})['result']
-        npt.assert_almost_equal(res, val, decimal=8, err_msg="Float64 roundtrip error")
+class TestPrecision:
 
-    tu.stop_matlab(mlab)
+    # Start a Matlab session before running any tests
+    @classmethod
+    def setup_class(cls):
+        cls.mlab = tu.connect_to_matlab()
 
+    # Tear down the Matlab session after running all the tests
+    @classmethod
+    def teardown_class(cls):
+        tu.stop_matlab(cls.mlab)
 
-# Add two 64-bit floating number in Matlab and return the sum
-def test_float64_sum():
-    mlab = tu.connect_to_matlab()
 
-    for i in range(0,10):
-        val1 = np.float64(rd.random())
-        val2 = np.float64(rd.random())
+    # Pass a 64-bit floating number through the signal path
+    def test_float64_roundtrip(self):
+        for i in range(0,10):
+            val = np.float64(rd.random())
+            res = self.mlab.run_func('precision_pass.m', {'val':val})['result']
+            npt.assert_almost_equal(res, val, decimal=8, err_msg="Float64 roundtrip error")
 
-        res = mlab.run_func('precision_sum.m', {'val1':val1, 'val2':val2})['result']
-        npt.assert_almost_equal(res, val1 + val2, decimal=8, err_msg="Float64 sum error")
+    # Add two 64-bit floating number in Matlab and return the sum
+    def test_float64_sum(self):
+        for i in range(0,10):
+            val1 = np.float64(rd.random())
+            val2 = np.float64(rd.random())
 
-    tu.stop_matlab(mlab)
+            res = self.mlab.run_func('precision_sum.m', {'val1':val1, 'val2':val2})['result']
+            npt.assert_almost_equal(res, val1 + val2, decimal=8, err_msg="Float64 sum error")
 
+    # Multiply two 64-bit floating number in Matlab and return the product
+    def test_float64_multiply(self):
+        for i in range(0,10):
+            val1 = np.float64(rd.random())
+            val2 = np.float64(rd.random())
 
-# Multiply two 64-bit floating number in Matlab and return the product
-def test_float64_multiply():
-    mlab = tu.connect_to_matlab()
+            res = self.mlab.run_func('precision_multiply.m', {'val1':val1, 'val2':val2})['result']
+            npt.assert_almost_equal(res, val1 * val2, decimal=8, err_msg="Float64 multiply error")
 
-    for i in range(0,10):
-        val1 = np.float64(rd.random())
-        val2 = np.float64(rd.random())
+    # Make a division in Matlab and return the results
+    def test_float64_divide(self):
+        for i in range(0,10):
+            val1 = np.float64(rd.random())
+            val2 = np.float64(rd.random())
 
-        res = mlab.run_func('precision_multiply.m', {'val1':val1, 'val2':val2})['result']
-        npt.assert_almost_equal(res, val1 * val2, decimal=8, err_msg="Float64 multiply error")
+            res = self.mlab.run_func('precision_divide.m', {'val1':val1, 'val2':val2})['result']
+            npt.assert_almost_equal(res, val1 / val2, decimal=8, err_msg="Float64 divide error")
 
-    tu.stop_matlab(mlab)
+    # Calculate the square root in Matlab and return the result
+    def test_float64_sqrt(self):
+        for i in range(0,10):
+            val = np.float64(rd.random())
 
-
-# Make a division in Matlab and return the results
-def test_float64_divide():
-    mlab = tu.connect_to_matlab()
-
-    for i in range(0,10):
-        val1 = np.float64(rd.random())
-        val2 = np.float64(rd.random())
-
-        res = mlab.run_func('precision_divide.m', {'val1':val1, 'val2':val2})['result']
-        npt.assert_almost_equal(res, val1 / val2, decimal=8, err_msg="Float64 divide error")
-
-    tu.stop_matlab(mlab)
-
-
-# Calculate the square root in Matlab and return the result
-def test_float64_sqrt():
-    mlab = tu.connect_to_matlab()
-
-    for i in range(0,10):
-        val = np.float64(rd.random())
-
-        res = mlab.run_func('precision_sqrt.m', {'val':val})['result']
-        npt.assert_almost_equal(res, np.sqrt(val), decimal=8, err_msg="Float64 square root error")
-
-    tu.stop_matlab(mlab)
-
-def test_tuple():
-    pass
-
-
-def test_dict():
-    pass
-
-
-def test_array():
-    pass
+            res = self.mlab.run_func('precision_sqrt.m', {'val':val})['result']
+            npt.assert_almost_equal(res, np.sqrt(val), decimal=8, err_msg="Float64 square root error")