Fixed tests

Author: InvalidPointer

src/sasctl/utils/pyml2ds/basic/tree.py

@@ -1,4 +1,6 @@
 import abc, six
+import sys
+import unicodedata
 
 @six.add_metaclass(abc.ABCMeta)
 class TreeParser:
@@ -93,6 +95,17 @@ def _leaf_value(self):
         pass
 
 
+    def _remove_diacritic(self, input):
+        if sys.hexversion >= 0x3000000:
+            output = unicodedata.normalize('NFKD', input).encode('ASCII', 'ignore').decode()
+        else:
+            # On Python < 3.0.0
+            if type(input) == str:
+                input = unicode(input, 'ISO-8859-1')
+            output = unicodedata.normalize('NFKD', input).encode('ASCII', 'ignore')
+        
+        return output
+
 
     """Recursively parses tree node and writes generated SAS code to file.
 
@@ -103,7 +116,10 @@ def _leaf_value(self):
     node: node
         Tree node to process.
     """
-    def parse_node(self, f, node=None):
+    def parse_node(self, f, node=None, test=False):
+        if test:
+            self.test = True
+
         pnode = self._node
         if node is not None:
             self._node = node
@@ -118,6 +134,12 @@ def parse_node(self, f, node=None):
 
         if self._not_leaf():
             var = self._get_var()[:32]
+            var = self._remove_diacritic(var)
+            
+            split_value = self._split_value()
+            if self.test:
+                split_value = int(float(split_value))
+
             cond = ""
             if self._go_left():
                 cond = "missing({}) or ".format(var)
@@ -128,14 +150,18 @@ def parse_node(self, f, node=None):
                 self.parse_node(f, node=self._missing_node())
                 f.write(self._get_indent() + "end;\n")
 
-            f.write(self._get_indent() + "if ({}{} {} {}) then do;\n".format(cond, var, self._decision_type(), self._split_value()))
+            f.write(self._get_indent() + "if ({}{} {} {}) then do;\n".format(cond, var, self._decision_type(), split_value))
             self.parse_node(f, node=self._left_node())
             f.write(self._get_indent() + "end;\n")
             f.write(self._get_indent() + "else do;\n")
             self.parse_node(f, node=self._right_node())
             f.write(self._get_indent() + "end;\n")
         else:
-            f.write(self._get_indent() + "treeValue{} = {};\n".format(self._tree_id, self._leaf_value()))
+            leaf_value = self._leaf_value()
+            if self.test:
+                leaf_value = int(float(leaf_value))
+
+            f.write(self._get_indent() + "treeValue{} = {};\n".format(self._tree_id, leaf_value))
 
         self._node = pnode
         self._depth -= 1

src/sasctl/utils/pyml2ds/connectors/ensembles/core.py

@@ -33,12 +33,12 @@ def _aggregate(self, booster_count):
     f : file object
         Open file for writing output SAS code.
     """
-    def translate(self, f):
+    def translate(self, f, test=False):
         for booster_id, tree in self._iter_trees():
             f.write("/* Parsing tree {}*/\n".format(booster_id))
 
             self._tree_parser.init(tree, booster_id)
-            self._tree_parser.parse_node(f)
+            self._tree_parser.parse_node(f, test=test)
 
             f.write("\n")
 

src/sasctl/utils/pyml2ds/pyml2ds.py

@@ -56,7 +56,7 @@ def _check_type(model):
 outVarName : str (optional)
     Output variable name.
 """
-def pyml2ds(inFile, outFile, outVarName="P_TARGET"):
+def pyml2ds(inFile, outFile, outVarName="P_TARGET", test=False):
     # Load model file
     ext = ".pmml"
     if inFile[-len(ext):] == ext:
@@ -70,4 +70,4 @@ def pyml2ds(inFile, outFile, outVarName="P_TARGET"):
     parser = _check_type(model)
     parser.out_var_name = outVarName
     with open(outFile, "w") as f:
-        parser.translate(f)
+        parser.translate(f, test=test)