Merged conflicts

mkamran37 · Dec 3, 2019 · e4d373a · e4d373a
1 parent 18e6551
commit e4d373a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/project3/Code/main.py b/project3/Code/main.py
@@ -216,12 +216,10 @@ def random_forest(self, kCrossValidation = 10):
             predictData = h.get_file(name, fileType='predictData')
         accuracy, precision, recall, f_score = m.knn(predictData, trainData)
         h.calculateMetrics(accuracy, precision, recall, f_score)
-<<<<<<< HEAD
 
-=======
     elif algorithm == 2:
         m.decision_tree()
->>>>>>> master
+    
     elif algorithm == 3:
         print("Enter train File name")
         trainData = h.get_file_bayes(h.get_fileName(), kCrossValidation = 10)
@@ -233,17 +231,16 @@ def random_forest(self, kCrossValidation = 10):
             predictData = h.get_file_bayes(name, fileType='predictData')
         accuracy, precision, recall, f_score = m.bayes_naive(predictData, trainData)
         h.calculateMetrics(accuracy, precision, recall, f_score)
-<<<<<<< HEAD
 
     elif algorithm == 4:
         print("Enter train File name")
         trainData = h.get_file_bayes_demo(h.get_fileName())
         print("Enter test File name")
         predictData = h.get_file_bayes_demo(h.get_fileName(),fileType = 'predictData')
         m.bayes_naive_demo(predictData, trainData)
-=======
-    elif algorithm == 4:
+   
+    elif algorithm == 5:
         m.random_forest()
+
     else:
         print("\nWrong input")
->>>>>>> master