Fix a few bugs detected using Cython

feranick · Nov 15, 2024 · 76cb5dd · 76cb5dd
1 parent d483556
commit 76cb5dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/SpectraKeras/SpectraKeras_CNN.py b/SpectraKeras/SpectraKeras_CNN.py
@@ -603,14 +603,17 @@ def predict(testFile):
             print('  ========================================================\n')
 
         else:
+            pass
+            '''
             print('\n ==========================================')
             print('\033[1m' + ' Predicted value \033[0m(probability = ' + str(predProb) + '%)')
             print(' ==========================================\n')
             print("  1:", str(predValue[0]),"%")
             print("  2:",str(predValue[1]),"%")
             print("  3:",str((predValue[1]/0.5)*(100-99.2-.3)),"%\n")
             print(' ==========================================\n')
-
+            '''
+
     if dP.plotActivations and not dP.useTFlitePred:
         plotActivationsPredictions(R,model)
 
@@ -800,14 +803,14 @@ def printParam():
 def plotActivationsTrain(model):
     import matplotlib.pyplot as plt
     import tensorflow as tf
+    dP = Conf()
     if checkTFVersion("2.16.0"):
         import tensorflow.keras as keras
     else:
         if dP.kerasVersion == 2:
             import tf_keras as keras
         else:
             import keras
-    dP = Conf()
     i = 0
     for layer in model.layers:
         if isinstance(layer, keras.layers.Conv2D):

diff --git a/SpectraKeras/SpectraKeras_MLP.py b/SpectraKeras/SpectraKeras_MLP.py
@@ -533,13 +533,15 @@ def predict(testFile):
             print('  ========================================================\n')
 
         else:
+            '''
             print('\n ==========================================')
             print('\033[1m' + ' Predicted value \033[0m(probability = ' + str(predProb) + '%)')
             print(' ==========================================\n')
             print("  1:", str(predValue[0]),"%")
             print("  2:",str(predValue[1]),"%")
             print("  3:",str((predValue[1]/0.5)*(100-99.2-.3)),"%\n")
             print(' ==========================================\n')
+            '''
 
 #************************************
 # Batch Prediction

diff --git a/SpectraKeras/libSpectraKeras.py b/SpectraKeras/libSpectraKeras.py
@@ -365,9 +365,6 @@ def __call__(self,x):
 # MultiClassReductor
 #************************************
 class MultiClassReductor():
-    def __self__(self):
-        self.name = name
-
     def fit(self,tc):
         self.totalClass = tc.tolist()
 

diff --git a/web/SpectraKeras-web/SpectraKeras_CNN.py b/web/SpectraKeras-web/SpectraKeras_CNN.py
@@ -289,13 +289,16 @@ def predict(testFile):
             print('  ========================================================\n')
 
         else:
+            pass
+            '''
             print('\n ==========================================')
             print('\n Predicted value (probability = ' + str(predProb) + '%)')
             print(' ==========================================\n')
             print("  1:", str(predValue[0]),"%")
             print("  2:",str(predValue[1]),"%")
             print("  3:",str((predValue[1]/0.5)*(100-99.2-.3)),"%\n")
             print(' ==========================================\n')
+            '''
 
     if dP.plotActivations and not dP.useTFlitePred:
         plotActivationsPredictions(R,model)