Merge pull request #12 from dmonllao/MDL-58992_master

MDL-58992 analytics: extend Classifier for  multiclassification

moodlemlbackend/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

moodlemlbackend/evaluation.py

@@ -29,15 +29,16 @@ def evaluation():
 
     modelid = sys.argv[1]
     directory = sys.argv[2]
+    dataset = sys.argv[3]
 
-    binary_classifier = estimator.Binary(modelid, directory)
+    classifier = estimator.Classifier(modelid, directory, dataset)
 
     if len(sys.argv) > 7:
         trained_model_dir = sys.argv[7]
     else:
         trained_model_dir = False
 
-    result = binary_classifier.evaluate_dataset(sys.argv[3],
+    result = classifier.evaluate_dataset(dataset,
                                                 float(sys.argv[4]),
                                                 float(sys.argv[5]),
                                                 int(sys.argv[6]),

moodlemlbackend/export.py

@@ -11,8 +11,8 @@ def export_classifier():
     modelid = sys.argv[1]
     directory = sys.argv[2]
 
-    binary_classifier = estimator.Binary(modelid, directory)
-    exportdir = binary_classifier.export_classifier(sys.argv[3])
+    classifier = estimator.Classifier(modelid, directory)
+    exportdir = classifier.export_classifier(sys.argv[3])
     if exportdir:
         print(exportdir)
         sys.exit(0)

moodlemlbackend/import.py

@@ -13,9 +13,10 @@ def import_classifier():
     modelid = sys.argv[1]
     directory = sys.argv[2]
 
-    binary_classifier = estimator.Binary(modelid, directory)
-    binary_classifier.import_classifier(sys.argv[3])
+    classifier = estimator.Classifier(modelid, directory)
+    classifier.import_classifier(sys.argv[3])
 
+    print('Ok')
     # An exception will be thrown before if it can be imported.
     sys.exit(0)
 

moodlemlbackend/model/tensor.py

@@ -83,7 +83,6 @@ def set_tensor_logdir(self, tensor_logdir):
 
     def build_graph(self, initial_weights=False):
         """Builds the computational graph without feeding any data in"""
-        print(type(initial_weights))
         # Placeholders for input values.
         with tf.name_scope('inputs'):
             self.x = tf.placeholder(
@@ -181,6 +180,10 @@ def get_n_features(self):
         """Return the number of features"""
         return self.n_features
 
+    def get_n_classes(self):
+        """Return the number of features"""
+        return self.n_classes
+
     def fit(self, X, y):
         """Fits provided data into the session"""
 

moodlemlbackend/prediction.py

@@ -26,11 +26,12 @@ def prediction():
 
     modelid = sys.argv[1]
     directory = sys.argv[2]
+    dataset = sys.argv[3]
 
     # TensorFlow binary classifier - NN.
-    binary_classifier = estimator.Binary(modelid, directory)
+    classifier = estimator.Classifier(modelid, directory, dataset)
 
-    result = binary_classifier.predict_dataset(sys.argv[3])
+    result = classifier.predict_dataset(dataset)
 
     print(json.dumps(result))
     sys.exit(result['status'])