diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d6e8a95a90584c840f1fc35b464d77c2ce0e70b4..f3d24aeb27f19826bc2ffa9a878d4efb04b61ef9 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,10 +14,8 @@
<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$/SER/dtpkc.ser" beforeDir="false" afterPath="$PROJECT_DIR$/SER/dtpkc.ser" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/TEST/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/main.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -49,26 +47,22 @@
<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="225">
- <caret line="15" selection-start-line="15" selection-end-line="15" />
+ <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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <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" selection-start-line="5" selection-end-line="5" />
- </state>
- </provider>
+ <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 pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<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" />
+ <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" />
<folding>
<element signature="e#52#93#0" expanded="true" />
</folding>
@@ -79,8 +73,8 @@
<file pinned="false" current-in-tab="false">
<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" />
+ <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" />
<folding>
<element signature="e#0#17#0" expanded="true" />
</folding>
@@ -88,71 +82,52 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
<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 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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/buildingblocks-Stats.csv">
<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 relative-caret-position="270">
+ <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <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 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 pinned="false" current-in-tab="false">
- <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 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 pinned="false" current-in-tab="false">
- <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 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 pinned="false" current-in-tab="false">
- <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 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>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>omp</find>
<find>testBui</find>
<find>Cipher</find>
<find>valida</find>
@@ -182,6 +157,7 @@
<find>PPVFDT</find>
<find>lr</find>
<find>PPLR</find>
+ <find>stats</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -206,7 +182,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/CRYPTO/EvalDiv100.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalDotProd.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalEntropy.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalHBound.h" />
@@ -253,10 +228,11 @@
<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$/CRYPTO/DTPKC.h" />
- <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
<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$/TEST/TESTBuildingBlocks.cpp" />
</list>
</option>
</component>
@@ -273,7 +249,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -284,23 +259,13 @@
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" 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="PPLR" type="462c0819:PsiDirectoryNode" />
+ <item name="cmake-build-debug" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -439,14 +404,10 @@
<workItem from="1579733182270" duration="5798000" />
<workItem from="1579786820041" duration="13624000" />
<workItem from="1579862666687" duration="6374000" />
- <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>
- <option name="number" value="00043" />
- <option name="presentableId" value="LOCAL-00043" />
- <option name="project" value="LOCAL" />
- <updated>1552754829634</updated>
+ <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>
@@ -784,11 +745,18 @@
<option name="project" value="LOCAL" />
<updated>1580292600787</updated>
</task>
- <option name="localTasksCounter" value="92" />
+ <task id="LOCAL-00092" summary="New tests for the S&P paper">
+ <created>1580395274656</created>
+ <option name="number" value="00092" />
+ <option name="presentableId" value="LOCAL-00092" />
+ <option name="project" value="LOCAL" />
+ <updated>1580395274656</updated>
+ </task>
+ <option name="localTasksCounter" value="93" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1267557000" />
+ <option name="totallyTimeSpent" value="1284176000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -800,21 +768,21 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="67" y="25" width="1853" height="1175" extended-state="6" />
+ <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.14720531" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.28500277" />
<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.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="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="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.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="Messages" order="8" sideWeight="0.43054786" weight="0.4861809" />
+ <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="Version Control" order="11" sideWeight="0.4864416" weight="0.32026768" />
<window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7094632" weight="0.36466166" />
@@ -1454,12 +1422,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
- <line>639</line>
+ <line>669</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>640</line>
+ <line>670</line>
<option name="timeStamp" value="1020" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1518,347 +1486,246 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1275">
- <caret line="85" column="29" selection-start-line="85" selection-start-column="16" selection-end-line="85" selection-end-column="29" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.h">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.h">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="326">
- <caret line="64" selection-start-line="64" selection-end-line="64" />
- <folding>
- <element signature="e#348#851#0" />
- <element signature="e#855#1369#0" />
- <element signature="e#1559#2847#0" />
- <element signature="e#2849#4085#0" />
- <element signature="e#4088#4457#0" />
- </folding>
- </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>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryClearVFDT-2019-06-26-09:47:17-Config.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="13" column="23" selection-end-line="68" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:22:24-Stats.csv">
+ <entry file="file:///usr/include/c++/7/bits/stl_tree.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="128" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="128" />
+ <state relative-caret-position="30555">
+ <caret line="2037" selection-start-line="2037" selection-end-line="2037" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="42" selection-start-line="42" selection-end-line="42" />
+ <state relative-caret-position="2190">
+ <caret line="146" selection-start-line="146" selection-end-line="146" />
<folding>
- <element signature="e#325#344#0" expanded="true" />
+ <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$/PPML/PPVFDT/PPNodeTest.cpp">
+ <entry file="file://$PROJECT_DIR$/DOC/mpfrInstalationSteps">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
- <folding>
- <element signature="e#186#209#0" expanded="true" />
- </folding>
+ <state relative-caret-position="285">
+ <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:49:46-Config.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="115">
- <caret line="97" selection-start-line="97" selection-end-line="97" />
- <folding>
- <element signature="e#166#185#0" expanded="true" />
- </folding>
+ <state relative-caret-position="137">
+ <caret line="44" column="20" selection-end-line="69" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:36:01-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Cipher-2019-04-04-12:54:45-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-20:55:44-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Cipher-2019-04-05-12:55:35-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-20:55:44-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-11:22:44-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-12:38:07-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/PlzWork-2019-04-05-13:22:33-ClassOutput.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-12:38:07-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/new-2019-05-13-08:28:34-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning2/Bank2-Clear-vfdt-2019-06-30-22:05:17-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-16-14:15:18-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning2/Bank-Cipher-VFDT-2019-06-30-12:42:18-Stats.csv">
+ <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>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning2/Bank-Cipher-VFDT-2019-06-30-12:52:17-Stats.csv">
+ <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>
- <entry file="file://$PROJECT_DIR$/EXP/Tuning2/Bank-Cipher-VFDT-2019-06-30-12:52:17-Config.txt">
+ <entry file="file:///usr/local/include/gmpxx.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="2" selection-end-line="68" selection-end-column="2" />
+ <state relative-caret-position="36945">
+ <caret line="2463" selection-start-line="2463" selection-end-line="2463" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2019-03-13-19:29:57-Config.txt">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="570">
- <caret line="38" column="25" selection-end-line="67" selection-end-column="2" />
+ <state relative-caret-position="1350">
+ <caret line="90" selection-start-line="90" selection-end-line="90" />
+ <folding>
+ <element signature="e#227#244#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp">
+ <entry file="file://$PROJECT_DIR$/UTIL/num_th_alg.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2310">
- <caret line="154" column="38" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="38" />
+ <state relative-caret-position="4785">
+ <caret line="319" selection-start-line="319" selection-end-line="319" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:49:46-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testmu-2020-01-24-13:59:02-Config.txt">
<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="390">
+ <caret line="26" selection-end-line="69" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testmu-2020-01-24-10:50:54-Stats.csv">
+ <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-VFDT/cipher-2019-03-18-09:44:55-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-VFDT/cipher-2019-03-18-09:44:55-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:03:04-Config.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="17" column="9" selection-end-line="67" selection-end-column="2" />
+ <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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/testmu-2020-01-24-13:59:02-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:49:46-Config.txt">
+ <entry file="file://$PROJECT_DIR$/EXP/LR-Adult/LR-2020-01-24-10:44:54-Config.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="465">
- <caret line="31" column="15" selection-end-line="69" selection-end-column="2" />
+ <state relative-caret-position="375">
+ <caret line="25" column="2" selection-end-line="69" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/MICRO/VFDT/NurseryVFDTCipher-2020-01-24-14:11:23-Stats.csv">
- <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>
- </provider>
+ <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$/CRYPTO/EvalCmp100.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="390">
- <caret line="62" column="101" lean-forward="true" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="109" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
+ <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$/DOC/requirements">
- <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>
- </provider>
+ <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$/DOC/gmpInstalationSteps">
- <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>
- </provider>
+ <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$/TEST/TESTBuildingBlocks.cpp">
- <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>
- </provider>
+ <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$/PPML/PPVFDT/PPVFDT_Classifier.h">
+ <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:22:18-Config.txt">
<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="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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/DO_1.data">
<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="479">
+ <caret line="70" column="1" selection-start-line="70" selection-start-column="1" selection-end-line="70" selection-end-column="17" />
</state>
</provider>
</entry>
- <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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/testing.data">
+ <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="40" selection-start-line="40" selection-end-line="40" />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/training.data">
+ <provider selected="true" editor-type-id="text-editor" />
</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#227#244#0" expanded="true" />
- </folding>
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
- <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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/testing.data">
+ <provider selected="true" editor-type-id="text-editor" />
</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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/Clean.csv">
+ <provider selected="true" editor-type-id="text-editor" />
</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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_1.data">
+ <provider selected="true" editor-type-id="text-editor" />
</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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_3.data">
+ <provider selected="true" editor-type-id="text-editor" />
</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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/data-clean.csv">
+ <provider selected="true" editor-type-id="text-editor" />
</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 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$/CRYPTO/DTPKC.h">
+ <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/result.data">
<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 relative-caret-position="-915">
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
</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 file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/LR/testing.data">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
+ <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:36:35-Stats.csv">
+ <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">
+ <provider selected="true" editor-type-id="text-editor" />
+ </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>
+ <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$/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="145">
- <caret line="146" selection-start-line="146" selection-end-line="146" />
+ <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" />
<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$/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" selection-start-line="5" selection-end-line="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" selection-start-line="15" selection-end-line="15" />
+ <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" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h">
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/buildingblocks-Stats.csv">
<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 relative-caret-position="270">
+ <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<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 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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.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" />
+ <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#52#93#0" expanded="true" />
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#264#7839#0" />
</folding>
</state>
</provider>
diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config
index c3e489b0e1e7423df1e8ed5bf3655801184233f8..540c38ebeb8a6f0e54ab387c77e072fdae16c943 100755
--- a/CONFIG/DAPPLE.config
+++ b/CONFIG/DAPPLE.config
@@ -1,27 +1,28 @@
-perf{
- testBuildingBlocks="false";
+# Experiments parameters
+ perf{
+ testBuildingBlocks="true";
PrivacyPreservation="true";
microBench="true";
- MLAlgorithm="nb";
+ MLAlgorithm="lr";
runs_number ="1";
- thread_number="1";
+ thread_number="16";
remoteClient="false";
Incremental="false";
- OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/micro/";
- scenarioName ="BankNBCipher";
+ OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/LR-Adult/";
+ scenarioName ="testNursery";
debug="true";
- maxTrainSize="10";
- maxTestSize="10";
+ maxTrainSize="20";
+ maxTestSize="20";
}
# The dataset configuration parameters
dataset{
mainPath = "/home/rania/CLionProjects/DAPPLE-2.0/";
- path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
- clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
+ path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/LR/";
+ clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/LR/";
chunk_prefix="DO";
class_number="2";
- dimension="17";
+ dimension="9";
chunk_number="16";
}
@@ -29,25 +30,25 @@ perf{
vfdt{
delta="0.000001";
tau="1";
- grace="50";
- max_depth="8";
+ grace="2";
+ max_depth="6";
threshold_number="2";
- maxNodes="45";
+ maxNodes="50";
}
# DTPKC parameters
crypto{
- deserialize="false";
+ deserialize="true";
pathSer="/home/rania/CLionProjects/DAPPLE-2.0/SER/";
- keySize ="1024";
+ keySize ="512";
DTPKC_Err = "600";
ComputationalPrecision="1000";
useORE="false";
sendParaClient="true";
- blindingSize="100";
+ blindingSize="300";
encryptData="true";
- delay="2";
-}
+ delay="1";
+ }
# Naive Bayes parameters
nb{
@@ -60,11 +61,11 @@ perf{
alpha="100";
LRTH="0.5";
batchSize="100";
- epochs="1";
+ epochs="3";
}
# Network parameters
network{
portS="5001";
- serverIP="10.144.4.7";
+ serverIP="127.0.0.1";
}
\ No newline at end of file
diff --git a/SER/dtpkc.ser b/SER/dtpkc.ser
index a6ff39254e03352b51e0a951354c0dcb4b2dc610..7b3d449ce3264c463aba987364364a09c3248aa9 100644
--- a/SER/dtpkc.ser
+++ b/SER/dtpkc.ser
@@ -1,11 +1,11 @@
-125683857509668197839847221081220948892478982430833001561380857439626693474288055036919932150820945203007503118292443314345933062198476925474527391492623753447625733387010083127023708029722904108920769223210651925911949470656431134946851138801083025813890674182274531548095928948669988433144342514959115322873
--1793211579184146995996770402974228782299645870480876162598882566428518927019077446712900403959724989098155871242277306662619754220452085394216398737510994517052747089334798702604666976564617376192202799844322361845325544097522555483325777415282783643595140886642601505835137471412869221849291211147127205560958650651444691253212751643615283055058545524910931521623563682066785692333717078301582638346355765438890301790034522928306529243030026243002108042192581588285197617793245610364193320061719299359693161616690272883632622163425753593655311281960358654299484344937705638394441459364821655633286836851787988386310
-15796432038510579049263805961756765805209171525851691825337247975613712830710336404672962605220717855419558198099829922734966353500928936432481073091274541296627961658453146364542259968525835633117613731176356389217930949776467992543808275875118081985529358389276972981315939308943166733717906426327972779625319270182170435098869332204410766927530525549401210395921898674286225867897083392611095342805779696875735274686287274014974469805570036240812507092565171595630111102634727812001999723515626389532114194702142903496356811714874780387730165822887993240509323222140304506522082685308663086776723248013779036974129
-1473993348371217572835659086755174060295721877992696276011951695807033906339159682859978955085370574596567434379232546537571838751138240761760813706105040857786556177319561984631302687643437824720664783150803752470503233937986178750248623541908622130945644911225418313434418236145511192216267722258115324540938900905764783397063532937905040640230599248104769475834029752566732876507654639529903418318657388122501679189974896529929532714339885077227370480325522665722939930003465635897006076314639116216784024113787999433895557007772936329126158244081407375441760770064265489894078612380555610792265403276404757405268648602609860758055659687501772773777025437189505770811913895522208064242421865834106065411985722717173599533634384564599115193536595392927884782288931329353161180053724535323128301186659452446938712861320956409552951761193990884089658117651666157450025976883044005801219146808971061812404219231884707330166164332695377586788626093755922112605095393847221460481164250168981976178787940698838370186328179655152922967717591755200019256448209902485101699170784865048412122194367487692814371489596619339766579646876166208140663413501074926312391822160483152933664091869239573523382603896798623249751862363024617838933496046416607922298449957062553982068957985537722544221911246039199510359288610849369049126127177807575252435460746910945526472521660483178152411199800879747781976828490685298763002048898000443409383803221521561346162990016035201555657839451507993575475121205646457436568652238084961178645349958827642769179043854363236518842702998097035333243513271692871960698526950708010101756699543973773261320741393817887202641304826568316472483929842517066510300925020330158634571863492609588078178512345995998964302398220483060977949019824058116600469703663127907437896258247520774501809014511073524446249361728058970225348933187512
+95142079227687501328117174412534304842893654983609757133617546024133903633080303571517982077992784442140353102933447942302923429674379677288157291814991874239311314058295138201424462580300760446473143252662929056833217841739029279365244406595483167523172857525757215262041601064011451510751098730670466718479
+-4998290816782707385487439421778800865562893800489495655723148581617033913057215393034098507670005709396051827611917918892377515010896652265079892036418547256691075670801175379632502797381426424810001161149955773966602305713250343485719162589353444814121229197933978524082196100903029991635632825615359422102089420935558932517703042450272158739598962463250256077582469018926160363689407645475254108478962213878650468499297258843705158309562576381536402887367724964618046690706447189379693164482800847169104622276082212606743376388028645775098278565410907372556446629729218992308830871973607739818902284061394421766353
+9052015239767565529186256519469594905148379459465450997097624144884782798895632868260407292771007613543877745001504104572637419134822512296873741907349191327762820448050645585510957154753444777414363793509771924249701245295971088013051238098951355718344705663213346066525053415534117511609776698323513742127254710960522296412092899018252479678910463066121975838644318384425126841216140468757244028312542890226174809834979207363106932178853859226716619692631025806071219376698632441013004406478240840792913808075720675298933421143209314658354981342435813420464750622569076680541299339189445208543214483927998640073441
+82409752659182278033577809732999119015232469303207869629096870331295133151375161333429706413073285192531082426340413945460722905214315625050425433298842978895351367930528380919784153601709939778994673704951283502761938157666853352130093146715581590488706254919692111102969756049954300529182887887375513558663563585428915316273159658523725836720814565308509795036292862558908301691296520123397129208337733882149140897215102363550993416296948532355480448601194503925258825989615743603854297299945054979858795716292330705194884629144281287796888894977605809407713593176186784871294048111371148857114048773783992311996309614912155873766579327162764415725320569194075423119223816559115280566698443517332667573838447705321474152538751097641696456971245928567075826803764587508323199540532275351346971578812104895735634052706909581251843308460635442434515648590549854517128082789262941461625915869409387844011627720855106580629831949510403791104438360915303240138203119412192872528038526201292776800563621865551488342685614258239758210086622077150635346319869391221413193048594777705661486035625124625872437401892961478896136009269845288826871559963706674627103009706331218871675043618288796514125073706031584452588888777244650930238286168174253447231118365923909496409682392026393730981803768733094940739185421375335702130251259071924542226833536851107686679246288395863899879173314724726536596093503658736289273025805317044035252601419168463023601402192640253693839767824960660017465899361375946890989371734268681206849638176725211493441305850922094880302869079915101944912727366631292177383400064408478449663064375964496934202075058747280429374890681927240282725445073003041936280660466209313968201924071153363962469209394692362214466798604068720413331018617524926434488840906304610587268920934403091694014155751057333914831709808886413725241582375000
1024
-10421887544681770017249733911260851445145637494785532803274908228056828231460304758491125799146534571772046983905287960315087851553809032179827465562786581
-12059605994674540124056530059413281897527915686312997734260719884447921418716360930699471054056641538767931818661128006853028557509814801694158871818139733
-174946450723671221964815641087254834450768280786791028003893107041820918343211649101789836732752782782286274578973620669754682608381636167868885329254897944350766791713808960295107457354692152606270687390955375160844041360917421692843992098159126593943579156120928172066415557632873533478443072815371156769163
-15710482188708524729980902635152618611559872803854125195172607179953336684286006879614991518852618150375937889786555414293241632774809615684315923936577966370766524253837492727594967169448695179420948515585014298785479620738347619785145243525528727829722516775433995641516095104032615601163808566077716799570
-174066406200254404700787075473903813965961429728953213117347025520800077691510999878202432972724223275136708916729832272689676754708835091118170440035990533282702349013252879116640433752259687269179802827612800057404553434466560182211807725351154238496843317140712556557358478060955219607470043388292273345457
-110458927882331328666756797656017096007451123726460939452382430965721150106723707083911874972668536356601839851708430766925217938220698127250299791002353158780935829879189538397352160348641557881867425318600375001292894788976023150622464947023379371758968500006750771860986309580225184513006758011665839047443118458115004996838553710893161870942314315080204103677602918671014776813903451339525835086201532690756599625696075364871124299515895283466280774094583394787944629214627651663860561092604215463021871906308705980283227622522789370114623321428648246927311246572617876923846606763211273435243815545582470504197446003780775686068165394490227349911447849650551988658767490045509849144870992638488650115046582322698313592175168517188748987853800033546985401879943029328058554473971078048067971645118993994660483307220032563840515251467766145553372792720596878725434447263690869347510612204315150874301670703437517292272573
+9397731093113188824945623285343469125501300786574021861660123524843011432304794908404586424044240830618925081125399457507723627737905847598021678239544031
+10123941437035709007708335127357426540982203659283767119980089641148076955539069037692880244608048429044645023859264632714039349611638229960396450619936209
+100178965411151553009110581598065185862432736185529949168387344875625009232556749049037342547636143083398455753313818533215323586261367792473973333265472360219459630518167582300164197485820903670816565887757371464778764222356495421781466615801400101128698984378516608723696061512331090192253634091534985987053
+3397931400988839333147041943304796601531916249414634183343483786576210844038582270411356502785456587219298325104765997939390122488370702760291331850535423382772813711049903769552358924264467641534596335531212407736430423237522908410760653897457661258354042641273293949926834975036932213095483582590771687080
+28733921881191593962100687159757844080425068703902989522063746912565505875453375346873139614598359197163995742878337190163794341619245017676130207124386029781244435934145769973966904163891413810267122671436024690018831323991144299183445571021731537831293573934188803843763549637249412447031905610979192170271
+10372994301867119646051189445639737983979228512539616565195424948551309004913230058045315815278955983702987616149699770174255486248820178727612002201947824130116268757193832496423721609469297205571811325738713369265119852655436039818181222520562396924636242741262335339619020974908431774356183022289765797266098588843778455111722041905645510948254874696153328464080376256739354048926102854370134666076082192999415423377861717910754717241030549417168774752120894348316540899321636663238280131986715507584174443662486736432277114028793662803229297346476015378797626848498174717786901428176732175446333289835629725526507957058088554479663128586365976076260040820840027235271422515264565472455482353168272061524935721167636927415742426693839833472739209921341521227335797145185712591845896988652541102081342273943340744501135232373449217288831225572991723610193199407357065334139595235125003225681979423067552001001385863923649
diff --git a/TEST/TESTBuildingBlocks.cpp b/TEST/TESTBuildingBlocks.cpp
index 958c5ce2ef22bdad2426f4c76a9fd4fc3fc4f295..02a724338a88cfda4152ca55c0dcbfb6cb8bad4f 100755
--- a/TEST/TESTBuildingBlocks.cpp
+++ b/TEST/TESTBuildingBlocks.cpp
@@ -285,28 +285,38 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error
gmp_randstate_t randstate;
- double timeMU_SKS, timeSU_SKS, bdwMU_SKS, bdwSU_SKS;
- double timeMU_SE, timeSU_SE, bdwMU_SE, bdwSU_SE;
- double timeMU_STS, timeSU_STS, bdwMU_STS, bdwSU_STS;
- double timeMU_SHBC, timeSU_SHBC, bdwMU_SHBC, bdwSU_SHBC;
- double timeMU_SSig, timeSU_SSig, bdwMU_SSig, bdwSU_SSig;
- double timeMU_SDP, timeSU_SDP, bdwMU_SDP, bdwSU_SDP;
- double timeMU_SD, timeSU_SD, bdwMU_SD, bdwSU_SD;
- double timeMU_SM, timeSU_SM, bdwMU_SM, bdwSU_SM;
- double timeMU_SC, timeSU_SC, bdwMU_SC, bdwSU_SC;
- double timeMU_SLog, timeSU_SLog, bdwMU_SLog, bdwSU_SLog;
- double timeMU_SSqrt, timeSU_SSqrt, bdwMU_SSqrt, bdwSU_SSqrt;
- double timeMU_SExpo, timeSU_SExpo, bdwMU_SExpo, bdwSU_SExpo;
- double timeMU_SPU, timeSU_SPU, bdwMU_SPU, bdwSU_SPU;
-
- double totalRuntiume [13];
+ double bdwMU_SKS, bdwSU_SKS;
+ double bdwMU_SE, bdwSU_SE;
+ double bdwMU_STS, bdwSU_STS;
+ double bdwMU_SHBC, bdwSU_SHBC;
+ double bdwMU_SSig, bdwSU_SSig;
+ double bdwMU_SDP, bdwSU_SDP;
+ double bdwMU_SD, bdwSU_SD;
+ double bdwMU_SM, bdwSU_SM;
+ double bdwMU_SC, bdwSU_SC;
+ double bdwMU_SLog, bdwSU_SLog;
+ double bdwMU_SSqrt, bdwSU_SSqrt;
+ double bdwMU_SExpo, bdwSU_SExpo;
+ double bdwMU_SPU, bdwSU_SPU;
+
+ /*double totalRuntiume [13];
+ double sumSquares [13];
for (int k=0; k <13 ; k++ )
+ {
totalRuntiume[k] = 0.0;
+ sumSquares [k] = 0.0;
+ }
+ */
+
- int N=1;
+ std::ofstream stats;
+ stats.open( "buildingblocks-Stats.csv");
+ stats <<"SKS,SE,STS,SHBC,SSig,SDP,SD,SM,SC,SLog,SSqrt,SExpo,SPU"<<endl;
+
+ int N=1000;
if (deserialize) {
@@ -355,64 +365,24 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error
classses[0] = dtpkc.enc(INTER[0], pkey);
INTER[1].set_str("300", 10);
classses[1] = dtpkc.enc(INTER[1], pkey);
+ string line ="";
for (int j=0; j<N; j++) {
/**
-* Test Comparion
+* Test SkeySwitch
*/
- auto begin = chrono::high_resolution_clock::now();
-
-
- EvalCmp evalCmp(C_A, C_B, dtpkc);
- bool r = evalCmp.EvalCmp_U2_step2(evalCmp.EvalCmp_U1_step1());
-
+ auto begin = chrono::high_resolution_clock::now();
+ SkeySwitch skeySwitch(C_A, newPkey, dtpkc);
+ C_C = skeySwitch.SkeySwitch_U1_step3(skeySwitch.SkeySwitch_U2_step2(skeySwitch.SkeySwitch_U1_step1()));
auto en = chrono::high_resolution_clock::now();
std::chrono::duration<double, std::milli> duration = en - begin ;
- totalRuntiume[8] += duration.count();
-
-
-/**
-* Test EvalHBound
-*/
-
- begin = chrono::high_resolution_clock::now();
-
- mpz_class i = 10000;
- i = i * pow(log2(3) * 100, 2) * log(1 / 0.00001);
- begin = chrono::high_resolution_clock::now();
- EvalHBound evalHBound(dtpkc.enc(i, pkey), dtpkc.enc(1000, pkey), dtpkc);
- C_C = evalHBound.EvalHbound_U1_step3(evalHBound.EvalHBound_U2_step2(evalHBound.EvalHBound_U1_step1()));
-
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[3] += duration.count();
-/**
-* Test EvalSqrt
-*/
- begin = chrono::high_resolution_clock::now();
- EvalSqrt evalsqrt(C_A, dtpkc);
- C_C = evalsqrt.EvalHbound_U1_step3(evalsqrt.EvalHBound_U2_step2(evalsqrt.EvalHBound_U1_step1()));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[11] += duration.count();
+ line += std::to_string(duration.count()) +",";
C = dtpkc.Sdec(C_C);
-/**
-* Test EvalDiv
-*/
- begin = chrono::high_resolution_clock::now();
- EvalDiv div(C_A, C_B, dtpkc);
- std::vector<DTPKC::Cipher> res = div.EvalDiv_U1_step1();
- C_C = div.EvalDiv_U1_step3(div.EvalDiv_U2_step2(res[0], res[1], res[2], res[3]));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[6] += duration.count();
- C = dtpkc.Sdec(C_C);
-
/**
* Test Secure entropy
*/
@@ -422,42 +392,7 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error
C_C = evalEntropy.EvalEntropy_U1_step3(evalEntropy.EvalEntropy_U2_step2(evalEntropy.EvalEntropy_U1_step1()));
en = chrono::high_resolution_clock::now();
duration = en - begin ;
- totalRuntiume[1] += duration.count();
- C = dtpkc.Sdec(C_C);
-
-
-/**
-* Test EvalProba
-*/
- begin = chrono::high_resolution_clock::now();
-
- EvalProba evalProba(classses, dtpkc);
- C_C = evalProba.EvalProba_U1_step3(evalProba.EvalProba_U2_step2(evalProba.EvalProba_U1_step1()));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[12] += duration.count();
- C = dtpkc.Sdec(C_C);
-
-/**
-* Test SkeySwitch
-*/
- begin = chrono::high_resolution_clock::now();
- SkeySwitch skeySwitch(C_A, newPkey, dtpkc);
- C_C = skeySwitch.SkeySwitch_U1_step3(skeySwitch.SkeySwitch_U2_step2(skeySwitch.SkeySwitch_U1_step1()));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[0] += duration.count();
- C = dtpkc.Sdec(C_C);
-
-/**
-* Test EvalMult
-*/
- begin = chrono::high_resolution_clock::now();
- EvalMult e1(C_A, C_B, dtpkc);
- C_C = e1.EvalMult_U1_step3(e1.EvalMult_U2_step2(e1.EvalMult_U1_step1()));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[7] += duration.count();
+ line += std::to_string(duration.count()) +",";
C = dtpkc.Sdec(C_C);
/**
@@ -474,56 +409,45 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error
C_C = evalThreashold.eval();
en = chrono::high_resolution_clock::now();
duration = en - begin ;
- totalRuntiume[2] += duration.count();
-
+ line += std::to_string(duration.count()) +",";
/**
-* Test Sigmoid
+* Test EvalHBound
*/
- x = 2;
- Cipher C_x = dtpkc.enc(x, dtpkc.pkw);
- C_x.sign = 0;
+ begin = chrono::high_resolution_clock::now();
+
+ mpz_class i = 10000;
+ i = i * pow(log2(3) * 100, 2) * log(1 / 0.00001);
begin = chrono::high_resolution_clock::now();
- EvalSigmoid evalSigmoid(C_x, 100, dtpkc);
- vector<Cipher> in = evalSigmoid.EvalSig_U1_step1();
- C_C = evalSigmoid.EvalSig_U1_step3(evalSigmoid.EvalSig_U2_step2(in[0], in[1]));
+ EvalHBound evalHBound(dtpkc.enc(i, pkey), dtpkc.enc(1000, pkey), dtpkc);
+ C_C = evalHBound.EvalHbound_U1_step3(evalHBound.EvalHBound_U2_step2(evalHBound.EvalHBound_U1_step1()));
+
en = chrono::high_resolution_clock::now();
duration = en - begin ;
- totalRuntiume[4] += duration.count();
- C = dtpkc.Sdec(C_C);
+ line += std::to_string(duration.count()) +",";
-/**
-* Test Expo
-*/
- begin = chrono::high_resolution_clock::now();
- EvalExpo evalExpo(C_A, 100, dtpkc);
- vector<Cipher> in_ = evalExpo.EvalSig_U1_step1();
- C_C = evalExpo.EvalSig_U1_step3(evalExpo.EvalSig_U2_step2(in_[0], in_[1]));
- en = chrono::high_resolution_clock::now();
- duration = en - begin ;
- totalRuntiume[10] += duration.count();
-
/**
-* Test Log
+* Test Sigmoid
*/
- x = 194;
- C_x = dtpkc.enc(x, dtpkc.pkw);
- C_x.sign = 1;
- cpt++;
+ x = 2;
+ Cipher C_x = dtpkc.enc(x, dtpkc.pkw);
+ C_x.sign = 0;
begin = chrono::high_resolution_clock::now();
- EvalLog evalLog(C_x, 10000, dtpkc);
- in = evalLog.EvalLog_U1_step1();
- C_C = evalLog.EvalLog_U1_step3(evalLog.EvalLog_U2_step2(in[0], in[1]));
+ EvalSigmoid evalSigmoid(C_x, 100, dtpkc);
+ vector<Cipher> in = evalSigmoid.EvalSig_U1_step1();
+ C_C = evalSigmoid.EvalSig_U1_step3(evalSigmoid.EvalSig_U2_step2(in[0], in[1]));
en = chrono::high_resolution_clock::now();
duration = en - begin ;
- totalRuntiume[9] += duration.count();
+ line += std::to_string(duration.count()) +",";
C = dtpkc.Sdec(C_C);
+
+
/**
* Testing the dot product protocol
*/
@@ -577,65 +501,171 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error
C_C = evalDotProd.EvalDotProd_U1_step3(evalDotProd.EvalDotProd_U2_step2(evalDotProd.EvalDotProd_U1_step1()));
en = chrono::high_resolution_clock::now();
duration = en - begin ;
- totalRuntiume[5] += duration.count();
+ line += std::to_string(duration.count()) +",";
+ C = dtpkc.Sdec(C_C);
+
+/**
+* Test EvalDiv
+*/
+ begin = chrono::high_resolution_clock::now();
+ EvalDiv div(C_A, C_B, dtpkc);
+ std::vector<DTPKC::Cipher> res = div.EvalDiv_U1_step1();
+ C_C = div.EvalDiv_U1_step3(div.EvalDiv_U2_step2(res[0], res[1], res[2], res[3]));
+
+
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+ C = dtpkc.Sdec(C_C);
+
+
+/**
+* Test EvalMult
+*/
+ begin = chrono::high_resolution_clock::now();
+ EvalMult e1(C_A, C_B, dtpkc);
+ C_C = e1.EvalMult_U1_step3(e1.EvalMult_U2_step2(e1.EvalMult_U1_step1()));
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+ C = dtpkc.Sdec(C_C);
+
+
+
+
+
+
+
+/**
+* Test Comparion
+*/
+ begin = chrono::high_resolution_clock::now();
+
+
+ EvalCmp evalCmp(C_A, C_B, dtpkc);
+ bool r = evalCmp.EvalCmp_U2_step2(evalCmp.EvalCmp_U1_step1());
+
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+
+/**
+* Test Log
+*/
+
+ x = 194;
+ C_x = dtpkc.enc(x, dtpkc.pkw);
+ C_x.sign = 1;
+ cpt++;
+ begin = chrono::high_resolution_clock::now();
+ EvalLog evalLog(C_x, 10000, dtpkc);
+ in = evalLog.EvalLog_U1_step1();
+ C_C = evalLog.EvalLog_U1_step3(evalLog.EvalLog_U2_step2(in[0], in[1]));
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+ C = dtpkc.Sdec(C_C);
+
+/**
+* Test EvalSqrt
+*/
+ begin = chrono::high_resolution_clock::now();
+ EvalSqrt evalsqrt(C_A, dtpkc);
+ C_C = evalsqrt.EvalHbound_U1_step3(evalsqrt.EvalHBound_U2_step2(evalsqrt.EvalHBound_U1_step1()));
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
C = dtpkc.Sdec(C_C);
+/**
+* Test Expo
+*/
+
+
+ begin = chrono::high_resolution_clock::now();
+ EvalExpo evalExpo(C_A, 100, dtpkc);
+ vector<Cipher> in_ = evalExpo.EvalSig_U1_step1();
+ C_C = evalExpo.EvalSig_U1_step3(evalExpo.EvalSig_U2_step2(in_[0], in_[1]));
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+
+/**
+* Test EvalProba
+*/
+ begin = chrono::high_resolution_clock::now();
+
+ EvalProba evalProba(classses, dtpkc);
+ C_C = evalProba.EvalProba_U1_step3(evalProba.EvalProba_U2_step2(evalProba.EvalProba_U1_step1()));
+ en = chrono::high_resolution_clock::now();
+ duration = en - begin ;
+ line += std::to_string(duration.count()) +",";
+ C = dtpkc.Sdec(C_C);
+
+
+
+
+ stats << line << endl;
+ line ="";
+
/**
* Summary
*/
- timeMU_SKS += skeySwitch.timeMU; timeSU_SKS += skeySwitch.timeSU; bdwMU_SKS +=skeySwitch.bdwMU; bdwSU_SKS +=skeySwitch.bdwSU;
- timeMU_SE += evalEntropy.timeMU; timeSU_SE += evalEntropy.timeSU; bdwMU_SE +=evalEntropy.bdwMU; bdwSU_SE +=evalEntropy.bdwSU;
- timeMU_STS += evalThreashold.timeMU; timeSU_STS += evalThreashold.timeSU; bdwMU_STS +=evalThreashold.bdwMU; bdwSU_STS +=evalThreashold.bdwSU;
- timeMU_SHBC += evalHBound.timeMU; timeSU_SHBC += evalHBound.timeSU; bdwMU_SHBC +=evalHBound.bdwMU; bdwSU_SHBC +=evalHBound.bdwSU;
- timeMU_SSig += evalSigmoid.timeMU; timeSU_SSig += evalSigmoid.timeSU; bdwMU_SSig +=evalSigmoid.bdwMU; bdwSU_SSig +=evalSigmoid.bdwSU;
- timeMU_SDP += evalDotProd.timeMU; timeSU_SDP += evalDotProd.timeSU; bdwMU_SDP +=evalDotProd.bdwMU; bdwSU_SDP +=evalDotProd.bdwSU;
- timeMU_SD += div.timeMU; timeSU_SD += div.timeSU; bdwMU_SD +=div.bdwMU; bdwSU_SD +=div.bdwSU;
- timeMU_SM += e1.timeMU; timeSU_SM += e1.timeSU; bdwMU_SM +=e1.bdwMU; bdwSU_SM +=e1.bdwSU;
- timeMU_SC += evalCmp.timeMU; timeSU_SC += evalCmp.timeSU; bdwMU_SC +=evalCmp.bdwMU; bdwSU_SC +=evalCmp.bdwSU;
- timeMU_SLog += evalLog.timeMU; timeSU_SLog += evalLog.timeSU; bdwMU_SLog +=evalLog.bdwMU; bdwSU_SLog +=evalLog.bdwSU;
- timeMU_SSqrt += evalsqrt.timeMU; timeSU_SSqrt += evalsqrt.timeSU; bdwMU_SSqrt +=evalsqrt.bdwMU; bdwSU_SSqrt +=evalsqrt.bdwSU;
- timeMU_SExpo += evalExpo.timeMU; timeSU_SExpo += evalExpo.timeSU; bdwMU_SExpo +=evalExpo.bdwMU; bdwSU_SExpo +=evalExpo.bdwSU;
- timeMU_SPU += evalProba.timeMU; timeSU_SPU += evalProba.timeSU; bdwMU_SPU +=evalProba.bdwMU; bdwSU_SPU +=evalProba.bdwSU;
+ bdwMU_SKS +=skeySwitch.bdwMU; bdwSU_SKS +=skeySwitch.bdwSU;
+ bdwMU_SE +=evalEntropy.bdwMU; bdwSU_SE +=evalEntropy.bdwSU;
+ bdwMU_STS +=evalThreashold.bdwMU; bdwSU_STS +=evalThreashold.bdwSU;
+ bdwMU_SHBC +=evalHBound.bdwMU; bdwSU_SHBC +=evalHBound.bdwSU;
+ bdwMU_SSig +=evalSigmoid.bdwMU; bdwSU_SSig +=evalSigmoid.bdwSU;
+ bdwMU_SDP +=evalDotProd.bdwMU; bdwSU_SDP +=evalDotProd.bdwSU;
+ bdwMU_SD +=div.bdwMU; bdwSU_SD +=div.bdwSU;
+ bdwMU_SM +=e1.bdwMU; bdwSU_SM +=e1.bdwSU;
+ bdwMU_SC +=evalCmp.bdwMU; bdwSU_SC +=evalCmp.bdwSU;
+ bdwMU_SLog +=evalLog.bdwMU; bdwSU_SLog +=evalLog.bdwSU;
+ bdwMU_SSqrt +=evalsqrt.bdwMU; bdwSU_SSqrt +=evalsqrt.bdwSU;
+ bdwMU_SExpo +=evalExpo.bdwMU; bdwSU_SExpo +=evalExpo.bdwSU;
+ bdwMU_SPU +=evalProba.bdwMU; bdwSU_SPU +=evalProba.bdwSU;
}
- timeMU_SKS /=N; timeSU_SKS /=N; bdwMU_SKS /=N; bdwSU_SKS /=N;
- timeMU_SE /=N; timeSU_SE /=N; bdwMU_SE /=N; bdwSU_SE /=N;
- timeMU_STS /=N; timeSU_STS /=N; bdwMU_STS /=N; bdwSU_STS /=N;
- timeMU_SHBC /=N; timeSU_SHBC /=N; bdwMU_SHBC /=N; bdwSU_SHBC /=N;
- timeMU_SSig /=N; timeSU_SSig /=N; bdwMU_SSig /=N; bdwSU_SSig /=N;
- timeMU_SDP /=N; timeSU_SDP /=N; bdwMU_SDP /=N; bdwSU_SDP /=N;
- timeMU_SD /=N; timeSU_SD /=N; bdwMU_SD /=N; bdwSU_SD /=N;
- timeMU_SM /=N; timeSU_SM /=N; bdwMU_SM /=N; bdwSU_SM /=N;
- timeMU_SC /=N; timeSU_SC /=N; bdwMU_SC /=N; bdwSU_SC /=N;
- timeMU_SLog /=N; timeSU_SLog /=N; bdwMU_SLog /=N; bdwSU_SLog/=N;
- timeMU_SSqrt /=N; timeSU_SSqrt /=N; bdwMU_SSqrt /=N; bdwSU_SSqrt /=N;
- timeMU_SExpo /=N; timeSU_SExpo /=N; bdwMU_SExpo /=N; bdwSU_SExpo /=N;
- timeMU_SPU /=N; timeSU_SPU/=N; bdwMU_SPU /=N; bdwSU_SPU /=N;
-
- for (int k=0; k <13 ; k++ )
- totalRuntiume[k] /=N;
-
- double bdw = mpz_size(C_A.T1.get_mpz_t())+ mpz_size(C_A.T2.get_mpz_t())* sizeof(mp_limb_t);
- cout << "bdw " << bdw;
- cout << " timeMU_SKS= " << timeMU_SKS << " timeSU_SKS= " << timeSU_SKS << " bdwMU_SKS= " << bdwMU_SKS << " bdwSU_SKS= "<< bdwSU_SKS << " Com time " << totalRuntiume [0] - timeMU_SKS - timeSU_SKS << endl;
- cout << " timeMU_SE= " << timeMU_SE << " timeSU_SE= " << timeSU_SE << " bdwMU_SE= " << bdwMU_SE << " bdwSU_SE= "<< bdwSU_SE << " Com time " << totalRuntiume [1] - timeMU_SE - timeSU_SE << endl;
- cout << " timeMU_STS= " << timeMU_STS << " timeSU_STS= " << timeSU_STS << " bdwMU_STS= " << bdwMU_STS << " bdwSU_STS= "<< bdwSU_STS << " Com time " << totalRuntiume [2] - timeMU_STS - timeSU_STS << endl;
- cout << " timeMU_SHBC= " << timeMU_SHBC << " timeSU_SHBC= " << timeSU_SHBC << " bdwMU_SHBC= " << bdwMU_SHBC << " bdwSU_SHBC= "<< bdwSU_SHBC << " Com time " << totalRuntiume [3] - timeMU_SHBC - timeSU_SHBC << endl;
- cout << " timeMU_SSig= " << timeMU_SSig << " timeSU_SSig= " << timeSU_SSig << " bdwMU_SSig= " << bdwMU_SSig << " bdwSU_SSig= "<< bdwSU_SSig << " Com time " << totalRuntiume [4] - timeMU_SSig - timeSU_SSig << endl;
- cout << " timeMU_SDP= " << timeMU_SDP << " timeSU_SDP= " << timeSU_SDP << " bdwMU_SDP= " << bdwMU_SDP << " bdwSU_SDP= "<< bdwSU_SDP << " Com time " << totalRuntiume [5] - timeMU_SDP - timeSU_SDP << endl;
- cout << " timeMU_SD= " << timeMU_SD << " timeSU_SD= " << timeSU_SD << " bdwMU_SD= " << bdwMU_SD << " bdwSU_SD= "<< bdwSU_SD << " Com time " << totalRuntiume [6] - timeMU_SD - timeSU_SD << endl;
- cout << " timeMU_SM= " << timeMU_SM << " timeSU_SM= " << timeSU_SM << " bdwMU_SM= " << bdwMU_SM << " bdwSU_SM= "<< bdwSU_SM << " Com time " << totalRuntiume [7] - timeMU_SM - timeSU_SM << endl;
- cout << " timeMU_SC= " << timeMU_SC << " timeSU_SC= " << timeSU_SC << " bdwMU_SC= " << bdwMU_SC << " bdwSU_SC= "<< bdwSU_SC << " Com time " << totalRuntiume [8] - timeMU_SC - timeSU_SC << endl;
- cout << " timeMU_SLog= " << timeMU_SLog << " timeSU_SLog= " << timeSU_SLog << " bdwMU_SLog= " << bdwMU_SC << " bdwSU_SLog= "<< bdwSU_SLog << " Com time " << totalRuntiume [9] - timeMU_SLog - timeSU_SLog << endl;
- cout << " timeMU_SExpo= " << timeMU_SExpo << " timeSU_SExpo= " << timeSU_SExpo << " bdwMU_SExpo= " << bdwMU_SExpo << " bdwSU_SExpo= "<< bdwSU_SExpo<< " Com time " << totalRuntiume [10] - timeMU_SExpo - timeSU_SExpo << endl;
- cout << " timeMU_SSqrt= " << timeMU_SSqrt << " timeSU_SSqrt= " << timeSU_SSqrt << " bdwMU_SSqrt= " << bdwMU_SSqrt << " bdwSU_SExpo= "<< bdwSU_SSqrt<< " Com time " << totalRuntiume [11] - timeMU_SSqrt - timeSU_SSqrt << endl;
- cout << " timeMU_SPU= " << timeMU_SPU << " timeSU_SPU= " << timeSU_SPU << " bdwMU_SPU= " << bdwMU_SPU << " bdwSU_SPU= "<< bdwSU_SPU<< " Com time " << totalRuntiume [12] - timeMU_SPU - timeSU_SPU << endl;
+ bdwMU_SKS /=N; bdwSU_SKS /=N;
+ bdwMU_SE /=N; bdwSU_SE /=N;
+ bdwMU_STS /=N; bdwSU_STS /=N;
+ bdwMU_SHBC /=N; bdwSU_SHBC /=N;
+ bdwMU_SSig /=N; bdwSU_SSig /=N;
+ bdwMU_SDP /=N; bdwSU_SDP /=N;
+ bdwMU_SD /=N; bdwSU_SD /=N;
+ bdwMU_SM /=N; bdwSU_SM /=N;
+ bdwMU_SC /=N; bdwSU_SC /=N;
+ bdwMU_SLog /=N; bdwSU_SLog/=N;
+ bdwMU_SSqrt /=N; bdwSU_SSqrt /=N;
+ bdwMU_SExpo /=N; bdwSU_SExpo /=N;
+ bdwMU_SPU /=N; bdwSU_SPU /=N;
+
+ //double bdw = mpz_size(C_A.T1.get_mpz_t())+ mpz_size(C_A.T2.get_mpz_t())* sizeof(mp_limb_t);
+ //cout << "bdw " << bdw;
+
+ stats << "****************************************" <<endl;
+ stats << " bdw_SKS= " << bdwMU_SKS + bdwSU_SKS << endl;
+ stats << " bdw_SE" << bdwMU_SE + bdwSU_SE << endl;
+ stats << " bdw_STS= " << bdwMU_STS + bdwSU_STS << endl;
+ stats <<" bdw_SHBC= " << bdwMU_SHBC + bdwSU_SHBC << endl;
+ stats << " bdw_SSig= " << bdwMU_SSig + bdwSU_SSig << endl;
+ stats << " bdw_SDP= " << bdwMU_SDP + bdwSU_SDP << endl;
+ stats << " bdw_SD= " << bdwMU_SD + bdwSU_SD << endl;
+ stats << " bdw_SM= " << bdwMU_SM + bdwSU_SM << endl;
+ stats <<" bdw_SC= " << bdwMU_SC + bdwSU_SC << endl;
+ stats <<" bdw_SLog= " << bdwMU_SC + bdwSU_SLog << endl;
+ stats << " bdw_SExpo= " << bdwMU_SExpo + bdwSU_SExpo << endl;
+ stats <<" bdw_SSqrt= " << bdwMU_SSqrt + bdwSU_SSqrt << endl;
+ stats <<" bdw_SPU= " << bdwMU_SPU + bdwSU_SPU << endl;
+
+
+ stats.close();
if(!deserialize) gmp_randclear(randstate);
}