Rename ArrayExpr => VectorExpr

m2cgen/interpreters/java/interpreter.py

@@ -38,7 +38,7 @@ def interpret(self, expr):
             (self.model_name, top_cg.code),
         ]
 
-    def interpret_array_expr(self, expr, **kwargs):
+    def interpret_vector_expr(self, expr, **kwargs):
         nested = []
         for e in expr.exprs:
             nested.append(self._do_interpret(e, **kwargs))

tests/assemblers/test_linear.py

@@ -57,7 +57,7 @@ def test_multi_class():
     assembler = assemblers.LinearModelAssembler(estimator)
     actual = assembler.assemble()
 
-    expected = ast.ArrayExpr([
+    expected = ast.VectorExpr([
         ast.SubroutineExpr(
             ast.BinNumExpr(
                 ast.BinNumExpr(

tests/assemblers/test_tree.py

@@ -61,18 +61,18 @@ def test_multi_class():
             ast.FeatureRef(0),
             ast.NumVal(1.5),
             ast.CompOpType.LTE),
-        ast.ArrayExpr([
+        ast.VectorExpr([
             ast.NumVal(0.0),
             ast.NumVal(1.0)]),
         ast.IfExpr(
             ast.CompExpr(
                 ast.FeatureRef(0),
                 ast.NumVal(2.5),
                 ast.CompOpType.LTE),
-            ast.ArrayExpr([
+            ast.VectorExpr([
                 ast.NumVal(1.0),
                 ast.NumVal(0.0)]),
-            ast.ArrayExpr([
+            ast.VectorExpr([
                 ast.NumVal(0.0),
                 ast.NumVal(1.0)])))
 

tests/interpreters/test_java.py

@@ -189,8 +189,8 @@ def test_multi_output():
                 ast.NumVal(1),
                 ast.NumVal(1),
                 ast.CompOpType.EQ),
-            ast.ArrayExpr([ast.NumVal(1), ast.NumVal(2)]),
-            ast.ArrayExpr([ast.NumVal(3), ast.NumVal(4)])))
+            ast.VectorExpr([ast.NumVal(1), ast.NumVal(2)]),
+            ast.VectorExpr([ast.NumVal(3), ast.NumVal(4)])))
 
     expected_code = """
 public class Model {

tests/utils.py

@@ -14,7 +14,7 @@
 def cmp_exprs(left, right):
     """Recursively compares two ast expressions."""
 
-    if isinstance(left, ast.ArrayExpr) and isinstance(right, ast.Expr):
+    if isinstance(left, ast.VectorExpr) and isinstance(right, ast.Expr):
         left_exprs = left.exprs
         right_exprs = right.exprs
         assert len(left_exprs) == len(right_exprs)