From 3ee39c4a5c0dfccc4fcb429762e5a7cc026da4a0 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Tue, 19 Apr 2022 20:09:38 +0200 Subject: ML: resen konflikt --- backend/microservice/api/newmlservice.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'backend/microservice/api') 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 -- cgit v1.2.3