From 1189fd79251fc99df92f81802a74fe23dd47a183 Mon Sep 17 00:00:00 2001 From: AndrewQuijano Date: Sat, 6 Jan 2024 22:58:15 -0500 Subject: [PATCH] Confirmed values files for level 4 and 5 of PPDT. We need this for updating the table of performance results --- data/answers.csv | 6 ++++-- ...hyroid-min.values => hypothyroid-2.values} | 0 data/hypothyroid-4.values | 9 +++++++++ data/hypothyroid-5.values | 9 +++++++++ ...ypothyroid.values => hypothyroid-9.values} | 16 ++++++++-------- libs/crypto.jar | Bin 77329 -> 77365 bytes src/main/java/weka/finito/client.java | 7 +++---- .../java/weka/finito/level_site_thread.java | 5 ++--- src/test/java/PrivacyTest.java | 2 ++ 9 files changed, 37 insertions(+), 17 deletions(-) rename data/{hypothyroid-min.values => hypothyroid-2.values} (100%) create mode 100644 data/hypothyroid-4.values create mode 100644 data/hypothyroid-5.values rename data/{hypothyroid.values => hypothyroid-9.values} (93%) diff --git a/data/answers.csv b/data/answers.csv index e7ad1ce..15f9226 100644 --- a/data/answers.csv +++ b/data/answers.csv @@ -4,8 +4,10 @@ D3.arff,D3.values,190 (3.0) D4.arff,D4.values,157 (3.0/2.0) D5.arff,D5.values,19 (2.0) diabetes.arff,diabetes.values,tested_positive (4.0) -hypothyroid.arff,hypothyroid.values,negative (2.0/1.0) iris.arff,iris.values,Iris-virginica (3.0) iris2D.arff,iris2D.values,Iris-versicolor (48.0/1.0) labor.arff,labor.values,good (3.99) -hypothyroid.arff,hypothyroid-min.values,negative (3366.31/2.0) +hypothyroid.arff,hypothyroid-2.values,negative (3366.31/2.0) +hypothyroid.arff,hypothyroid-4.values,negative (56.17) +hypothyroid.arff,hypothyroid-5.values,negative (30.75) +hypothyroid.arff,hypothyroid-9.values,negative (2.0/1.0) diff --git a/data/hypothyroid-min.values b/data/hypothyroid-2.values similarity index 100% rename from data/hypothyroid-min.values rename to data/hypothyroid-2.values diff --git a/data/hypothyroid-4.values b/data/hypothyroid-4.values new file mode 100644 index 0000000..087e3eb --- /dev/null +++ b/data/hypothyroid-4.values @@ -0,0 +1,9 @@ +TSH 7 +FTI 70 +TSH measured t +on thyroxine t +T4U measured t +thyroid surgery f +T3 2.1 +TT4 40 +referral source other \ No newline at end of file diff --git a/data/hypothyroid-5.values b/data/hypothyroid-5.values new file mode 100644 index 0000000..bd4ce9f --- /dev/null +++ b/data/hypothyroid-5.values @@ -0,0 +1,9 @@ +TSH 7 +FTI 70 +TSH measured f +on thyroxine f +T4U measured t +thyroid surgery f +T3 2.1 +TT4 40 +referral source other \ No newline at end of file diff --git a/data/hypothyroid.values b/data/hypothyroid-9.values similarity index 93% rename from data/hypothyroid.values rename to data/hypothyroid-9.values index 6ec5b13..169d33d 100644 --- a/data/hypothyroid.values +++ b/data/hypothyroid-9.values @@ -1,9 +1,9 @@ -TSH 7 -FTI 65 -TSH measured t -on thyroxine f -T4U measured t -thyroid surgery f -T3 2.1 -TT4 40 +TSH 7 +FTI 65 +TSH measured t +on thyroxine f +T4U measured t +thyroid surgery f +T3 2.1 +TT4 40 referral source other \ No newline at end of file diff --git a/libs/crypto.jar b/libs/crypto.jar index c07e9c321657fd6aceefd1b17453a4075a3308ab..e297d6aae70f0a640b4e23820a177dc3427e11b1 100644 GIT binary patch delta 7233 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 delta 7252 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 diff --git a/src/main/java/weka/finito/client.java b/src/main/java/weka/finito/client.java index 2b3a9ca..3856e31 100644 --- a/src/main/java/weka/finito/client.java +++ b/src/main/java/weka/finito/client.java @@ -19,7 +19,6 @@ import security.paillier.PaillierKeyPairGenerator; import security.paillier.PaillierPrivateKey; import security.paillier.PaillierPublicKey; -import security.socialistmillionaire.bob; import security.socialistmillionaire.bob_joye; import weka.finito.structs.BigIntegers; @@ -291,7 +290,7 @@ private Hashtable read_features(String path, private void evaluate_with_server_site(Socket server_site) throws IOException, HomomorphicException, ClassNotFoundException { // Communicate with each Level-Site Object o; - bob client; + bob_joye client; // Create I/O streams ObjectOutputStream to_server_site = new ObjectOutputStream(server_site.getOutputStream()); @@ -334,7 +333,7 @@ private void communicate_with_level_site(Socket level_site) throws IOException, ClassNotFoundException, HomomorphicException { // Communicate with each Level-Site Object o; - bob client; + bob_joye client; // Create I/O streams ObjectOutputStream to_level_site = new ObjectOutputStream(level_site.getOutputStream()); @@ -412,7 +411,7 @@ public void run() { // Client needs to give server-site public key (to give to level-sites) // Client needs to know all possible classes... if (talk_to_server_site) { - // Don't send keys to server-site to ask for classes since now it is assumed level-sites are up + // Don't send keys to server-site to ask for classes now it is assumed level-sites are up setup_with_server_site(paillier_public_key, dgk_public_key); for (String aClass : classes) { hashed_classification.put(hash(aClass), aClass); diff --git a/src/main/java/weka/finito/level_site_thread.java b/src/main/java/weka/finito/level_site_thread.java index 906c5da..f7abc8e 100644 --- a/src/main/java/weka/finito/level_site_thread.java +++ b/src/main/java/weka/finito/level_site_thread.java @@ -2,7 +2,6 @@ import java.lang.System; -import security.socialistmillionaire.alice; import security.socialistmillionaire.alice_joye; import weka.finito.structs.BigIntegers; import weka.finito.structs.NodeInfo; @@ -42,7 +41,7 @@ public level_site_thread(Socket client_socket, level_order_site level_site_data) this.toClient.writeBoolean(true); closeClientConnection(); } else if (x instanceof Hashtable) { - for (Map.Entry entry: ((Hashtable) x).entrySet()){ + for (Map.Entry entry: ((Hashtable) x).entrySet()) { if (entry.getKey() instanceof String && entry.getValue() instanceof BigIntegers) { encrypted_features.put((String) entry.getKey(), (BigIntegers) entry.getValue()); } @@ -76,7 +75,7 @@ public final void run() { long start_time = System.nanoTime(); try { - alice niu = new alice_joye(); + alice_joye niu = new alice_joye(); niu.set_socket(client_socket); if (this.level_site_data == null) { toClient.writeInt(-2); diff --git a/src/test/java/PrivacyTest.java b/src/test/java/PrivacyTest.java index 28d3793..525469d 100644 --- a/src/test/java/PrivacyTest.java +++ b/src/test/java/PrivacyTest.java @@ -65,6 +65,7 @@ public void test_single_site() throws Exception { String full_feature_path = new File(data_directory, features).toString(); String full_data_set_path = new File(data_directory, data_set).toString(); System.out.println(full_data_set_path); + System.out.println("Features Vector: " + full_feature_path); String classification = test_server_case(full_data_set_path, full_feature_path, key_size, precision, server_ip, server_port); System.out.println(expected_classification + " =!= " + classification); @@ -113,6 +114,7 @@ public void test_all_level_sites() throws Exception { String full_feature_path = new File(data_directory, features).toString(); String full_data_set_path = new File(data_directory, data_set).toString(); System.out.println(full_data_set_path); + System.out.println("Feature Vector Path: " + full_feature_path); String classification = test_level_site(full_data_set_path, full_feature_path, levels, key_size, precision, level_site_ips, level_site_ports_string, server_ip, server_port); System.out.println(expected_classification + " =!= " + classification);