bugfix

smop/Makefile

@@ -2,9 +2,9 @@ FLAGS=
 
 check:
 	python runtime.py $(FLAGS)
-	#python test_runtime.py $(FLAGS)
+	python test_runtime.py $(FLAGS)
 	python test_matlabarray.py $(FLAGS)
 	python test_sparsearray.py $(FLAGS)
 	python test_lexer.py $(FLAGS)
 	python main.py solver.m && python go.py | wc
-	python test_runtime.py  #&& python main.py fastsolver.m && python go.py
+	python main.py fastsolver.m && python go.py

smop/runtime.py

@@ -152,6 +152,9 @@ def __getslice__(self,i,j):
         return self.__getitem__(slice(i,j))
 
     def __getitem__(self,index):
+        return matlabarray(self.get(index))
+
+    def get(self,index):
         #import pdb; pdb.set_trace()
         indices = self.compute_indices(index)
         if len(indices) == 1:
@@ -272,7 +275,10 @@ def __new__(cls, a=[]):
         if obj.size == 0:
             obj.shape = (0,0)
         return obj
-
+
+    def __getitem__(self,index): 
+        return self.get(index)
+
 #    def __str__(self):
 #        if self.ndim == 0:
 #            return ""
@@ -314,6 +320,10 @@ def __new__(cls, a):
     def __str__(self):
         return "\n".join("".join(s) for s in self.reshape(-1))
 
+    def __getitem__(self,index): 
+        return self.get(index)
+
+
 class char(matlabarray):
     """
     class char is a rectangular string matrix, which
@@ -345,6 +355,9 @@ def __new__(cls, a=""):
             obj.shape = (0,0)
         return obj
 
+    def __getitem__(self,index): 
+        return self.get(index)
+
     def __str__(self):
         if self.ndim == 0:
             return ""