From faa833e62c22932ce5ed755a1b6ec97ffb39631b Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Mon, 11 Apr 2022 16:14:00 +0200 Subject: Povratne informacije o jedinstvenim kategorijama se vraćaju u sortiranom redosledu, dodat je podatak o broju ponavljanja svake jedinstvene kategorije u koloni. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/microservice/api/newmlservice.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'backend/microservice/api/newmlservice.py') diff --git a/backend/microservice/api/newmlservice.py b/backend/microservice/api/newmlservice.py index 77cc59d0..02ce2250 100644 --- a/backend/microservice/api/newmlservice.py +++ b/backend/microservice/api/newmlservice.py @@ -33,7 +33,14 @@ def returnColumnsInfo(dataset): for kolona in svekolone: if(kolona in kategorijskekolone): - uniquevalues=datafront[kolona].unique() + unique=datafront[kolona].value_counts() + uniquevalues=[] + uniquevaluescount=[] + for val, count in unique.iteritems(): + uniquevalues.append(val) + uniquevaluescount.append(count) + #print(uniquevalues) + #print(uniquevaluescount) mean=0 median=0 minimum=0 @@ -43,7 +50,8 @@ def returnColumnsInfo(dataset): allNullCols=allNullCols+1 frontreturn={'columnName':kolona, 'isNumber':False, - 'uniqueValues':uniquevalues.tolist(), + 'uniqueValues':uniquevalues, + 'uniqueValuesCount':uniquevaluescount, 'median':float(mean), 'mean':float(median), 'numNulls':int(nullCount), @@ -62,6 +70,7 @@ def returnColumnsInfo(dataset): frontreturn={'columnName':kolona, 'isNumber':1, 'uniqueValues':[], + 'uniqueValuesCount':[], 'mean':float(mean), 'median':float(median), 'numNulls':int(nullCount), -- cgit v1.2.3