Merge pull request #31 from haoxingz/formal_test

arokem · arokem · commit b5bca514411a · 2013-11-19T15:04:36.000-08:00
"test.py" rewritten under nosetests framework
diff --git a/pymatbridge/matlab/functions/json2mat.m b/pymatbridge/matlab/functions/json2mat.m
@@ -7,6 +7,8 @@
 %
 % Jonas Almeida, March 2010
 
+format long;    % Avoid decimal digits loss
+
 if exist(J)==2 % if J is a filename
 	fid=fopen(J,'r');
 	J='';
diff --git a/pymatbridge/matlab/functions/mat2json.m b/pymatbridge/matlab/functions/mat2json.m
@@ -14,6 +14,8 @@
 %
 % Jonas Almeida, March 2010
 
+PRECISION = 10; % Keep a maximum of 10 decimal digits
+
 switch class(M)
 	case 'struct'
 		J='{';
@@ -36,7 +38,7 @@
 	otherwise
 		if isnumeric(M) % notice looseness in not converting single numbers into arrays
 			if length(M(:))==1
-				J=num2str(M);
+				J=num2str(M, PRECISION);
 			else
 				s=size(M);
 				if (length(s)==2)&(s(1)<2) % horizontal or null vector
diff --git a/pymatbridge/matlab/webserver.m b/pymatbridge/matlab/webserver.m
@@ -237,14 +237,14 @@
 			switch(ext)%FOLDUP
 			case {'.m'}
 				fhandle = str2func(name);
-				try
-					html=feval(fhandle,request,config);
-				catch ME
-					html=['<html><body><font color="#FF0000">Error in file : ' name ...
+                try
+                    html=feval(fhandle,request,config);
+                catch ME
+                    html=['<html><body><font color="#FF0000">Error in file : ' name ...
 					'.m</font><br><br><font color="#990000"> The file returned the following error: <br>' ...
-					ME.message '</font></body></html>'];
-					fprintf(ME.message);
-					log_it(config,'error','file returned error %s',ME.message);
+                    ME.message '</font></body></html>'];
+                    fprintf(ME.message);
+                    log_it(config,'error','file returned error %s',ME.message);
 				end
 				header=make_html_http_header(html,found);
 				response=header2text(header);
diff --git a/pymatbridge/matlab/www/demo_dict.m b/pymatbridge/matlab/www/demo_dict.m
@@ -0,0 +1,7 @@
+function [val1 val2 val3] = demo_dict(args)
+% Demonstration of passing Python dictionary variables around
+    val1 = args.pDict(1).apple;
+    val2 = args.pDict(1).pear;
+    val3 = args.pDict(1).banana;
+
+end
diff --git a/pymatbridge/matlab/www/tests/precision_divide.m b/pymatbridge/matlab/www/tests/precision_divide.m
@@ -0,0 +1,5 @@
+function res = test_precision_divide(args)
+% This function devides val1 by val2 and returns the result
+    res = args.val1 / args.val2;
+
+end %function
diff --git a/pymatbridge/matlab/www/tests/precision_multiply.m b/pymatbridge/matlab/www/tests/precision_multiply.m
@@ -0,0 +1,5 @@
+function res = test_precision_multiply(args)
+% This function returns the product of two arguments val1 and val2
+    res = args.val1 * args.val2;
+
+end %function
diff --git a/pymatbridge/matlab/www/tests/precision_pass.m b/pymatbridge/matlab/www/tests/precision_pass.m
@@ -0,0 +1,6 @@
+function res = test_precision_pass(args)
+% This function takes an argument val and simply return it
+    
+    res = args.val;
+
+end 
diff --git a/pymatbridge/matlab/www/tests/precision_sqrt.m b/pymatbridge/matlab/www/tests/precision_sqrt.m
@@ -0,0 +1,5 @@
+function res = test_precision_sqrt(args)
+% This function returns the square root of the value
+    res = sqrt(args.val);
+
+end %function
diff --git a/pymatbridge/matlab/www/tests/precision_sum.m b/pymatbridge/matlab/www/tests/precision_sum.m
@@ -0,0 +1,5 @@
+function res = test_precision_sum(args)
+% This function returns the sum of two arguments val1 and val2
+    res = args.val1 + args.val2;
+
+end %function
diff --git a/pymatbridge/matlab/www/web_feval.m b/pymatbridge/matlab/www/web_feval.m
@@ -39,7 +39,6 @@
     end
     
     func_path = headers.Content.func_path;
-    
     if arguments_check
         arguments = json2mat(headers.Content.arguments);
     else
diff --git a/pymatbridge/pymatbridge.py b/pymatbridge/pymatbridge.py
@@ -2,9 +2,9 @@
 pymatbridge
 ===========
 
-This is a module for communicating and running 
+This is a module for communicating and running
 
-Part of Python-MATLAB-bridge, Max Jaderberg 2012 
+Part of Python-MATLAB-bridge, Max Jaderberg 2012
 
 """
 
@@ -36,7 +36,7 @@ def _run_matlab_server(matlab_bin, matlab_port, matlab_log, matlab_id, matlab_st
 class Matlab(object):
     """
     A class for communicating with a matlab session
-    """        
+    """
     running = False
     matlab = None
     host = None
@@ -78,7 +78,7 @@ def __init__(self, matlab='matlab', host='localhost', port=None,
         platform : string
            The OS of the machine on which this is running. Per default this
            will be taken from sys.platform.
-            
+
         """
 
         # These are the matlab functions that post requests to the webserever
@@ -99,11 +99,11 @@ def __init__(self, matlab='matlab', host='localhost', port=None,
         self.log = log
         self.maxtime = maxtime
 
-        if platform is None: 
+        if platform is None:
             self.platform = sys.platform
         else:
             self.platform = platform
-    
+
         if startup_options:
             self.startup_options = startup_options
         elif self.platform == 'Windows':
@@ -178,7 +178,7 @@ def run_code(self, code, maxtime=None):
         """
         if self.running:
             time.sleep(0.05)
-            
+
         if maxtime:
             result = self._open_page(self.eval, dict(code=code), maxtime)
         else:
@@ -189,7 +189,7 @@ def run_code(self, code, maxtime=None):
     def get_variable(self, varname, maxtime=None):
         if self.running:
             time.sleep(0.05)
-            
+
         if maxtime:
             result = self._open_page(self.get_var, dict(varname=varname),
                                      maxtime)
@@ -198,23 +198,23 @@ def get_variable(self, varname, maxtime=None):
                                      self.maxtime)
 
         return result['var']
-        
-        
+
+
     def _open_page(self, page_name, arguments={}, timeout=10):
         self.running = True
         page = urllib2.urlopen('%s/%s' % (self.server, page_name),
                                urllib.urlencode(arguments),
                                timeout)
-        
+
         self.running = False
         read_page = page.read()
         # Deal with escape characters: json needs an additional '\':
-        # Kill backspaces (why does Matlab even put these there!?): 
+        # Kill backspaces (why does Matlab even put these there!?):
         read_page = read_page.replace("\x08", "")
         if self.platform == 'Windows':
             # Matlab strings containing \ for the dir names on windows:
             read_page = read_page.replace("\\", "\\\\")
-    
+
         # Keep new-lines:
         read_page = read_page.replace("\n","\\n")
         return json.loads(read_page)
diff --git a/pymatbridge/tests/test_json.py b/pymatbridge/tests/test_json.py
@@ -0,0 +1,68 @@
+import pymatbridge as pymat
+import numpy.testing as npt
+
+# 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")
+
+    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")
+
+    mlab.stop()
+    npt.assert_(not mlab.is_connected(), msg = "Disconnection failed")
+
+# 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")
+
+    # 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")
+
+    # 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 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 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 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 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 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")
+
+    mlab.stop()
+    npt.assert_(not mlab.is_connected(), msg = "Disconnection failed")
+
diff --git a/pymatbridge/tests/test_precision.py b/pymatbridge/tests/test_precision.py
@@ -0,0 +1,82 @@
+import pymatbridge as pymat
+import random as rd
+import numpy as np
+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")
+
+    tu.stop_matlab(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())
+
+        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")
+
+    tu.stop_matlab(mlab)
+
+
+# Multiply two 64-bit floating number in Matlab and return the product
+def test_float64_multiply():
+    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_multiply.m', {'val1':val1, 'val2':val2})['result']
+        npt.assert_almost_equal(res, val1 * val2, decimal=8, err_msg="Float64 multiply error")
+
+    tu.stop_matlab(mlab)
+
+
+# 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
diff --git a/pymatbridge/tests/test_utils.py b/pymatbridge/tests/test_utils.py
@@ -0,0 +1,15 @@
+import pymatbridge as pymat
+import numpy.testing as npt
+
+def connect_to_matlab():
+    mlab = pymat.Matlab()
+    mlab.start()
+    npt.assert_(mlab.is_connected(), msg = "connect_to_matlab(): Connection failed")
+
+    return mlab
+
+
+def stop_matlab(mlab):
+    mlab.stop()
+    npt.assert_(not mlab.is_connected(), msg = "stop_matlab(): Disconnection failed")
+

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`%`
`8`	`8`	`% Jonas Almeida, March 2010`
`9`	`9`
	`10`	`+format long; % Avoid decimal digits loss`
	`11`	`+`
`10`	`12`	`if exist(J)==2 % if J is a filename`
`11`	`13`	`fid=fopen(J,'r');`
`12`	`14`	`J='';`