added main method
This commit is contained in:
		
							parent
							
								
									68ba9e83cb
								
							
						
					
					
						commit
						6a8386e897
					
				@ -105,18 +105,19 @@ class DecisionTree:
 | 
				
			|||||||
                # sum(f1_scores_train)/float(len(f1_scores_train))))
 | 
					                # sum(f1_scores_train)/float(len(f1_scores_train))))
 | 
				
			||||||
        # print()
 | 
					        # print()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #################################
 | 
					    if __name__ == '__main__':
 | 
				
			||||||
    print('# starting decision tree')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    file = 'classification_labelled_corrected.csv'
 | 
					        print('# starting decision tree')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # read csv file
 | 
					        file = 'classification_labelled_corrected.csv'
 | 
				
			||||||
    print('# reading dataset')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dataset = CsvHandler.read_csv(file)
 | 
					        # read csv file
 | 
				
			||||||
 | 
					        print('# reading dataset')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    make_tree(dataset)
 | 
					        dataset = CsvHandler.read_csv(file)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('# ending decision tree')
 | 
					        make_tree(dataset)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        print('# ending decision tree')
 | 
				
			||||||
@ -159,19 +159,20 @@ class NaiveBayes:
 | 
				
			|||||||
        #print metrics
 | 
					        #print metrics
 | 
				
			||||||
        print('F1 score: ', format(f1_score(y_train_test, predictions)))
 | 
					        print('F1 score: ', format(f1_score(y_train_test, predictions)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #################################
 | 
					    if __name__ == '__main__':
 | 
				
			||||||
    print('# starting naive bayes')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    file = 'classification_labelled_corrected.csv'
 | 
					        print('# starting naive bayes')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # read csv file
 | 
					        file = 'classification_labelled_corrected.csv'
 | 
				
			||||||
    print('# reading dataset')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dataset = CsvHandler.read_csv(file)
 | 
					        # read csv file
 | 
				
			||||||
 | 
					        print('# reading dataset')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    make_naive_bayes(dataset)
 | 
					        dataset = CsvHandler.read_csv(file)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('#')
 | 
					        make_naive_bayes(dataset)
 | 
				
			||||||
    print('# ending naive bayes')
 | 
					
 | 
				
			||||||
 | 
					        print('#')
 | 
				
			||||||
 | 
					        print('# ending naive bayes')
 | 
				
			||||||
@ -16,6 +16,10 @@ graphviz==0.9
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
scikit_learn==0.19.2
 | 
					scikit_learn==0.19.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Installation under (UBUNTU?)
 | 
					## Installation under Windows
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					pip install XY
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Installation under UBUNTU
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apt-get install XX
 | 
					apt-get install XX
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								Requester.py
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								Requester.py
									
									
									
									
									
								
							@ -93,8 +93,10 @@ class Requester:
 | 
				
			|||||||
                          columns=['Timestamp', 'Title', 'Text', 'SiteSection'])
 | 
					                          columns=['Timestamp', 'Title', 'Text', 'SiteSection'])
 | 
				
			||||||
        # save csv
 | 
					        # save csv
 | 
				
			||||||
        CsvHandler.write_csv(df, filestring)
 | 
					        CsvHandler.write_csv(df, filestring)
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					     if __name__ == '__main__':
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('# starting requester')
 | 
					        print('# starting requester')
 | 
				
			||||||
    print('# ...')
 | 
					        print('# ...')
 | 
				
			||||||
    save_articles_from_webhoseio()
 | 
					        save_articles_from_webhoseio()
 | 
				
			||||||
    print('# ending requester')
 | 
					        print('# ending requester')
 | 
				
			||||||
							
								
								
									
										21
									
								
								SVM.py
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								SVM.py
									
									
									
									
									
								
							@ -84,18 +84,19 @@ class SVM:
 | 
				
			|||||||
        print(grid.best_params_)
 | 
					        print(grid.best_params_)
 | 
				
			||||||
        print()
 | 
					        print()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ########################
 | 
					    if __name__ == '__main__':
 | 
				
			||||||
    print('# starting svm')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    file = 'classification_labelled_corrected.csv'
 | 
					        print('# starting svm')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # read csv file
 | 
					        file = 'classification_labelled_corrected.csv'
 | 
				
			||||||
    print('# reading dataset')
 | 
					 | 
				
			||||||
    print('# ...')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dataset = CsvHandler.read_csv(file)
 | 
					        # read csv file
 | 
				
			||||||
 | 
					        print('# reading dataset')
 | 
				
			||||||
 | 
					        print('# ...')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    make_svm(dataset)
 | 
					        dataset = CsvHandler.read_csv(file)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('# ending svm')
 | 
					        make_svm(dataset)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        print('# ending svm')
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user