From 5d66c88b7087d5ebd74d73b7c6a37a5d0ed1239d Mon Sep 17 00:00:00 2001
From: rtalbi <dr_talbi@esi.dz>
Date: Thu, 30 Jan 2020 15:41:14 +0100
Subject: [PATCH] New tests for the S&P paper
---
.idea/workspace.xml | 377 ++++++++-------
CONFIG/DAPPLE.config | 28 +-
CRYPTO/DTPKC.h | 2 +-
DATA/Datasets/Adult/testing.enc | 802 ++++++++++++++++----------------
SER/dtpkc.ser | 20 +-
TEST/main.cpp | 149 ++++--
6 files changed, 732 insertions(+), 646 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7563f517..d6e8a95a 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,11 +14,9 @@
<list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="New tests for the S&P paper">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CONFIG/DAPPLE.config" beforeDir="false" afterPath="$PROJECT_DIR$/CONFIG/DAPPLE.config" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Adult/testing.enc" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Adult/testing.enc" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/SER/dtpkc.ser" beforeDir="false" afterPath="$PROJECT_DIR$/SER/dtpkc.ser" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TEST/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/main.cpp" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@@ -48,102 +46,104 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="19" column="30" lean-forward="true" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="225">
+ <caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/MICRO/VFDT/testingNewStats-2020-01-29-09:57:01-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/micro/BankNBCipher-2020-01-29-17:02:18-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
- <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/DOC/requirements">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+ <state relative-caret-position="262">
+ <caret line="843" column="74" selection-start-line="843" selection-start-column="74" selection-end-line="843" selection-end-column="74" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="112">
- <caret line="491" column="83" selection-start-line="491" selection-start-column="83" selection-end-line="491" selection-end-column="83" />
+ <state relative-caret-position="342">
+ <caret line="389" selection-start-line="389" selection-end-line="389" />
<folding>
- <element signature="e#52#93#0" expanded="true" />
+ <element signature="e#0#17#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/DOC/gmpInstalationSteps">
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
+ <state relative-caret-position="392">
+ <caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="246">
- <caret line="318" column="44" selection-start-line="318" selection-start-column="44" selection-end-line="318" selection-end-column="44" />
- <folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#264#7839#0" />
- </folding>
+ <state relative-caret-position="355">
+ <caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/MICRO/VFDT/NurseryVFDTCipher-2020-01-24-14:11:23-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" selection-start-line="2" selection-end-line="2" />
+ <state relative-caret-position="345">
+ <caret line="23" column="17" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <entry file="file:///usr/include/c++/7/bits/stl_function.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-250">
- <caret line="214" selection-start-line="214" selection-end-line="218" selection-end-column="21" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
+ <state relative-caret-position="145">
+ <caret line="385" selection-start-line="385" selection-end-line="385" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
+ <entry file="file:///usr/include/c++/7/bits/stl_tree.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="321">
- <caret line="401" column="17" selection-start-line="401" selection-end-line="402" />
+ <state relative-caret-position="145">
+ <caret line="2037" selection-start-line="2037" selection-end-line="2037" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="395">
- <caret line="68" column="4" selection-start-line="68" selection-start-column="4" selection-end-line="68" selection-end-column="109" />
+ <state relative-caret-position="145">
+ <caret line="146" selection-start-line="146" selection-end-line="146" />
+ <folding>
+ <element signature="e#0#20#0" expanded="true" />
+ <element signature="e#311#536#0" />
+ <element signature="e#539#1918#0" />
+ <element signature="e#2486#2696#0" />
+ </folding>
</state>
</provider>
</entry>
@@ -152,7 +152,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>classif</find>
<find>omp</find>
<find>testBui</find>
<find>Cipher</find>
@@ -180,8 +179,9 @@
<find>dtpkc.</find>
<find>Inform</find>
<find>informationGain</find>
- <find>PPLR</find>
<find>PPVFDT</find>
+ <find>lr</find>
+ <find>PPLR</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -249,14 +249,14 @@
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h" />
- <option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" />
<option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h" />
<option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
- <option value="$PROJECT_DIR$/TEST/main.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" />
<option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
+ <option value="$PROJECT_DIR$/TEST/main.cpp" />
</list>
</option>
</component>
@@ -289,20 +289,13 @@
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="TEST" type="462c0819:PsiDirectoryNode" />
+ <item name="PPML" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="TEST" type="462c0819:PsiDirectoryNode" />
- <item name="MICRO" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
- <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="TEST" type="462c0819:PsiDirectoryNode" />
- <item name="MICRO" type="462c0819:PsiDirectoryNode" />
- <item name="VFDT" type="462c0819:PsiDirectoryNode" />
+ <item name="PPML" type="462c0819:PsiDirectoryNode" />
+ <item name="PPLR" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -446,14 +439,7 @@
<workItem from="1579733182270" duration="5798000" />
<workItem from="1579786820041" duration="13624000" />
<workItem from="1579862666687" duration="6374000" />
- <workItem from="1580057064576" duration="19262000" />
- </task>
- <task id="LOCAL-00042" summary="LR npp part 2">
- <created>1552502722257</created>
- <option name="number" value="00042" />
- <option name="presentableId" value="LOCAL-00042" />
- <option name="project" value="LOCAL" />
- <updated>1552502722257</updated>
+ <workItem from="1580057064576" duration="35439000" />
</task>
<task id="LOCAL-00043" summary="Corrected some possible memory leaks mpfr log exp init variables LR, clear randstate">
<created>1552754829634</created>
@@ -791,11 +777,18 @@
<option name="project" value="LOCAL" />
<updated>1579883093307</updated>
</task>
- <option name="localTasksCounter" value="91" />
+ <task id="LOCAL-00091" summary="New tests for the S&P paper">
+ <created>1580292600786</created>
+ <option name="number" value="00091" />
+ <option name="presentableId" value="LOCAL-00091" />
+ <option name="project" value="LOCAL" />
+ <updated>1580292600787</updated>
+ </task>
+ <option name="localTasksCounter" value="92" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1251380000" />
+ <option name="totallyTimeSpent" value="1267557000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -809,19 +802,19 @@
<component name="ToolWindowManager">
<frame x="67" y="25" width="1853" height="1175" extended-state="6" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.14720531" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.14720531" />
<window_info id="Structure" order="1" sideWeight="0.2735043" side_tool="true" weight="0.3390558" />
<window_info id="Favorites" order="2" sideWeight="0.19466667" side_tool="true" weight="0.28113064" />
<window_info anchor="bottom" id="Database Changes" order="0" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" sideWeight="0.49363586" weight="0.32600382" />
- <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.644715" visible="true" weight="0.4837476" />
- <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5196458" weight="0.53266335" />
+ <window_info anchor="bottom" id="Run" order="3" sideWeight="0.63586056" visible="true" weight="0.4416826" />
+ <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5163254" weight="0.5325048" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="7" sideWeight="0.4986165" weight="0.32663316" />
- <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.4504704" weight="0.5984704" />
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.355285" side_tool="true" visible="true" weight="0.4837476" />
+ <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.4382955" weight="0.4866157" />
+ <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.36413947" side_tool="true" visible="true" weight="0.4416826" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.50359714" weight="0.40935114" />
<window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.4864416" weight="0.32026768" />
<window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7094632" weight="0.36466166" />
@@ -1091,7 +1084,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>1084</line>
+ <line>1171</line>
<option name="timeStamp" value="699" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1386,7 +1379,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>969</line>
+ <line>1056</line>
<option name="timeStamp" value="942" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1396,12 +1389,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>997</line>
+ <line>1084</line>
<option name="timeStamp" value="945" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>999</line>
+ <line>1086</line>
<option name="timeStamp" value="946" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1525,59 +1518,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" />
- <folding>
- <element signature="e#0#20#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:54:20-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.h">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <folding>
- <element signature="e#0#18#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1365">
- <caret line="91" column="66" selection-start-line="91" selection-start-column="50" selection-end-line="91" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2355">
- <caret line="157" column="10" selection-start-line="157" selection-start-column="4" selection-end-line="157" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1725">
- <caret line="115" column="1" selection-start-line="115" selection-start-column="1" selection-end-line="115" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.h">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275">
@@ -1594,13 +1534,6 @@
<entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="420">
- <caret line="28" selection-start-line="28" selection-end-line="34" selection-end-column="26" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
@@ -1615,23 +1548,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-3364">
- <caret line="495" column="27" selection-start-line="495" selection-start-column="27" selection-end-line="495" selection-end-column="27" />
- <folding>
- <element signature="e#227#244#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="56">
- <caret line="62" column="9" selection-start-line="62" selection-start-column="9" selection-end-line="62" selection-end-column="9" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-15:04:30-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1724,26 +1640,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1140">
- <caret line="76" column="13" selection-start-line="76" selection-start-column="13" selection-end-line="76" selection-end-column="13" />
- <folding>
- <element signature="e#1265#1296#0" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="6060">
- <caret line="404" selection-start-line="404" selection-end-line="404" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:49:46-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -1781,16 +1677,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-250">
- <caret line="214" selection-start-line="214" selection-end-line="218" selection-end-column="21" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
@@ -1840,27 +1726,140 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/MICRO/VFDT/testingNewStats-2020-01-29-09:57:01-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="112">
- <caret line="491" column="83" selection-start-line="491" selection-start-column="83" selection-end-line="491" selection-end-column="83" />
+ <state relative-caret-position="420">
+ <caret line="40" selection-start-line="40" selection-end-line="40" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="145">
+ <caret line="704" selection-start-line="704" selection-end-line="704" />
<folding>
- <element signature="e#52#93#0" expanded="true" />
+ <element signature="e#227#244#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/MICRO/VFDT/testingNewStats-2020-01-29-09:57:01-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="4335">
+ <caret line="289" selection-start-line="289" selection-end-line="289" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/UTIL/mpz_class.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="154">
+ <caret line="99" selection-start-line="99" selection-end-line="99" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="154">
+ <caret line="283" selection-start-line="283" selection-end-line="283" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file:///usr/include/c++/7/bits/stl_map.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="145">
+ <caret line="808" selection-start-line="808" selection-end-line="808" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file:///usr/include/c++/7/bits/stl_tree.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="145">
+ <caret line="2037" selection-start-line="2037" selection-end-line="2037" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file:///usr/include/c++/7/bits/stl_function.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="145">
+ <caret line="385" selection-start-line="385" selection-end-line="385" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="355">
+ <caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="23" column="17" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="145">
+ <caret line="146" selection-start-line="146" selection-end-line="146" />
+ <folding>
+ <element signature="e#0#20#0" expanded="true" />
+ <element signature="e#311#536#0" />
+ <element signature="e#539#1918#0" />
+ <element signature="e#2486#2696#0" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/micro/BankNBCipher-2020-01-29-17:02:18-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
- <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="19" column="30" lean-forward="true" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="225">
+ <caret line="15" selection-start-line="15" selection-end-line="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="392">
+ <caret line="50" selection-start-line="50" selection-end-line="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="342">
+ <caret line="389" selection-start-line="389" selection-end-line="389" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="262">
+ <caret line="843" column="74" selection-start-line="843" selection-start-column="74" selection-end-line="843" selection-end-column="74" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config
index cc161f06..c3e489b0 100755
--- a/CONFIG/DAPPLE.config
+++ b/CONFIG/DAPPLE.config
@@ -2,13 +2,13 @@ perf{
testBuildingBlocks="false";
PrivacyPreservation="true";
microBench="true";
- MLAlgorithm="vfdt";
+ MLAlgorithm="nb";
runs_number ="1";
- thread_number="14";
+ thread_number="1";
remoteClient="false";
Incremental="false";
- OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/TEST/MICRO/VFDT/";
- scenarioName ="VfdtNursery";
+ OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/micro/";
+ scenarioName ="BankNBCipher";
debug="true";
maxTrainSize="10";
maxTestSize="10";
@@ -17,22 +17,22 @@ perf{
# The dataset configuration parameters
dataset{
mainPath = "/home/rania/CLionProjects/DAPPLE-2.0/";
- path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/";
- clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/";
+ path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
+ clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
chunk_prefix="DO";
- class_number="4";
- dimension="9";
+ class_number="2";
+ dimension="17";
chunk_number="16";
}
# The vfdt algorithm parameters
vfdt{
- delta="0.0000001";
+ delta="0.000001";
tau="1";
- grace="10";
- max_depth="10";
+ grace="50";
+ max_depth="8";
threshold_number="2";
- maxNodes="70";
+ maxNodes="45";
}
# DTPKC parameters
@@ -46,8 +46,8 @@ perf{
sendParaClient="true";
blindingSize="100";
encryptData="true";
- delay="1";
- }
+ delay="2";
+}
# Naive Bayes parameters
nb{
diff --git a/CRYPTO/DTPKC.h b/CRYPTO/DTPKC.h
index 7b34f7dd..b8099233 100755
--- a/CRYPTO/DTPKC.h
+++ b/CRYPTO/DTPKC.h
@@ -55,7 +55,7 @@ public :
bool operator<