fixing merge conflicts

TailUFPB · Dec 8, 2023 · 88ca86c · 88ca86c
2 parents b4cbb7d + d6825a1
commit 88ca86c
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 45,113 deletions.
diff --git a/api/NeuralNetworkFakeNews b/api/NeuralNetworkFakeNews
diff --git a/api/__pycache__/DataProcesser.cpython-39.pyc b/api/__pycache__/DataProcesser.cpython-39.pyc
diff --git a/api/__pycache__/NbEmotionsModel.cpython-39.pyc b/api/__pycache__/NbEmotionsModel.cpython-39.pyc
diff --git a/api/__pycache__/NbNewsModel.cpython-39.pyc b/api/__pycache__/NbNewsModel.cpython-39.pyc
diff --git a/api/app.py b/api/app.py
@@ -3,12 +3,12 @@
 from DataProcesser import DataProcesser
 from Neural_Network2 import create_and_train_model
 from available_classifiers import get_available_classifiers
+
 import os
 import atexit
 import threading
 import pandas as pd
 import nltk
-import pandas as pd
 import json
 nltk.download('wordnet')
 
@@ -61,8 +61,7 @@ def train_model():
  selected_data = received_data.get('data')
  selected_label = received_data.get('label')
  name = received_data.get('name')
-
- return create_and_train_model(selected_data, selected_label, name)
+ return create_and_train_model(selected_data,selected_label,name)
 
 if __name__ == '__main__':
  server_thread = threading.Thread(target=run_flask_app)

diff --git a/api/models/nn_fakenews.py b/api/models/nn_fakenews.py
diff --git a/api/models/nn_fakenews_model.pkl b/api/models/nn_fakenews_model.pkl