continuing work on cleaning up package without TF and Weka

algofairness · Feb 9, 2018 · e0002d7 · e0002d7
1 parent 436e5a0
commit e0002d7
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 1,004 deletions.
diff --git a/BlackBoxAuditing/model_factories/AbstractWekaModelFactory.py b/BlackBoxAuditing/model_factories/AbstractWekaModelFactory.py
diff --git a/BlackBoxAuditing/model_factories/DecisionTree.py b/BlackBoxAuditing/model_factories/DecisionTree.py
@@ -323,9 +323,9 @@ def test_simple_data():
     resp_index = headers.index(response)
 
     intended_predictions = [(test_row[resp_index], train_row[resp_index]) for train_row, test_row in zip(train_set_copy,test_set)]
-    incorr = (predictions[-9:] != intended_predictions[-9:])
-    corr = (predictions[:-9] == intended_predictions[:-9])
-    print("handling simple data correctly? -- ", (corr and incorr) == True)
+    last_few_preds = all(pred[0] == pred[1] for pred in predictions[-9:]) 
+    all_but_last_few = all(pred[0] == pred[1] for pred in predictions[:-9])
+    print("handling simple data correctly? -- ", (all_but_last_few and not last_few_preds) == True)
 
 if __name__=='__main__':
   test()

diff --git a/BlackBoxAuditing/model_factories/J48_ModelFactory.py b/BlackBoxAuditing/model_factories/J48_ModelFactory.py
diff --git a/BlackBoxAuditing/model_factories/NeuralNetwork.py b/BlackBoxAuditing/model_factories/NeuralNetwork.py
@@ -345,9 +345,9 @@ def test_simple_data():
     resp_index = headers.index(response)
 
     intended_predictions = [(test_row[resp_index], train_row[resp_index]) for train_row, test_row in zip(train_set_copy,test_set)]
-    incorr = (predictions[-9:] != intended_predictions[-9:])
-    corr = (predictions[:-11] == intended_predictions[:-11])
-    print("handling simple data correctly? -- ", (corr and incorr) == True)
+    last_few_preds = all(pred[0] == pred[1] for pred in predictions[-9:]) 
+    all_but_last_few = all(pred[0] == pred[1] for pred in predictions[:-9])
+    print("handling simple data correctly? -- ", (all_but_last_few and not last_few_preds) == True)
 
 if __name__=='__main__':
   test()