From 4578d218ba7caeb27277041db37a0601ebcefef0 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Fri, 6 May 2022 21:44:38 +0200 Subject: Dodata mogućnost obrade setova podataka sa različitim delimiterima. Izmenjen redosled + i - dugmadi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/microservice/api/controller.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'backend/microservice') diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py index 988ad987..8d49fcc4 100644 --- a/backend/microservice/api/controller.py +++ b/backend/microservice/api/controller.py @@ -54,12 +54,20 @@ class train_callback(tf.keras.callbacks.Callback): @app.route('/train', methods = ['POST']) def train(): print("******************************TRAIN*************************************************") - - f = request.files.get("file") - data = pd.read_csv(f) paramsModel = json.loads(request.form["model"]) paramsExperiment = json.loads(request.form["experiment"]) paramsDataset = json.loads(request.form["dataset"]) + f = request.files.get("file") + if(paramsDataset['delimiter']=='novi red'): + separation='\n' + + elif(paramsDataset['delimiter']=='razmak'): + separation=' ' + else: + separation=paramsDataset['delimiter'] + data = pd.read_csv(f,sep=separation) + + #dataset, paramsModel, paramsExperiment, callback) filepath,result = newmlservice.train(data, paramsModel, paramsExperiment,paramsDataset, train_callback) """ @@ -110,7 +118,14 @@ def returnColumnsInfo(): dataset = json.loads(request.form["dataset"]) file = request.files.get("file") - data=pd.read_csv(file) + if(dataset['delimiter']=='novi red'): + separation='\n' + + elif(dataset['delimiter']=='razmak'): + separation=' ' + else: + separation=dataset['delimiter'] + data=pd.read_csv(file,sep=separation) ''' #f = request.json['filepath'] #data=pd.read_csv(f) -- cgit v1.2.3