diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1284db3593cee95aa98702795a5fa12df25af588..fe0b15a8acb2c5c929a7142e0e3da0a4fa1150b6 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -12,54 +12,14 @@ </component> <component name="ChangeListManager"> <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="New tests for the S&P paper"> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalExpo.h" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalSqrt.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalCmp.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalCmp.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalCmp.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalCmp100.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalCmp100.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDiv.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDiv.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDiv.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDiv.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDiv100.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDiv100.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDotProd.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDotProd.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalEntropy.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalEntropy.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalHBound.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalHBound.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalHBound.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalHBound.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLog.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLog.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalMult.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalMult.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalMult.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalMult.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalProba.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalProba.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalProba.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalProba.h" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.h" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/EvalThreashold.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalThreashold.h" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/CRYPTO/SkeySwitch.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/SkeySwitch.h" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" 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" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/DependInfo.cmake" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/build.make" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/cmake_clean.cmake" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/link.txt" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/progress.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/progress.make" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/DAPPLE.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/DAPPLE.cbp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -88,113 +48,108 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <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/SkeySwitch.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="263"> - <caret line="484" lean-forward="true" selection-start-line="484" selection-end-line="484" /> - <folding> - <element signature="e#0#31#0" expanded="true" /> - <element signature="e#199#7476#0" /> - </folding> + <state relative-caret-position="351"> + <caret line="104" column="91" selection-start-line="101" selection-start-column="2" selection-end-line="104" selection-end-column="91" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> + <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="165" column="27" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" /> + <state relative-caret-position="272"> + <caret line="519" column="10" selection-start-line="519" selection-start-column="8" selection-end-line="519" selection-end-column="10" /> <folding> - <element signature="e#0#17#0" expanded="true" /> + <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$/PPML/PPNB/PPStats.cpp"> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2105"> - <caret line="118" column="35" selection-start-line="118" selection-start-column="35" selection-end-line="118" selection-end-column="35" /> + <state relative-caret-position="306"> + <caret line="112" lean-forward="true" selection-start-line="112" selection-end-line="112" /> <folding> - <element signature="e#0#20#0" expanded="true" /> - <element signature="e#55#214#0" /> - <element signature="e#282#507#0" /> - <element signature="e#510#1846#0" /> - <element signature="e#1848#2377#0" /> - <element signature="e#2379#2558#0" /> + <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$/CRYPTO/EvalStandardDiv.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="411"> - <caret line="50" column="76" selection-start-line="47" selection-start-column="2" selection-end-line="51" /> + <state relative-caret-position="2265"> + <caret line="151" column="1" lean-forward="true" selection-start-line="151" selection-start-column="1" selection-end-line="151" selection-end-column="1" /> + <folding> + <element signature="e#0#24#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="11"> - <caret line="103" column="7" selection-start-line="103" selection-start-column="7" selection-end-line="103" selection-end-column="7" /> + <state relative-caret-position="315"> + <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> <folding> - <element signature="e#0#22#0" expanded="true" /> + <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$/CMakeLists.txt"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="23" column="44" lean-forward="true" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" /> + <state relative-caret-position="225"> + <caret line="15" column="42" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="54" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1001"> - <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" /> + <state relative-caret-position="315"> + <caret line="117" column="31" selection-start-line="117" selection-start-column="26" selection-end-line="117" selection-end-column="31" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp"> + <entry file="file://$PROJECT_DIR$/CMakeLists.txt"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="386"> - <caret line="152" selection-start-line="152" selection-end-line="153" /> + <state relative-caret-position="465"> + <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-773"> - <caret line="84" column="1" selection-start-line="84" selection-start-column="1" selection-end-line="84" selection-end-column="1" /> - <folding> - <element signature="e#160#177#0" expanded="true" /> - </folding> + <state relative-caret-position="160"> + <caret line="82" column="43" selection-start-line="82" selection-start-column="38" selection-end-line="82" selection-end-column="43" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="432"> - <caret line="45" column="1" selection-start-line="15" selection-end-line="45" selection-end-column="1" /> + <state relative-caret-position="450"> + <caret line="32" selection-start-line="31" selection-end-line="34" selection-end-column="23" /> </state> </provider> </entry> @@ -203,13 +158,6 @@ </component> <component name="FindInProjectRecents"> <findStrings> - <find>test</find> - <find>evallog</find> - <find>100</find> - <find>classi</find> - <find>classify</find> - <find>print</find> - <find>cout</find> <find>time</find> <find>nb</find> <find>initSa</find> @@ -233,6 +181,13 @@ <find>proba</find> <find>Eval</find> <find>upda</find> + <find>EvalEntr</find> + <find>S9</find> + <find>cout</find> + <find>dela</find> + <find>delay</find> + <find>totalRuntiume[10]</find> + <find>totalRuntiume [10]</find> </findStrings> <replaceStrings> <replace>EvalCmp100</replace> @@ -257,33 +212,16 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/ML/NB/NB_Classifier.cpp" /> <option value="$PROJECT_DIR$/ML/NB/Stats.cpp" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.h" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" /> - <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> <option value="$PROJECT_DIR$/TEST/TESTpacking.h" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" /> <option value="$PROJECT_DIR$/TEST/TESTElementaryOps.h" /> <option value="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" /> - <option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" /> <option value="$PROJECT_DIR$/TEST/TESTpacking.cpp" /> <option value="$PROJECT_DIR$/TEST/main.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalAddPow2.h" /> - <option value="$PROJECT_DIR$/CRYPTO/DTPKC.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/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/EvalSigmoid.cpp" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalCmp.h" /> <option value="$PROJECT_DIR$/CRYPTO/EvalCmp100.h" /> <option value="$PROJECT_DIR$/CRYPTO/EvalDiv.h" /> @@ -298,16 +236,33 @@ <option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.h" /> <option value="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.h" /> <option value="$PROJECT_DIR$/CRYPTO/EvalThreashold.h" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.h" /> - <option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalDiv.cpp" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalExpo.h" /> <option value="$PROJECT_DIR$/CRYPTO/EvalSqrt.h" /> + <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> + <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$/PPML/PPVFDT/PPVFDT_Classifier.h" /> + <option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" /> <option value="$PROJECT_DIR$/CMakeLists.txt" /> + <option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" /> <option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" /> + <option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" /> + <option value="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" /> </list> </option> </component> @@ -334,18 +289,12 @@ <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="CRYPTO" 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="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" /> - <item name="PPNB" type="462c0819:PsiDirectoryNode" /> + <item name="CRYPTO" type="462c0819:PsiDirectoryNode" /> </path> <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> @@ -487,21 +436,7 @@ <workItem from="1578399487282" duration="409000" /> <workItem from="1578400995489" duration="2901000" /> <workItem from="1578409400958" duration="17369000" /> - <workItem from="1578490199097" duration="14520000" /> - </task> - <task id="LOCAL-00033" summary="30/11/2018 : Last parallel version"> - <created>1546372131287</created> - <option name="number" value="00033" /> - <option name="presentableId" value="LOCAL-00033" /> - <option name="project" value="LOCAL" /> - <updated>1546372131287</updated> - </task> - <task id="LOCAL-00034" summary="07/01/2019 : started modifying NB"> - <created>1546884349425</created> - <option name="number" value="00034" /> - <option name="presentableId" value="LOCAL-00034" /> - <option name="project" value="LOCAL" /> - <updated>1546884349425</updated> + <workItem from="1578490199097" duration="32255000" /> </task> <task id="LOCAL-00035" summary="08/01/2019 : Clean implementation of NB"> <created>1546968943665</created> @@ -832,11 +767,25 @@ <option name="project" value="LOCAL" /> <updated>1578416928868</updated> </task> - <option name="localTasksCounter" value="82" /> + <task id="LOCAL-00082" summary="New tests for the S&P paper"> + <created>1578563823408</created> + <option name="number" value="00082" /> + <option name="presentableId" value="LOCAL-00082" /> + <option name="project" value="LOCAL" /> + <updated>1578563823409</updated> + </task> + <task id="LOCAL-00083" summary="New tests for the S&P paper"> + <created>1578589246281</created> + <option name="number" value="00083" /> + <option name="presentableId" value="LOCAL-00083" /> + <option name="project" value="LOCAL" /> + <updated>1578589246281</updated> + </task> + <option name="localTasksCounter" value="84" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="1124475000" /> + <option name="totallyTimeSpent" value="1142210000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -850,19 +799,19 @@ <component name="ToolWindowManager"> <frame x="67" y="25" width="1853" height="1175" extended-state="6" /> <layout> - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.23076923" /> + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.23076923" /> <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.49474266" weight="0.32663316" /> - <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.64748204" visible="true" weight="0.55258125" /> - <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.52241284" weight="0.32663316" /> + <window_info anchor="bottom" id="Run" order="3" sideWeight="0.63752073" visible="true" weight="0.4617591" /> + <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5207526" weight="0.53441685" /> <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.5052573" weight="0.41395792" /> - <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.352518" side_tool="true" visible="true" weight="0.55258125" /> + <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.49363586" weight="0.41395792" /> + <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.36247924" side_tool="true" visible="true" weight="0.4617591" /> <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4643055" weight="0.31658292" /> <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.4875484" weight="0.32035175" /> <window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7094632" weight="0.36466166" /> @@ -1360,11 +1309,6 @@ <line>137</line> <option name="timeStamp" value="870" /> </line-breakpoint> - <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> - <url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url> - <line>639</line> - <option name="timeStamp" value="873" /> - </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url> <line>119</line> @@ -1505,6 +1449,16 @@ <line>11</line> <option name="timeStamp" value="1016" /> </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url> + <line>655</line> + <option name="timeStamp" value="1019" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url> + <line>656</line> + <option name="timeStamp" value="1020" /> + </line-breakpoint> <line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <url>file://$PROJECT_DIR$/DATA/Scripts/Clean_Adult.py</url> <line>8</line> @@ -1551,411 +1505,414 @@ </watches-manager> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/PPML/IO/PPRecord.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="510"> - <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" /> + <state relative-caret-position="429"> + <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" /> + <state relative-caret-position="210"> + <caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1081"> - <caret line="120" column="27" lean-forward="true" selection-start-line="120" selection-start-column="27" selection-end-line="120" selection-end-column="27" /> + <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$/CRYPTO/EvalAddPow2.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="634"> - <caret line="58" selection-start-line="58" selection-end-line="58" /> + <state relative-caret-position="54"> + <caret line="37" column="18" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="225"> - <caret line="73" column="30" lean-forward="true" selection-start-line="71" selection-start-column="3" selection-end-line="74" selection-end-column="88" /> + <state relative-caret-position="300"> + <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="52" column="10" lean-forward="true" selection-start-line="52" selection-end-line="55" selection-end-column="109" /> - <folding> - <element signature="e#0#17#0" expanded="true" /> - </folding> + <state relative-caret-position="345"> + <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="264"> - <caret line="249" column="89" lean-forward="true" selection-start-line="246" selection-start-column="2" selection-end-line="249" selection-end-column="89" /> + <state relative-caret-position="1545"> + <caret line="103" column="30" selection-start-line="103" selection-start-column="30" selection-end-line="103" selection-end-column="30" /> <folding> - <element signature="e#205#222#0" expanded="true" /> + <element signature="e#0#30#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-750"> - <caret line="97" lean-forward="true" selection-start-line="97" selection-end-line="97" /> - <folding> - <element signature="e#0#17#0" expanded="true" /> - </folding> + <state relative-caret-position="330"> + <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="92" column="16" lean-forward="true" selection-start-line="90" selection-end-line="94" selection-end-column="107" /> + <state relative-caret-position="360"> + <caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="264"> - <caret line="24" column="5" lean-forward="true" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" /> + <state relative-caret-position="366"> + <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" /> <folding> - <element signature="e#0#20#0" expanded="true" /> + <element signature="e#56#118#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub2.cpp"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="354"> - <caret line="59" column="1" lean-forward="true" selection-start-line="59" selection-start-column="1" selection-end-line="59" selection-end-column="1" /> + <state relative-caret-position="128"> + <caret line="165" column="27" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" /> <folding> - <element signature="e#0#21#0" expanded="true" /> + <element signature="e#0#17#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="439"> - <caret line="183" selection-start-line="183" selection-end-line="183" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAdd.cpp"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> - <caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" /> + <state relative-caret-position="432"> + <caret line="45" column="1" selection-start-line="15" selection-end-line="45" selection-end-column="1" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1380"> - <caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" /> + <state relative-caret-position="-2105"> + <caret line="118" column="35" selection-start-line="118" selection-start-column="35" selection-end-line="118" selection-end-column="35" /> <folding> - <element signature="e#0#17#0" expanded="true" /> + <element signature="e#0#20#0" expanded="true" /> + <element signature="e#55#214#0" /> + <element signature="e#282#507#0" /> + <element signature="e#510#1846#0" /> + <element signature="e#1848#2377#0" /> + <element signature="e#2379#2558#0" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="225"> - <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> + <state relative-caret-position="374"> <caret line="31" column="4" selection-start-line="31" selection-start-column="4" selection-end-line="31" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="144"> - <caret line="25" column="12" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" /> + <state relative-caret-position="524"> + <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDotProd.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="19" column="8" lean-forward="true" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" /> + <state relative-caret-position="375"> + <caret line="25" column="12" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/EvalEntropy.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> + <state relative-caret-position="464"> <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.h"> + <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="429"> - <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> + <state relative-caret-position="330"> + <caret line="49" column="2" lean-forward="true" selection-start-line="49" selection-start-column="2" selection-end-line="49" selection-end-column="2" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.h"> + <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" /> + <state relative-caret-position="145"> + <caret line="1092" selection-start-line="1092" selection-end-line="1092" /> + <folding> + <element signature="e#52#93#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.h"> + <entry file="file:///usr/include/c++/7/thread"> <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="135"> + <caret line="372" selection-start-line="372" selection-end-line="372" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="54"> - <caret line="37" column="18" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" /> + <state relative-caret-position="346"> + <caret line="200" column="4" selection-start-line="200" selection-start-column="4" selection-end-line="200" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="300"> - <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> + <state relative-caret-position="361"> + <caret line="112" column="4" selection-start-line="112" selection-start-column="4" selection-end-line="112" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" /> + <state relative-caret-position="346"> + <caret line="136" column="4" selection-start-line="136" selection-start-column="4" selection-end-line="136" selection-end-column="4" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub.h"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1950"> - <caret line="130" selection-start-line="130" selection-end-line="130" /> + <state relative-caret-position="346"> + <caret line="252" column="4" selection-start-line="252" selection-start-column="4" selection-end-line="252" selection-end-column="4" /> + <folding> + <element signature="e#205#222#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2385"> - <caret line="159" column="23" selection-start-line="159" selection-start-column="23" selection-end-line="159" selection-end-column="23" /> + <state relative-caret-position="391"> + <caret line="167" column="4" selection-start-line="167" selection-start-column="4" selection-end-line="167" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1650"> - <caret line="110" selection-start-line="110" selection-end-line="110" /> + <state relative-caret-position="331"> + <caret line="98" column="45" selection-start-line="98" selection-start-column="45" selection-end-line="98" selection-end-column="45" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1545"> - <caret line="103" column="30" selection-start-line="103" selection-start-column="30" selection-end-line="103" selection-end-column="30" /> + <state relative-caret-position="376"> + <caret line="170" selection-start-line="170" selection-end-line="170" /> <folding> - <element signature="e#0#30#0" expanded="true" /> + <element signature="e#0#17#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="330"> - <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" /> + <state relative-caret-position="416"> + <caret line="198" selection-start-line="198" selection-end-line="198" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="16" column="18" selection-start-line="15" selection-end-line="17" selection-end-column="23" /> + <state relative-caret-position="371"> + <caret line="118" column="45" selection-start-line="118" selection-start-column="45" selection-end-line="118" selection-end-column="45" /> + <folding> + <element signature="e#0#22#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" /> + <state relative-caret-position="401"> + <caret line="161" selection-start-line="161" selection-end-line="161" /> + <folding> + <element signature="e#160#177#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="113" column="37" selection-start-line="113" selection-start-column="37" selection-end-line="113" selection-end-column="37" /> + <state relative-caret-position="376"> + <caret line="101" selection-start-line="101" selection-end-line="101" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="95" column="12" selection-start-line="95" selection-start-column="4" selection-end-line="95" selection-end-column="12" /> + <state relative-caret-position="356"> + <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" /> <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$/CRYPTO/EvalLog.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub2.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="546"> - <caret line="94" column="14" selection-start-line="93" selection-end-line="96" selection-end-column="89" /> + <state relative-caret-position="446"> + <caret line="59" column="1" selection-start-line="59" selection-start-column="1" selection-end-line="59" selection-end-column="1" /> <folding> - <element signature="e#0#17#0" expanded="true" /> + <element signature="e#0#21#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> - <caret line="60" column="23" selection-start-line="60" selection-start-column="17" selection-end-line="60" selection-end-column="30" /> + <state relative-caret-position="441"> + <caret line="142" selection-start-line="142" selection-end-line="142" /> <folding> - <element signature="e#0#24#0" expanded="true" /> + <element signature="e#0#27#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="297"> - <caret line="111" selection-start-line="111" selection-end-line="111" /> - <folding> - <element signature="e#0#21#0" expanded="true" /> - </folding> + <state relative-caret-position="210"> + <caret line="16" column="18" selection-start-line="15" selection-end-line="17" selection-end-column="23" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.h"> + <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="366"> - <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" /> - <folding> - <element signature="e#56#118#0" expanded="true" /> - </folding> + <state relative-caret-position="420"> + <caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="206"> - <caret line="130" column="18" selection-start-line="130" selection-start-column="18" selection-end-line="130" selection-end-column="18" /> - <folding> - <element signature="e#0#27#0" expanded="true" /> - </folding> + <state relative-caret-position="180"> + <caret line="35" column="10" selection-start-line="34" selection-end-line="35" selection-end-column="23" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp"> + <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1001"> - <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" /> + <state relative-caret-position="406"> + <caret line="45" column="16" selection-start-line="44" selection-end-line="47" selection-end-column="24" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAdd.cpp"> + <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="386"> - <caret line="152" selection-start-line="152" selection-end-line="153" /> + <state relative-caret-position="311"> + <caret line="124" column="12" selection-start-line="123" selection-end-line="128" selection-end-column="45" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-773"> - <caret line="84" column="1" selection-start-line="84" selection-start-column="1" selection-end-line="84" selection-end-column="1" /> + <state relative-caret-position="225"> + <caret line="15" column="42" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="54" /> <folding> - <element signature="e#160#177#0" expanded="true" /> + <element signature="e#0#17#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CMakeLists.txt"> + <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="23" column="44" lean-forward="true" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" /> + <state relative-caret-position="351"> + <caret line="104" column="91" selection-start-line="101" selection-start-column="2" selection-end-line="104" selection-end-column="91" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="165" column="27" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" /> - <folding> - <element signature="e#0#17#0" expanded="true" /> - </folding> + <state relative-caret-position="160"> + <caret line="82" column="43" selection-start-line="82" selection-start-column="38" selection-end-line="82" selection-end-column="43" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.h"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="432"> - <caret line="45" column="1" selection-start-line="15" selection-end-line="45" selection-end-column="1" /> + <state relative-caret-position="450"> + <caret line="32" selection-start-line="31" selection-end-line="34" selection-end-column="23" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="411"> - <caret line="50" column="76" selection-start-line="47" selection-start-column="2" selection-end-line="51" /> + <state relative-caret-position="315"> + <caret line="117" column="31" selection-start-line="117" selection-start-column="26" selection-end-line="117" selection-end-column="31" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp"> + <entry file="file://$PROJECT_DIR$/CMakeLists.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="465"> + <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="11"> - <caret line="103" column="7" selection-start-line="103" selection-start-column="7" selection-end-line="103" selection-end-column="7" /> + <state relative-caret-position="315"> + <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> <folding> - <element signature="e#0#22#0" expanded="true" /> + <element signature="e#227#244#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2105"> - <caret line="118" column="35" selection-start-line="118" selection-start-column="35" selection-end-line="118" selection-end-column="35" /> + <state relative-caret-position="2265"> + <caret line="151" column="1" lean-forward="true" selection-start-line="151" selection-start-column="1" selection-end-line="151" selection-end-column="1" /> <folding> - <element signature="e#0#20#0" expanded="true" /> - <element signature="e#55#214#0" /> - <element signature="e#282#507#0" /> - <element signature="e#510#1846#0" /> - <element signature="e#1848#2377#0" /> - <element signature="e#2379#2558#0" /> + <element signature="e#0#24#0" expanded="true" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="263"> - <caret line="484" lean-forward="true" selection-start-line="484" selection-end-line="484" /> + <state relative-caret-position="272"> + <caret line="519" column="10" selection-start-line="519" selection-start-column="8" selection-end-line="519" selection-end-column="10" /> <folding> <element signature="e#0#31#0" expanded="true" /> - <element signature="e#199#7476#0" /> + <element signature="e#264#7839#0" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="306"> + <caret line="112" lean-forward="true" selection-start-line="112" selection-end-line="112" /> + <folding> + <element signature="e#0#21#0" expanded="true" /> </folding> </state> </provider> diff --git a/CRYPTO/DTPKC.cpp b/CRYPTO/DTPKC.cpp index 6dbf5c6fca04241720bd96c6a7c4b9c79560a438..bcd8fd4b843781bedeb8b64ded438d61a66dedc1 100755 --- a/CRYPTO/DTPKC.cpp +++ b/CRYPTO/DTPKC.cpp @@ -10,6 +10,7 @@ * **/ +#include <thread> #include "DTPKC.h" @@ -18,6 +19,12 @@ int DTPKC :: size; mpz_class DTPKC :: p, DTPKC :: q, DTPKC :: a, DTPKC :: SK, DTPKC :: SK0, DTPKC :: SK1; int DTPKC :: blindVal; int DTPKC :: precision; +double DTPKC:: timeMU; +double DTPKC:: timeSU; +double DTPKC:: bdwMU; +double DTPKC:: bdwSU; + + std::chrono::milliseconds DTPKC :: delay; @@ -46,6 +53,10 @@ void DTPKC::keygen(int pr, gmp_randstate_t state, std::chrono::milliseconds delay, uint nbits, int error, bool useORE, int bl) { precision=pr; + DTPKC::timeMU = 0.0; + DTPKC::timeSU = 0.0; + DTPKC::bdwMU = 0.0; + DTPKC::bdwMU = 0.0; // // a : Exponent used to find a generator g with a high probability // s : SK1+ SK2, (SK*invlambda)%(SK*n2). @@ -596,6 +607,7 @@ DTPKC::EvalCmp_U1_step1(Cipher A, Cipher B) * S3 partially decrypted value of S1 * S4 partially decrypted value of S2 */ + auto begin = chrono::high_resolution_clock::now(); gmp_randstate_t state; Cipher S1, S2, S3, S4; @@ -638,7 +650,10 @@ DTPKC::EvalCmp_U1_step1(Cipher A, Cipher B) res[2]=S2; res[3]=S4; - + auto en = chrono::high_resolution_clock::now(); + std::chrono::duration<double, std::milli> duration = en - begin ; + timeMU += duration.count(); + bdwMU += res.size() * mpz_size(res[0].T1.get_mpz_t())+ mpz_size(res[0].T2.get_mpz_t())* sizeof(mp_limb_t); return res; @@ -671,7 +686,7 @@ DTPKC::EvalCmp_U2_step2(std::vector<Cipher> res1) * x : r*A * y : r*B */ - + auto begin = chrono::high_resolution_clock::now(); mpz_class x, y, out; // Decrypt the blinded values sent by U1 @@ -679,7 +694,14 @@ DTPKC::EvalCmp_U2_step2(std::vector<Cipher> res1) y=PSdec1(res1[2],res1[3]); - // return the comparison result + auto en = chrono::high_resolution_clock::now(); + std::chrono::duration<double, std::milli> duration = en - begin ; + timeSU += duration.count(); + bdwSU += 1; + + std::this_thread::sleep_for(delay); + + return x < y ; } diff --git a/CRYPTO/DTPKC.h b/CRYPTO/DTPKC.h index 3275301ec44b2dd6f422eafa6f613080b76c17f8..3942f5bf3c8dc1e0381fc62b9bd5df9697c044ab 100755 --- a/CRYPTO/DTPKC.h +++ b/CRYPTO/DTPKC.h @@ -55,6 +55,7 @@ public : bool operator<(const DTPKC::Cipher val ) const { + return DTPKC::EvalCmp_U2_step2(DTPKC::EvalCmp_U1_step1(*this,val)); } @@ -112,6 +113,10 @@ public : static int precision; static std::chrono::milliseconds delay; + static double timeSU; + static double timeMU; + static double bdwSU; + static double bdwMU; private : diff --git a/CRYPTO/EvalExpo.cpp b/CRYPTO/EvalExpo.cpp index d068d12aa9c4ab94838bfc2032fef1d03ec80186..3222a16de687a01e4d54f36406bddb7b470c499d 100755 --- a/CRYPTO/EvalExpo.cpp +++ b/CRYPTO/EvalExpo.cpp @@ -78,6 +78,7 @@ EvalExpo::EvalSig_U2_step2(Cipher S1, Cipher S2) auto en = chrono::high_resolution_clock::now(); + std::chrono::duration<double, std::milli> duration = en - begin ; timeSU = duration.count(); bdwSU = mpz_size(S4.T1.get_mpz_t())+ mpz_size(S4.T2.get_mpz_t())* sizeof(mp_limb_t); @@ -108,6 +109,13 @@ EvalExpo::EvalSig_U1_step3(Cipher S4) S6.sign = 1; + auto en = chrono::high_resolution_clock::now(); + + std::chrono::duration<double, std::milli> duration = en - begin ; + timeMU += duration.count(); + bdwMU += mpz_size(S4.T1.get_mpz_t())+ mpz_size(S4.T2.get_mpz_t())* sizeof(mp_limb_t); + + return S6; } diff --git a/CRYPTO/EvalSigmoid.cpp b/CRYPTO/EvalSigmoid.cpp index 34a52909dca606b885392704b711787ccca2ea58..1f9ae6b84763f86a25eed68c6c4d6735535c2937 100755 --- a/CRYPTO/EvalSigmoid.cpp +++ b/CRYPTO/EvalSigmoid.cpp @@ -139,13 +139,14 @@ EvalSigmoid::EvalSig_U1_step3(Cipher S4) //cout << " S9 " << S9 << endl; - std::this_thread::sleep_for(dtpkc.delay); + auto en = chrono::high_resolution_clock::now(); std::chrono::duration<double, std::milli> duration = en - begin ; timeMU += duration.count(); bdwMU += mpz_size(S9.T1.get_mpz_t())+ mpz_size(S9.T2.get_mpz_t())* sizeof(mp_limb_t); + std::this_thread::sleep_for(dtpkc.delay); return S9; } diff --git a/PPML/PPVFDT/PPVFDT_Classifier.h b/PPML/PPVFDT/PPVFDT_Classifier.h index 7455e2d052756e53c3a61a778cac96af5e6f71c4..82eba9b4cf02ca8e9fe5ef0a357a9ccd64a5aa98 100755 --- a/PPML/PPVFDT/PPVFDT_Classifier.h +++ b/PPML/PPVFDT/PPVFDT_Classifier.h @@ -42,6 +42,10 @@ public : static double trainErr; static double clientTestTime; static int treeDepth; + static double timeSU; + static double timeMU; + static double bdwSU; + static double bdwMU; int numberSplits; int numberCriticalZone; int sockfd; diff --git a/TEST/TESTBuildingBlocks.cpp b/TEST/TESTBuildingBlocks.cpp index 27f064ff30ed71df5885fff21ad60b4dd4126a58..a5093bf5e4dbbac063f128637550487254660340 100755 --- a/TEST/TESTBuildingBlocks.cpp +++ b/TEST/TESTBuildingBlocks.cpp @@ -299,6 +299,12 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error double timeMU_SExpo, timeSU_SExpo, bdwMU_SExpo, bdwSU_SExpo; double timeMU_SPU, timeSU_SPU, bdwMU_SPU, bdwSU_SPU; + double totalRuntiume [13]; + + for (int k=0; k <13 ; k++ ) + totalRuntiume[k] = 0.0; + + int N=1; @@ -356,76 +362,113 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error /** * Test Comparion */ + 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 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())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[11] += duration.count(); + /** * 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])); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[6] += duration.count(); + /** * Test Secure entropy */ - + begin = chrono::high_resolution_clock::now(); EvalEntropy evalEntropy(C_T, classses, dtpkc); C_C = evalEntropy.EvalEntropy_U1_step3(evalEntropy.EvalEntropy_U2_step2(evalEntropy.EvalEntropy_U1_step1())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[1] += 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())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[12] += duration.count(); + /** * 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())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[0] += duration.count(); + /** * 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())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[7] += duration.count(); + /** * Test EvalThreashold @@ -436,9 +479,14 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error i1.set_str("1000", 10); i2.set_str("280", 10); double x = 0.7; + begin = chrono::high_resolution_clock::now(); EvalThreashold evalThreashold(dtpkc.enc(i1, pkey), dtpkc.enc(i2, pkey), x, dtpkc); C_C = evalThreashold.eval(); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[2] += duration.count(); + /** @@ -448,23 +496,30 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error x = 2; Cipher C_x = dtpkc.enc(x, dtpkc.pkw); C_x.sign = 0; - cpt++; + 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])); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[4] += duration.count(); + /** * Test Expo */ - cpt++; + + 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])); - C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[10] += duration.count(); /** * Test Log @@ -474,11 +529,16 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error 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])); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[9] += duration.count(); + /** * Testing the dot product protocol */ @@ -527,11 +587,15 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error output2 = output2 + cv[i] * bv[i]; } - + begin = chrono::high_resolution_clock::now(); EvalDotProd evalDotProd(C_cv, C_bv, C_bv.size(), dtpkc); C_C = evalDotProd.EvalDotProd_U1_step3(evalDotProd.EvalDotProd_U2_step2(evalDotProd.EvalDotProd_U1_step1())); C = dtpkc.Sdec(C_C); + en = chrono::high_resolution_clock::now(); + duration = en - begin ; + totalRuntiume[5] += duration.count(); + /** * Summary @@ -571,19 +635,23 @@ void TESTBuildingBlocks::run (bool deserialize, int keysize, int prec, int error timeMU_SExpo /=N; timeSU_SExpo /=N; bdwMU_SExpo /=N; bdwSU_SExpo /=N; timeMU_SPU /=N; timeSU_SPU/=N; bdwMU_SPU /=N; bdwSU_SPU /=N; - cout << " timeMU_SKS= " << timeMU_SKS << " timeSU_SKS= " << timeSU_SKS << " bdwMU_SKS= " << bdwMU_SKS << " bdwSU_SKS= "<< bdwSU_SKS<< endl; - cout << " timeMU_SE= " << timeMU_SE << " timeSU_SE= " << timeSU_SE << " bdwMU_SE= " << bdwMU_SE << " bdwSU_SE= "<< bdwSU_SE << endl; - cout << " timeMU_STS= " << timeMU_STS << " timeSU_STS= " << timeSU_STS << " bdwMU_STS= " << bdwMU_STS << " bdwSU_STS= "<< bdwSU_STS << endl; - cout << " timeMU_SHBC= " << timeMU_SHBC << " timeSU_SHBC= " << timeSU_SHBC << " bdwMU_SHBC= " << bdwMU_SHBC << " bdwSU_SHBC= "<< bdwSU_SHBC << endl; - cout << " timeMU_SSig= " << timeMU_SSig << " timeSU_SSig= " << timeSU_SSig << " bdwMU_SSig= " << bdwMU_SSig << " bdwSU_SSig= "<< bdwSU_SSig << endl; - cout << " timeMU_SDP= " << timeMU_SDP << " timeSU_SDP= " << timeSU_SDP << " bdwMU_SDP= " << bdwMU_SDP << " bdwSU_SDP= "<< bdwSU_SDP << endl; - cout << " timeMU_SD= " << timeMU_SD << " timeSU_SD= " << timeSU_SD << " bdwMU_SD= " << bdwMU_SD << " bdwSU_SD= "<< bdwSU_SD << endl; - cout << " timeMU_SM= " << timeMU_SM << " timeSU_SM= " << timeSU_SM << " bdwMU_SM= " << bdwMU_SM << " bdwSU_SM= "<< bdwSU_SM << endl; - cout << " timeMU_SC= " << timeMU_SC << " timeSU_SC= " << timeSU_SC << " bdwMU_SC= " << bdwMU_SC << " bdwSU_SC= "<< bdwSU_SC << endl; - cout << " timeMU_SLog= " << timeMU_SLog << " timeSU_SLog= " << timeSU_SLog << " bdwMU_SLog= " << bdwMU_SC << " bdwSU_SLog= "<< bdwSU_SLog << endl; - cout << " timeMU_SExpo= " << timeMU_SExpo << " timeSU_SExpo= " << timeSU_SExpo << " bdwMU_SExpo= " << bdwMU_SExpo << " bdwSU_SExpo= "<< bdwSU_SExpo<< endl; - cout << " timeMU_SSqrt= " << timeMU_SSqrt << " timeSU_SSqrt= " << timeSU_SSqrt << " bdwMU_SSqrt= " << bdwMU_SSqrt << " bdwSU_SExpo= "<< bdwSU_SSqrt<< endl; - cout << " timeMU_SPU= " << timeMU_SPU << " timeSU_SPU= " << timeSU_SPU << " bdwMU_SPU= " << bdwMU_SPU << " bdwSU_SPU= "<< bdwSU_SPU<< endl; + for (int k=0; k <13 ; k++ ) + totalRuntiume[k] /=N; + + + 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; if(!deserialize) gmp_randclear(randstate); } diff --git a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache index f75641bc887bdb64e332a41744709a2c1fe30fa4..8dae0734c37c6d31108168be68e23932d99d1f8b 100644 --- a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache +++ b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache @@ -34,26 +34,6 @@ netinet/in.h chrono - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAdd.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAddPow2.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -vector -- - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalCmp.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -vector -- - /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h @@ -62,223 +42,21 @@ DTPKC.h DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDotProd.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalEntropy.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh - +/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalExpo.cpp +EvalExpo.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalExpo.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalHBound.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h EvalDiv.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLrUpdate.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -vector -- - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h EvalDiv100.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSigmoid.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSqrt.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -EvalDiv.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalStandardDiv.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -EvalDiv.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h -EvalMult.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h -EvalSub.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSub.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSub.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalThreashold.h -DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -vector +thread - -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/SkeySwitch.h +/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalExpo.h DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h ../UTIL/math_util.hh /home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -vector -- - -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/DatasetReader.h -fstream -- -stdio.h -- -string.h -- -vector -- -cstring -- -Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h -../../UTIL/mpz_class.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/mpz_class.hh -time.h -- -string -- -omp.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/omp.h - -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h -vector -- -iostream -- - -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/Node.h -../IO/Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h -NodeStats.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/NodeStats.h -NodeTest.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/NodeTest.h - -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/NodeStats.h -iostream -- -map -- -iterator -- -../IO/Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h -gmpxx.h -- -gmp.h -- -../../UTIL/util_gmp_rand.h -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/util_gmp_rand.h -../../UTIL/num_th_alg.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/num_th_alg.hh -../../UTIL/mpz_class.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/mpz_class.hh - -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/NodeTest.h -map -- -../IO/Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h - -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/VFDT_Classifier.h -netinet/in.h -- -../IO/DatasetReader.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/DatasetReader.h -Node.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/Node.h -../../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -math.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/math.h - -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTBuildingBlocks.cpp -TESTBuildingBlocks.h -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTBuildingBlocks.h -../ML/VFDT/VFDT_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/VFDT_Classifier.h -../CRYPTO/EvalThreashold.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalThreashold.h -../CRYPTO/EvalLrUpdate.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLrUpdate.h -../CRYPTO/EvalLog.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h -../CRYPTO/EvalSqrt.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSqrt.h -../CRYPTO/EvalExpo.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalExpo.h - -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTBuildingBlocks.h -iostream -- -../CRYPTO/DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../CRYPTO/EvalAdd.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAdd.h -../CRYPTO/EvalSub.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSub.h -../CRYPTO/EvalDiv.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h -../CRYPTO/EvalDiv100.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.h -../CRYPTO/EvalEntropy.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalEntropy.h -../CRYPTO/EvalProba.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h -../CRYPTO/EvalHBound.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalHBound.h -../CRYPTO/SkeySwitch.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/SkeySwitch.h -../CRYPTO/EvalCmp.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalCmp.h -../CRYPTO/EvalMult.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h -../CRYPTO/EvalAddPow2.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAddPow2.h -../CRYPTO/EvalStandardDiv.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalStandardDiv.h -../CRYPTO/EvalSigmoid.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSigmoid.h -../CRYPTO/EvalDotProd.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDotProd.h -../UTIL/mpz_class.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/mpz_class.hh -../UTIL/num_th_alg.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/num_th_alg.hh /home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh vector