wip

smop/Makefile

@@ -27,14 +27,14 @@ go_m: solver.m
 	octave -q go.m
 
 clean:
-	rm -f a.* *.pyc solver.so solver.py runtime.so
+	rm -f a.* *.pyc solver.so solver.py octave.so
 
 solver.py: solver.m r8_random.m 
 	$(PYTHON) main.py $^ -o $@
 
 check:
-	$(PYTHON) runtime.py 
-	$(PYTHON) test_runtime.py
+	$(PYTHON) octave.py 
+	$(PYTHON) test_core.py
 	$(PYTHON) test_matlabarray.py
 	$(PYTHON) test_sparsearray.py
 	$(PYTHON) test_lexer.py 

smop/backend.py

@@ -45,7 +45,7 @@ def _backend(self,level=0):
         return " + ".join(a._backend() for a in self.args)
     else:
         #import pdb; pdb.set_trace()
-        return "[%s]" % self.args[0]._backend()
+        return "np.r_[%s]" % self.args[0]._backend()
 
 @extend(node.cellarrayref)
 def _backend(self,level=0):

smop/test_runtime.py → smop/test_core.py

@@ -4,7 +4,7 @@
 # MIT license
 import numpy as np
 import unittest
-from runtime import *
+from core import *
 
 class Getitem(unittest.TestCase):
     def setUp(self):

smop/test_matlabarray.py

@@ -1,5 +1,5 @@
 import unittest
-from runtime import *
+from core import *
 
 class test_matlabarray(unittest.TestCase):
     """Expanding matlabarray"""

smop/test_sparsearray.py

@@ -1,6 +1,6 @@
 import numpy as np
 import unittest
-from runtime import *
+from core import *
 from sparsearray import sparsearray
 
 class Slice(unittest.TestCase):