Change the final forloop

nok · Oct 31, 2017 · bba6296 · bba6296
1 parent b727186
commit bba6296
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/examples/estimator/classifier/DecisionTreeClassifier/c/basics_embedded.ipynb b/examples/estimator/classifier/DecisionTreeClassifier/c/basics_embedded.ipynb
@@ -156,16 +156,11 @@
       "        }\n",
       "    }\n",
       "\n",
-      "    int class_val = -1;\n",
-      "    int class_idx = -1;\n",
-      "    int i;\n",
-      "    for (i = 0; i < 3; i++) {\n",
-      "        if (classes[i] > class_val) {\n",
-      "            class_idx = i;\n",
-      "            class_val = classes[i];\n",
-      "        }\n",
+      "    int index = 0;\n",
+      "    for (int i = 0; i < 3; i++) {\n",
+      "        index = classes[i] > classes[index] ? i : index;\n",
       "    }\n",
-      "    return class_idx;\n",
+      "    return index;\n",
       "}\n",
       "\n",
       "int main(int argc, const char * argv[]) {\n",

diff --git a/examples/estimator/classifier/DecisionTreeClassifier/c/basics_embedded.py b/examples/estimator/classifier/DecisionTreeClassifier/c/basics_embedded.py
@@ -77,16 +77,11 @@
         }
     }
 
-    int class_val = -1;
-    int class_idx = -1;
-    int i;
-    for (i = 0; i < 3; i++) {
-        if (classes[i] > class_val) {
-            class_idx = i;
-            class_val = classes[i];
-        }
+    int index = 0;
+    for (int i = 0; i < 3; i++) {
+        index = classes[i] > classes[index] ? i : index;
     }
-    return class_idx;
+    return index;
 }
 
 int main(int argc, const char * argv[]) {

diff --git a/sklearn_porter/estimator/classifier/DecisionTreeClassifier/templates/c/embedded.method.txt b/sklearn_porter/estimator/classifier/DecisionTreeClassifier/templates/c/embedded.method.txt
@@ -3,14 +3,9 @@ int {method_name}(float atts[{n_features}]) {{
     int classes[{n_classes}];
     {branches}
 
-    int class_val = -1;
-    int class_idx = -1;
-    int i;
-    for (i = 0; i < {n_classes}; i++) {{
-        if (classes[i] > class_val) {{
-            class_idx = i;
-            class_val = classes[i];
-        }}
+    int index = 0;
+    for (int i = 0; i < {n_classes}; i++) {{
+        index = classes[i] > classes[index] ? i : index;
     }}
-    return class_idx;
+    return index;
 }}