Bugfix: Invalid shapes

andreArtelt · May 8, 2020 · 4976ac2 · 4976ac2
1 parent 3b72e36
commit 4976ac2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ceml/sklearn/lda.py b/ceml/sklearn/lda.py
@@ -128,8 +128,8 @@ def _build_constraints(self, var_x, y):
         constraints = []
 
         i = y
-        q_i = np.dot(self.mymodel.sigma_inv, self.mymodel.means[i])
-        b_i = np.log(self.mymodel.class_priors[i]) - .5 * np.dot( self.mymodel.means[i], np.dot(self.mymodel.sigma_inv, self.mymodel.means[i]))
+        q_i = np.dot(self.mymodel.sigma_inv, self.mymodel.means[i].T)
+        b_i = np.log(self.mymodel.class_priors[i]) - .5 * np.dot( self.mymodel.means[i], np.dot(self.mymodel.sigma_inv, self.mymodel.means[i].T))
 
         for j in range(len(self.mymodel.means)):
             if i == j:

diff --git a/ceml/sklearn/qda.py b/ceml/sklearn/qda.py
@@ -128,7 +128,7 @@ def rebuild_model(self, model):
         return Qda(model)
 
     def _build_constraints(self, var_X, var_x, y):
-        i = y
+        i = int(y)
         j = 0 if y == 1 else 1
 
         A = .5 * ( self.mymodel.sigma_inv[i] - self.mymodel.sigma_inv[j])