diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f3d24aeb27f19826bc2ffa9a878d4efb04b61ef9..b038568c92384ed27339031eda791920a6d6bc06 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,8 +14,20 @@
<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.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" 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$/PPML/PPNB/PPNB_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.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/TESTBuildingBlocks.h" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.h" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/TEST/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/main.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -47,106 +59,122 @@
<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="-354">
- <caret line="21" column="81" lean-forward="true" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="81" />
+ <state relative-caret-position="420">
+ <caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt.enc">
- <provider selected="true" editor-type-id="text-editor" />
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/TEST/MICRO/NB/AdultNB-debug-2020-03-05-00:44:36-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" />
+ </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/PPNB/PPNB_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="290" column="39" lean-forward="true" selection-start-line="288" selection-end-line="290" selection-end-column="39" />
+ <state relative-caret-position="586">
+ <caret line="313" column="22" selection-start-line="313" selection-start-column="18" selection-end-line="313" selection-end-column="27" />
<folding>
- <element signature="e#52#93#0" expanded="true" />
+ <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#594#2389#0" />
+ <element signature="e#2391#2807#0" />
+ <element signature="e#2845#3110#0" />
+ <element signature="e#3112#3484#0" />
+ <element signature="e#3520#4400#0" />
+ <element signature="e#4403#7032#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
+ <state relative-caret-position="345">
+ <caret line="260" column="14" selection-start-line="260" selection-start-column="14" selection-end-line="260" selection-end-column="14" />
<folding>
- <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#0#20#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="419">
- <caret line="328" column="17" selection-start-line="328" selection-start-column="17" selection-end-line="328" selection-end-column="17" />
+ <state relative-caret-position="714">
+ <caret line="166" selection-start-line="166" selection-end-line="166" />
<folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#264#7839#0" />
+ <element signature="e#227#244#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cmake-build-debug/buildingblocks-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+ <state relative-caret-position="1515">
+ <caret line="101" column="46" selection-start-line="101" selection-start-column="33" selection-end-line="101" selection-end-column="46" />
+ <folding>
+ <element signature="e#0#21#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="960">
+ <caret line="64" column="14" selection-start-line="64" selection-start-column="3" selection-end-line="64" selection-end-column="43" />
+ </state>
+ </provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="283">
+ <caret line="664" column="48" selection-start-line="664" selection-start-column="48" selection-end-line="664" selection-end-column="48" />
+ <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$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="6450">
+ <caret line="430" column="23" selection-start-line="430" selection-start-column="23" selection-end-line="430" selection-end-column="23" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#264#7796#0" />
+ </folding>
+ </state>
+ </provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:36:35-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1680">
+ <caret line="112" column="29" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="34" />
+ </state>
+ </provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>testBui</find>
- <find>Cipher</find>
- <find>valida</find>
- <find>validate</find>
- <find>sq</find>
- <find>proba</find>
- <find>Eval</find>
- <find>upda</find>
- <find>EvalEntr</find>
- <find>S9</find>
- <find>cout</find>
- <find>totalRuntiume[10]</find>
- <find>totalRuntiume [10]</find>
- <find>dela</find>
- <find>delay</find>
- <find>PNB</find>
- <find>PPNB</find>
- <find>evalu</find>
- <find>dese</find>
<find>SU</find>
<find>trainTimeMU</find>
<find>MU</find>
@@ -158,6 +186,25 @@
<find>lr</find>
<find>PPLR</find>
<find>stats</find>
+ <find>delay</find>
+ <find>mpz_class_powm</find>
+ <find>PSdec0</find>
+ <find>PS</find>
+ <find>log</find>
+ <find>PSdec</find>
+ <find>PSde</find>
+ <find>pow</find>
+ <find>div</find>
+ <find>sigma</find>
+ <find>STS</find>
+ <find>enc</find>
+ <find>Div</find>
+ <find>class</find>
+ <find>EvalTH</find>
+ <find>push</find>
+ <find>mpz_class_get_z_bits</find>
+ <find>evalDiv</find>
+ <find>PPNB</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -182,7 +229,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/CRYPTO/EvalDotProd.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalEntropy.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalHBound.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalLog.h" />
@@ -197,29 +243,22 @@
<option value="$PROJECT_DIR$/CRYPTO/EvalSqrt.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalDiv.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalHBound.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalMult.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalProba.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" />
<option value="$PROJECT_DIR$/Scripts/TestPPLR1.sh" />
<option value="$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py" />
<option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp" />
@@ -229,10 +268,18 @@
<option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" />
- <option value="$PROJECT_DIR$/TEST/main.cpp" />
<option value="$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:03:04-Config.txt" />
- <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
+ <option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/EvalMult.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
+ <option value="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
+ <option value="$PROJECT_DIR$/TEST/main.cpp" />
+ <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
</list>
</option>
</component>
@@ -259,7 +306,36 @@
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="cmake-build-debug" type="462c0819:PsiDirectoryNode" />
+ <item name="CONFIG" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
+ <item name="DAPPLE-2.0" 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="PPML" type="462c0819:PsiDirectoryNode" />
+ <item name="PPNB" 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" />
+ </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="NB" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -407,21 +483,12 @@
<workItem from="1580057064576" duration="36196000" />
<workItem from="1580398557379" duration="498000" />
<workItem from="1580399258653" duration="8076000" />
- <workItem from="1580724594956" duration="7288000" />
- </task>
- <task id="LOCAL-00044" summary="Corrected some possible memory leaks mpfr log exp init variables LR, clear randstate">
- <created>1552784524305</created>
- <option name="number" value="00044" />
- <option name="presentableId" value="LOCAL-00044" />
- <option name="project" value="LOCAL" />
- <updated>1552784524305</updated>
- </task>
- <task id="LOCAL-00045" summary="Debugging the trace diff between PP and NPP">
- <created>1552839483003</created>
- <option name="number" value="00045" />
- <option name="presentableId" value="LOCAL-00045" />
- <option name="project" value="LOCAL" />
- <updated>1552839483003</updated>
+ <workItem from="1580724594956" duration="9178000" />
+ <workItem from="1580909536765" duration="5901000" />
+ <workItem from="1581581919697" duration="4441000" />
+ <workItem from="1582721479106" duration="28227000" />
+ <workItem from="1583169882045" duration="75000" />
+ <workItem from="1583169995289" duration="6073000" />
</task>
<task id="LOCAL-00046" summary="Debugging the trace diff between PP and NPP">
<created>1552922321604</created>
@@ -752,11 +819,25 @@
<option name="project" value="LOCAL" />
<updated>1580395274656</updated>
</task>
- <option name="localTasksCounter" value="93" />
+ <task id="LOCAL-00093" summary="New tests for the S&P paper">
+ <created>1580905463900</created>
+ <option name="number" value="00093" />
+ <option name="presentableId" value="LOCAL-00093" />
+ <option name="project" value="LOCAL" />
+ <updated>1580905463900</updated>
+ </task>
+ <task id="LOCAL-00094" summary="New tests for the S&P paper">
+ <created>1580907185209</created>
+ <option name="number" value="00094" />
+ <option name="presentableId" value="LOCAL-00094" />
+ <option name="project" value="LOCAL" />
+ <updated>1580907185209</updated>
+ </task>
+ <option name="localTasksCounter" value="95" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1284176000" />
+ <option name="totallyTimeSpent" value="1330783000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -770,20 +851,20 @@
<component name="ToolWindowManager">
<frame x="67" y="25" width="1853" height="925" extended-state="6" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.28500277" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.26895407" />
<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 anchor="bottom" id="Run" order="3" sideWeight="0.6303265" visible="true" weight="0.33668342" />
- <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5146652" weight="0.52294457" />
+ <window_info anchor="bottom" id="Run" order="3" sideWeight="0.6303265" visible="true" weight="0.40577888" />
+ <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5146652" weight="0.5223325" />
<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.43054786" weight="0.4861809" />
+ <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.43054786" weight="0.47613066" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.4853348" side_tool="true" weight="0.5325048" />
- <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.50359714" weight="0.40935114" />
+ <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.50359714" weight="0.54396987" />
<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" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -1028,12 +1109,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>119</line>
+ <line>142</line>
<option name="timeStamp" value="611" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>164</line>
+ <line>197</line>
<option name="timeStamp" value="612" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1052,7 +1133,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>1171</line>
+ <line>1188</line>
<option name="timeStamp" value="699" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1187,7 +1268,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>98</line>
+ <line>100</line>
<option name="timeStamp" value="791" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1272,12 +1353,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>114</line>
+ <line>137</line>
<option name="timeStamp" value="868" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>150</line>
+ <line>182</line>
<option name="timeStamp" value="870" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1347,7 +1428,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>1056</line>
+ <line>1073</line>
<option name="timeStamp" value="942" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1357,12 +1438,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>1084</line>
+ <line>1101</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>1086</line>
+ <line>1103</line>
<option name="timeStamp" value="946" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1422,12 +1503,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
- <line>669</line>
+ <line>718</line>
<option name="timeStamp" value="1019" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
- <line>670</line>
+ <line>719</line>
<option name="timeStamp" value="1020" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1440,6 +1521,16 @@
<line>666</line>
<option name="timeStamp" value="1024" />
</line-breakpoint>
+ <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <url>file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp</url>
+ <line>178</line>
+ <option name="timeStamp" value="1025" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <url>file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp</url>
+ <line>62</line>
+ <option name="timeStamp" value="1026" />
+ </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/DATA/Scripts/Clean_Adult.py</url>
<line>8</line>
@@ -1486,247 +1577,335 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file:///usr/include/c++/7/bits/stl_tree.h">
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/Clean.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_1.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_3.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/data-clean.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_1.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/result.data">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30555">
- <caret line="2037" selection-start-line="2037" selection-end-line="2037" />
+ <state relative-caret-position="-915">
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/testing.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/training.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_9.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_2.data">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:36:35-Config.txt">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt.enc">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2190">
- <caret line="146" selection-start-line="146" selection-end-line="146" />
+ <state relative-caret-position="510">
+ <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
<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" />
+ <element signature="e#0#17#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DOC/mpfrInstalationSteps">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Config.txt">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+ <state relative-caret-position="1635">
+ <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:49:46-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="137">
- <caret line="44" column="20" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="1560">
+ <caret line="104" column="37" selection-start-line="104" selection-start-column="32" selection-end-line="104" selection-end-column="37" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Cipher-2019-04-04-12:54:45-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-25-13:43:47-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Cipher-2019-04-05-12:55:35-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-24-13:13:56-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-11:22:44-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/PlzWork-2019-04-05-13:22:33-ClassOutput.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/new-2019-05-13-08:28:34-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:36:35-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-16-14:15:18-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-25-13:44:15-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Autism/LR-2019-03-13-23:09:04-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="222">
+ <caret line="55" column="15" lean-forward="true" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+ <folding>
+ <element signature="e#0#22#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Autism/LR-2019-03-13-23:10:43-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+ </state>
+ </provider>
</entry>
- <entry file="file:///usr/local/include/gmpxx.h">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="36945">
- <caret line="2463" selection-start-line="2463" selection-end-line="2463" />
+ <state relative-caret-position="222">
+ <caret line="571" lean-forward="true" selection-start-line="571" selection-end-line="571" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.h">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1350">
- <caret line="90" selection-start-line="90" selection-end-line="90" />
+ <state relative-caret-position="261">
+ <caret line="130" lean-forward="true" selection-start-line="129" selection-start-column="12" selection-end-line="130" />
<folding>
- <element signature="e#227#244#0" expanded="true" />
+ <element signature="e#0#17#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/UTIL/num_th_alg.cc">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4785">
- <caret line="319" selection-start-line="319" selection-end-line="319" />
+ <state relative-caret-position="-1569">
+ <caret line="79" column="43" lean-forward="true" selection-start-line="79" selection-start-column="43" selection-end-line="79" selection-end-column="43" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testmu-2020-01-24-13:59:02-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="390">
- <caret line="26" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="126">
+ <caret line="242" lean-forward="true" selection-start-line="242" selection-end-line="242" />
+ <folding>
+ <element signature="e#205#222#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugC_VS_P/clear-2019-03-20-11:36:30-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:03:04-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="855">
- <caret line="57" column="3" selection-start-line="57" selection-start-column="3" selection-end-line="57" selection-end-column="3" />
+ <state relative-caret-position="132">
+ <caret line="126" column="49" selection-start-line="126" selection-start-column="42" selection-end-line="126" selection-end-column="49" />
+ <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:44:54-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="25" column="2" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="141">
+ <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-VFDT/cipher-2019-03-18-14:45:43-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-VFDT/cipher-2019-03-18-14:48:23-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:14:07-ClassOutput.txt">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:14:07-ClassOutput.txt.enc">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:22:18-ClassOutput.txt.enc">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:22:18-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="435">
- <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+ <state relative-caret-position="240">
+ <caret line="145" column="31" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" />
+ <folding>
+ <element signature="e#0#24#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/DO_1.data">
+ <entry file="file://$PROJECT_DIR$/UTIL/math_util.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="479">
- <caret line="70" column="1" selection-start-line="70" selection-start-column="1" selection-end-line="70" selection-end-column="17" />
+ <state relative-caret-position="270">
+ <caret line="61" column="37" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="37" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/testing.data">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/training.data">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/testing.data">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/Clean.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_1.data">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_3.data">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/data-clean.csv">
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/clear.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_1.data">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="81">
+ <caret line="26" column="25" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="25" />
+ <folding>
+ <element signature="e#0#27#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/result.data">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-915">
- <caret line="41" selection-start-line="41" selection-end-line="41" />
+ <state relative-caret-position="-579">
+ <caret line="141" selection-start-line="141" selection-end-line="141" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/testing.data">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/buildingblocks-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="17" column="14" lean-forward="true" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/training.data">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="289">
+ <caret line="188" selection-start-line="187" selection-end-line="188" />
+ <folding>
+ <element signature="e#0#30#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_9.data">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file:///usr/local/include/gmpxx.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="48555">
+ <caret line="3237" selection-start-line="3237" selection-end-line="3237" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_2.data">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/UTIL/mpz_class.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1200">
+ <caret line="80" selection-start-line="80" selection-end-line="80" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:36:35-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1515">
+ <caret line="101" column="46" selection-start-line="101" selection-start-column="33" selection-end-line="101" selection-end-column="46" />
+ <folding>
+ <element signature="e#0#21#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:36:35-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="960">
+ <caret line="64" column="14" selection-start-line="64" selection-start-column="3" selection-end-line="64" selection-end-column="43" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="6450">
+ <caret line="430" column="23" selection-start-line="430" selection-start-column="23" selection-end-line="430" selection-end-column="23" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#264#7796#0" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1680">
+ <caret line="112" column="29" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="34" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-Config.txt">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="714">
+ <caret line="166" selection-start-line="166" selection-end-line="166" />
+ <folding>
+ <element signature="e#227#244#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testNursery-2020-02-03-10:37:11-ClassOutput.txt.enc">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/TEST/MICRO/NB/AdultNB-debug-2020-03-02-14:35:32-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" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
+ <state relative-caret-position="586">
+ <caret line="313" column="22" selection-start-line="313" selection-start-column="18" selection-end-line="313" selection-end-column="27" />
<folding>
<element signature="e#0#17#0" expanded="true" />
+ <element signature="e#594#2389#0" />
+ <element signature="e#2391#2807#0" />
+ <element signature="e#2845#3110#0" />
+ <element signature="e#3112#3484#0" />
+ <element signature="e#3520#4400#0" />
+ <element signature="e#4403#7032#0" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="290" column="39" lean-forward="true" selection-start-line="288" selection-end-line="290" selection-end-column="39" />
+ <state relative-caret-position="345">
+ <caret line="260" column="14" selection-start-line="260" selection-start-column="14" selection-end-line="260" selection-end-column="14" />
<folding>
- <element signature="e#52#93#0" expanded="true" />
+ <element signature="e#0#20#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/cmake-build-debug/buildingblocks-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+ <state relative-caret-position="283">
+ <caret line="664" column="48" selection-start-line="664" selection-start-column="48" selection-end-line="664" selection-end-column="48" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-354">
- <caret line="21" column="81" lean-forward="true" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="81" />
+ <state relative-caret-position="420">
+ <caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/MICRO/NB/AdultNB-debug-2020-03-05-00:44:36-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="419">
- <caret line="328" column="17" selection-start-line="328" selection-start-column="17" selection-end-line="328" selection-end-column="17" />
- <folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#264#7839#0" />
- </folding>
+ <state relative-caret-position="75">
+ <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config
index 540c38ebeb8a6f0e54ab387c77e072fdae16c943..6b2c436ade56940bc7da510dc6b1e98130843d3e 100755
--- a/CONFIG/DAPPLE.config
+++ b/CONFIG/DAPPLE.config
@@ -1,28 +1,27 @@
-# Experiments parameters
- perf{
- testBuildingBlocks="true";
+perf{
+ testBuildingBlocks="false";
PrivacyPreservation="true";
microBench="true";
- MLAlgorithm="lr";
+ MLAlgorithm="nb";
runs_number ="1";
- thread_number="16";
+ thread_number="14";
remoteClient="false";
Incremental="false";
- OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/LR-Adult/";
- scenarioName ="testNursery";
+ OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/TEST/MICRO/NB/";
+ scenarioName ="AdultNB-debug";
debug="true";
- maxTrainSize="20";
- maxTestSize="20";
+ maxTrainSize="10";
+ maxTestSize="10";
}
# The dataset configuration parameters
dataset{
mainPath = "/home/rania/CLionProjects/DAPPLE-2.0/";
- path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/LR/";
- clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/LR/";
+ path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Adult/";
+ clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Adult/";
chunk_prefix="DO";
class_number="2";
- dimension="9";
+ dimension="15";
chunk_number="16";
}
@@ -30,24 +29,24 @@
vfdt{
delta="0.000001";
tau="1";
- grace="2";
- max_depth="6";
+ grace="50";
+ max_depth="8";
threshold_number="2";
- maxNodes="50";
+ maxNodes="45";
}
# DTPKC parameters
crypto{
- deserialize="true";
+ deserialize="false";
pathSer="/home/rania/CLionProjects/DAPPLE-2.0/SER/";
- keySize ="512";
+ keySize ="1024";
DTPKC_Err = "600";
ComputationalPrecision="1000";
useORE="false";
sendParaClient="true";
- blindingSize="300";
+ blindingSize="100";
encryptData="true";
- delay="1";
+ delay="2";
}
# Naive Bayes parameters
@@ -61,11 +60,11 @@
alpha="100";
LRTH="0.5";
batchSize="100";
- epochs="3";
+ epochs="1";
}
# Network parameters
network{
portS="5001";
- serverIP="127.0.0.1";
+ serverIP="10.144.4.7";
}
\ No newline at end of file
diff --git a/CRYPTO/DTPKC.cpp b/CRYPTO/DTPKC.cpp
index a9c54961cc18acada484603017c3ea91ce6c28f8..c641e37665640c47b8e4dd26b5d4e6ade20d5828 100755
--- a/CRYPTO/DTPKC.cpp
+++ b/CRYPTO/DTPKC.cpp
@@ -511,6 +511,8 @@ DTPKC ::deserializeDtpkc(string path) {
DTPKC::bdwMU = 0.0;
DTPKC::bdwMU = 0.0;
DTPKC::cmpCtr = 0;
+
+
delete In;
return 1;
diff --git a/CRYPTO/EvalCmp.cpp b/CRYPTO/EvalCmp.cpp
index 89c0cf20cb90c269b9c2e8e84aed94a47cc7db3c..334100361cff4c9107aaf4d13fd6facb3af3eeb0 100755
--- a/CRYPTO/EvalCmp.cpp
+++ b/CRYPTO/EvalCmp.cpp
@@ -27,10 +27,10 @@ EvalCmp::EvalCmp_U1_step1() {
gmp_randclear(state);
Cipher C_R = dtpkc.enc(r2, A.Pub);
-#pragma omp sections
+//#pragma omp sections
{
-#pragma omp section
+//#pragma omp section
{
S1.T1 = mpz_class_powm(A.T1, r, dtpkc.n2);
S1.T2 = mpz_class_powm(A.T2, r, dtpkc.n2);
@@ -45,7 +45,7 @@ EvalCmp::EvalCmp_U1_step1() {
res[1] = S3;
}
-#pragma omp section
+//#pragma omp section
{
S2.T1 = mpz_class_powm(B.T1, r, dtpkc.n2);
diff --git a/CRYPTO/EvalDotProd.cpp b/CRYPTO/EvalDotProd.cpp
index 584c7e5c34518b6bbe5628d692aec5d33e253b37..0ecdb128657d0f6938c1de6ac6e015f9a7b7c90a 100755
--- a/CRYPTO/EvalDotProd.cpp
+++ b/CRYPTO/EvalDotProd.cpp
@@ -74,7 +74,7 @@ Cipher EvalDotProd::EvalDotProd_U2_step2(std::vector<Cipher> val)
gmp_randclear(state);
- #pragma omp parallel for shared (val, res, r3) schedule(static)
+ //#pragma omp parallel for shared (val, res, r3) schedule(static)
for (int i=0; i<val.size(); i+=4)
{
mpz_class inter = dtpkc.PSdec1(val[i], val[i+1]) * dtpkc.PSdec1(val[i+2], val[i+3]);
@@ -84,7 +84,7 @@ Cipher EvalDotProd::EvalDotProd_U2_step2(std::vector<Cipher>