_more tests, fixed arange and floor

Author: ebranlard

Makefile

@@ -10,7 +10,7 @@ else
 endif
 
 all:
-	python $(MAIN) _tests/test_class1.m 
+	python $(MAIN) _tests/files/test_class1.m 
 
 install:
 	python setup.py install

_tests/files/__init__.py

@@ -0,0 +1,7 @@
+function [Sp,vf]=fSpectrum(y,N,fs)
+y  = y(:)';
+vf = (0:N/2)*fs/N    ;
+vf = (0:floor(N/2))*fs/N    ;
+Sp = abs(fft(y)).^2 / (N*fs);
+Sp = Sp(1:floor(N/2)+1)     ;
+

_tests/files/fSpectrum.m

@@ -0,0 +1,12 @@
+%% Initialization
+clear all; close all; clc; % addpath()
+
+%% Spectrum
+
+dt=0.1
+t=0:dt:1;
+y=sin(t)
+[S,f]=fSpectrum(y,length(y),1/dt);
+
+S_ref=[0.2285364   0.0258482   0.0066528   0.0033719   0.0023203   0.0019575]
+f_ref=[0.00000   0.90909   1.81818   2.72727   3.63636   4.54545]

_tests/files/run_all.m

@@ -0,0 +1,19 @@
+classdef MyClass < handle;
+% Documentation: 
+properties
+    % Public
+    prop_pub;
+end
+properties(SetAccess = private, Hidden = true)
+    prop_priv=-1;
+end
+methods
+    function o=MyClass(varargin)
+        o.pro_pub=1
+    end
+    function read(o,value)
+        o.check_extension();
+        o.prop_pub=value;
+    end
+end % methods
+end % class

_tests/files/test_Zall_ref.py

@@ -9,27 +9,6 @@
 from matlabparser.parsing_tools import TestParsingTools
 from matlabparser.parser import matlablines2python
 
-class TestCommon(unittest.TestCase):
-    pass
-   # def test_common(self):
-   #     print('hi')
-    #def assertEqual(self, first, second, msg=None):
-    #    #print('>',first,'<',' >',second,'<')
-    #    super(TestCommon, self).assertEqual(first, second, msg)
-    #
-    #def test_unit(self):
-    #    self.assertEqual(unit   ('speed [m/s]'),'m/s'  )
-    #    self.assertEqual(unit   ('speed [m/s' ),'m/s'  ) # ...
-    #    self.assertEqual(no_unit('speed [m/s]'),'speed')
-    #
-    #def test_ellude(self):
-    #    self.assertListEqual(ellude_common(['AAA','ABA']),['A','B'])
-
-    #    # unit test for #25
-    #    S=ellude_common(['A.txt','A_.txt'])
-    #    if any([len(s)<=1 for s in S]):
-    #        raise Exception('[FAIL] ellude common with underscore difference, Bug #25')
-
 # --------------------------------------------------------------------------------}
 # ---  
 # --------------------------------------------------------------------------------{
@@ -38,7 +17,9 @@ class TestMatlab2Python(unittest.TestCase):
     def ExecAsserX(self, Lines, Expected, msg=None):
         #print('>',first,'<',' >',second,'<')
         A=matlablines2python(Lines)
-        print(A)
+        #print('')
+        #print('Matlab:',Lines)
+        #print('Python:',A)
         d={}
         exec(A,d)
         np.testing.assert_array_equal(d['x'], Expected)
@@ -51,9 +32,16 @@ def test_numpy(self):
         # simple
         self.ExecAsserX("""x=1""",1)
         self.ExecAsserX("""x=ceil(0.5)""",1)
+        self.ExecAsserX("""x=floor(10/2)""",5)
+        self.ExecAsserX("""x=floor(11/2)""",5)
+        self.ExecAsserX("""x=floor(12/2)""",6)
         # linspace
         self.ExecAsserX("""x=linspace(0,1,2)""",[0,1])
         self.ExecAsserX("""x=linspace(0,1,3)""",[0,0.5,1])
+        self.ExecAsserX("""x=0:0.5:1""",[0,0.5,1])
+        self.ExecAsserX("""x=0:3""",[0,1,2,3])
+        self.ExecAsserX("""x=3:-1:1""",[3,2,1])
+        self.ExecAsserX("""x=1:-0.5:0""",[1,0.5,0])
         #zeros, ones, nan
         self.ExecAsserX("""x=zeros(3,2)""",np.zeros((3,2)))
         self.ExecAsserX("""x=ones(3)"""   ,np.ones((3,3)))
@@ -67,8 +55,8 @@ def test_numpy(self):
         self.ExecAsserX("""x=sum(eye(1,2),2)""",1)
         self.ExecAsserX("""x=sum(eye(1,2),1)""",[1,0])
 
-        print('>>>>>>>>>>')
-        print('>>>>>>>>>>')
+        #print('>>>>>>>>>>')
+        #print('>>>>>>>>>>')
         #self.Eval(""" """)
 
 if __name__ == '__main__':

_tests/files/test_class1.m

@@ -0,0 +1,65 @@
+import unittest
+import sys
+import os
+import numpy as np
+sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+
+from matlabparser import *
+from matlabparser import parser as mparser
+
+# --------------------------------------------------------------------------------}
+# --- Convert matlab files to python files
+# --------------------------------------------------------------------------------{
+
+class options:
+    def __init__(self,output=None):
+        self.numbers=False
+        self.no_comments=False
+        self.no_resolve=False
+        self.smop=False
+        self.output=output
+
+def convert(mfile):
+    opts = options(mfile.replace('.m','.py'))
+    #print('>>>>>>')
+    #print('>>>>>> Converting:',mfile)
+    #     opts.smop=True
+    mparser.matlab2python(mfile,opts)
+
+def compare_to_ref(mfile):
+    opts = options(mfile.replace('.m','.py'))
+    ref_output =mfile.replace('.m','_ref.py')
+    #print('>>>>>> Converting:',mfile)
+    mparser.matlab2python(mfile,opts)
+    #print('>>>>>>')
+
+class TestMatlab2Python(unittest.TestCase):
+
+
+    def test_spectrum(self):
+        convert('_tests/files/run_all.m')
+        compare_to_ref('_tests/files/fSpectrum.m')
+
+
+# --------------------------------------------------------------------------------}
+# --- Try to run the converted files  
+# --------------------------------------------------------------------------------{
+
+class TestZAllConverted(unittest.TestCase):
+    def test_Zspectrum(self):
+        import _tests.files
+        from _tests.files.fSpectrum import fSpectrum 
+        dt = 0.1
+        t = np.arange(0,1+dt,dt)
+        y = np.sin(t)
+        #S,f = fSpectrum(y,len(y),1 / dt)
+        S_ref = np.array([0.2285364,0.0258482,0.0066528,0.0033719,0.0023203,0.0019575])
+        f_ref = np.array([0.0,0.90909,1.81818,2.72727,3.63636,4.54545])
+        #print(S-S_ref)
+        #print(f-f_ref)
+
+
+
+ 
+if __name__ == '__main__':
+    unittest.main()

_tests/test_common.py

@@ -9,7 +9,7 @@
 def main(argv):
 
     parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,description='matlab2python')
-    parser.add_argument("--smop", action="store_true", help=""" omit code generation """)
+    parser.add_argument("--smop", action="store_true", help=""" use smop backend """)
     #parser.add_argument("-A","--no-analysis", action="store_true", help=""" skip analysis """)
     #parser.add_argument("-B","--no-backend", action="store_true", help=""" omit code generation """)
     parser.add_argument("-C","--no-comments", action="store_true", help=""" discard multiline comments""") 

_tests/test_files.py

@@ -100,7 +100,7 @@ def _backend(self,level=0):
 
 @extend(node.cellarrayref)
 def _backend(self,level=0):
-    return "%s[%s-1]" % (self.func_expr._backend(),
+    return "%s[%s]" % (self.func_expr._backend(),
                        self.args._backend())
 
 @extend(node.comment_stmt)
@@ -156,7 +156,7 @@ def _backend(self,level=0):
                                  self.args[2]._backend(),
                                  self.args[1]._backend())
     if self.op == ":":
-        return ":%s" % self.args._backend()
+        return "arange(%s)" % self.args._backend()
 
     if self.op == "end":
 #        if self.args:
@@ -217,17 +217,17 @@ def _backend(self,level=0):
 
 @extend(node.func_stmt)
 def _backend(self,level=0):
-#     self.args.append(node.ident("*args"))
-#     self.args.append(node.ident("**kwargs"))
-#     varargin = %s.varargin
-#     nargin = %s.nargin
+    self.args.append(node.ident("*args"))
+    self.args.append(node.ident("**kwargs"))
     s = """
 @function
 def %s(%s):
+    varargin = %s.varargin
+    nargin = %s.nargin
 """ % (self.ident._backend(),
-       self.args._backend())
-#        self.ident._backend(),
-#        self.ident._backend())
+       self.args._backend(),
+       self.ident._backend(),
+       self.ident._backend())
     return s
 
 @extend(node.funcall)
@@ -324,7 +324,7 @@ def _backend(self,level=0):
         return " + ".join(a._backend() for a in self.args)
     else:
         #import pdb; pdb.set_trace()
-        return "np.array([%s])" % self.args[0]._backend()
+        return "concat([%s])" % self.args[0]._backend()
 
 @extend(node.null_stmt)
 def _backend(self,level=0):