Merge pull request #290 from madgik/MultipleHistogramBugFix

Multiple histogram bug fix
madgik · Oct 17, 2020 · dddc160 · dddc160
2 parents c47293d + 0ab4011
commit dddc160
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Exareme-Docker/src/mip-algorithms/utils/algorithm_utils.py b/Exareme-Docker/src/mip-algorithms/utils/algorithm_utils.py
@@ -349,8 +349,8 @@ def query_database(fname_db, queryData, queryMetadata):
 
     cur.execute(queryData)
     data = cur.fetchall()
-    if len(data) < PRIVACY_MAGIC_NUMBER:
-        raise PrivacyError("Query results in illegal number of datapoints.")
+    #if len(data) < PRIVACY_MAGIC_NUMBER:
+    #    raise PrivacyError("Query results in illegal number of datapoints.")
     dataSchema = [description[0] for description in cur.description]
 
     cur.execute(queryMetadata)
@@ -360,6 +360,12 @@ def query_database(fname_db, queryData, queryMetadata):
 
     # Save data to pd.Dataframe
     dataFrame = pd.DataFrame.from_records(data=data, columns=dataSchema)
+
+    #Check privacy.
+    df = dataFrame.dropna()
+    if len(df) < PRIVACY_MAGIC_NUMBER:
+        raise PrivacyError("Query results in illegal number of datapoints.")
+
 
     # Cast Dataframe based on metadata
     metadataVarNames = [str(x) for x in list(zip(*metadata)[0])]