aboutsummaryrefslogtreecommitdiff
path: root/backend/microservice
diff options
context:
space:
mode:
Diffstat (limited to 'backend/microservice')
-rw-r--r--backend/microservice/api/newmlservice.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/backend/microservice/api/newmlservice.py b/backend/microservice/api/newmlservice.py
index 219f8a20..f5122a06 100644
--- a/backend/microservice/api/newmlservice.py
+++ b/backend/microservice/api/newmlservice.py
@@ -155,9 +155,7 @@ def train(dataset, paramsModel,paramsExperiment,paramsDataset,callback):
data.pop(col)
#
### Enkodiranje
-<<<<<<< HEAD
encodings=paramsExperiment["encodings"]
-=======
from sklearn.preprocessing import LabelEncoder
kategorijskekolone=data.select_dtypes(include=['object']).columns
@@ -167,7 +165,6 @@ def train(dataset, paramsModel,paramsExperiment,paramsDataset,callback):
data[kolona]=encoder.fit_transform(data[kolona])
'''
encoding=paramsExperiment["encoding"]
->>>>>>> 7d57bb9 (Dodate su komponente za grafik.)
datafront=dataset.copy()
svekolone=datafront.columns
kategorijskekolone=datafront.select_dtypes(include=['object']).columns