Commit 6a988f2a authored by Antoine PIGEAU's avatar Antoine PIGEAU
Browse files

update library....need to install the correct package

parent 43a14840
......@@ -27,7 +27,9 @@ from project.projectParameters import ProjectParameters
import keras as kr
from keras.utils import plot_model
# from keras.utils import plot_model
from keras.utils.vis_utils import plot_model
from tensorflow.keras import optimizers
from classifierManager.model.neuralNetworkInitializer import ModelLSTM
from classifierManager.model.neuralNetworkInitializer import ModelPerceptron
......@@ -126,8 +128,8 @@ class DenseNN:
'''
def compile(self):
optimizer = 'rmsprop' #'adam'
optimizer = kr.optimizers.RMSprop(lr=0.001, rho=0.9, epsilon=None, decay=0.0)
#optimizer = 'rmsprop' #'adam'
optimizer = optimizers.RMSprop(lr=0.001, rho=0.9, epsilon=None, decay=0.0)
self.model.compile(optimizer = optimizer, loss = self.loss, metrics = ['accuracy'])
print("DenseNN - compile() - compile is done")
......
......@@ -39,13 +39,13 @@ if __name__ == "__main__":
classifier = Classifier(idCourses = ConstantModel.ID_COURSES,
directory = Classifier.DIRECTORY_EXPERIMENT_MERGED,
nameGroups = [ConstantModel.GROUP_SUCCEED_ALL_USERS, ConstantModel.GROUP_FAILED_ALL_USERS],
features = None,
features = ConstantFeature.IMPLEMENTED_FEATURES,
typeFeatureGroup = ConstantFeature.TYPE_FEATURE_GROUP,
hiddenLayers = None,
featuresByPeriod = ConstantFeature.IMPLEMENTED_FEATURES_FORWARD_BEST_MERGED_LR,
hiddenLayers = ConstantFeature.HIDDEN_LAYERS_BEST_NN_PERCEPTRON_MERGED,
featuresByPeriod = None, #ConstantFeature.IMPLEMENTED_FEATURES_FORWARD_BEST_MERGED_LR,
featuresByCourse= None)
classifier.setScriptClassifier(ConstantClassifier.LogisticRegression)
classifier.setScriptClassifier(ConstantClassifier.Perceptron)
'''
......@@ -90,9 +90,9 @@ if __name__ == "__main__":
Best features for LR
'''
# classifier.scriptClassifier.getMergedForwardBestFeaturesCourse(mergedCourse,
# features = ConstantFeature.IMPLEMENTED_FEATURES,
# whereToCut=25)
classifier.scriptClassifier.getMergedForwardBestFeaturesCourse(mergedCourse,
features = ConstantFeature.IMPLEMENTED_FEATURES,
whereToCut=25)
#
# classifier.scriptClassifier.getMergedForwardBestFeaturesCourse(mergedCourse,
# features = ConstantFeature.IMPLEMENTED_FEATURES,
......
......@@ -40,9 +40,9 @@ if __name__ == "__main__":
directory = Classifier.DIRECTORY_EXPERIMENT_MERGED,
nameGroups = [ConstantModel.GROUP_ALL_GRADED, ConstantModel.GROUP_ALL_UNGRADED],
features = ConstantFeature.IMPLEMENTED_FEATURES,
featuresByPeriod= None, #ConstantFeature.BEST_LR_FEATURE_MERGED_ALL_PERIODS,
typeFeatureGroup = ConstantFeature.TYPE_FEATURE_GROUP,
hiddenLayers = ConstantFeature.HIDDEN_LAYERS_BEST_NN_PERCEPTRON_MERGED,
featuresByPeriod= None, #ConstantFeature.BEST_LR_FEATURE_MERGED_ALL_PERIODS,
featuresByCourse= None)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment