From bd442266115c015ddc8f698cc26842d9489da0c6 Mon Sep 17 00:00:00 2001 From: rtalbi <dr_talbi@esi.dz> Date: Wed, 22 Jan 2020 14:55:49 +0100 Subject: [PATCH] New tests for the S&P paper --- .idea/workspace.xml | 297 ++++++----- CONFIG/DAPPLE.config | 2 +- CRYPTO/DTPKC.cpp | 5 + CRYPTO/DTPKC.h | 3 +- PPML/PPNB/PPNB_Classifier.cpp | 22 +- PPML/PPNB/PPNB_Classifier.h | 4 + PPML/PPNB/PPStats.cpp | 31 +- SER/dtpkc.ser | 20 +- TEST/main.cpp | 26 + .../CMakeFiles/DAPPLE.dir/CXX.includecache | 484 +----------------- 10 files changed, 231 insertions(+), 663 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 325f0d05..c4468761 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -14,9 +14,14 @@ <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="New tests for the S&P paper"> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CONFIG/DAPPLE.config" beforeDir="false" afterPath="$PROJECT_DIR$/CONFIG/DAPPLE.config" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/SER/dtpkc.ser" beforeDir="false" afterPath="$PROJECT_DIR$/SER/dtpkc.ser" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/TEST/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/main.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" /> </list> <ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -45,68 +50,71 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="450"> - <caret line="328" selection-start-line="328" selection-end-line="328" /> + <state relative-caret-position="297"> + <caret line="216" column="22" lean-forward="true" selection-start-line="216" selection-start-column="22" selection-end-line="217" selection-end-column="22" /> <folding> <element signature="e#0#17#0" expanded="true" /> <element signature="e#373#2168#0" /> <element signature="e#2170#2586#0" /> <element signature="e#2624#2889#0" /> <element signature="e#2891#3263#0" /> - <element signature="e#3299#4012#0" /> - <element signature="e#4015#6477#0" /> + <element signature="e#6456#7877#0" /> + <element signature="e#7880#10803#0" /> </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-09:36:30-Stats.csv"> + <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="86" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="86" /> + <state relative-caret-position="75"> + <caret line="32" column="20" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="20" /> </state> </provider> </entry> </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:28:45-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" /> + <state relative-caret-position="30"> + <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="74" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-09:22:39-Stats.csv"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="87" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="87" /> + <state relative-caret-position="144"> + <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" /> + <folding> + <element signature="e#0#20#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> + <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="417"> - <caret line="192" column="63" lean-forward="true" selection-start-line="192" selection-start-column="63" selection-end-line="192" selection-end-column="63" /> + <state relative-caret-position="177"> + <caret line="525" column="116" selection-start-line="525" selection-start-column="116" selection-end-line="525" selection-end-column="116" /> <folding> - <element signature="e#0#20#0" expanded="true" /> + <element signature="e#52#93#0" expanded="true" /> </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-13:54:38-Stats.csv"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" /> + <state relative-caret-position="30"> + <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" /> </state> </provider> </entry> @@ -114,7 +122,7 @@ <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="870"> + <state relative-caret-position="7080"> <caret line="472" selection-start-line="472" selection-end-line="472" /> <folding> <element signature="e#0#17#0" expanded="true" /> @@ -138,8 +146,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="129"> - <caret line="612" column="41" selection-start-line="612" selection-start-column="41" selection-end-line="612" selection-end-column="41" /> + <state relative-caret-position="5265"> + <caret line="516" selection-start-line="516" selection-end-line="516" /> <folding> <element signature="e#227#244#0" expanded="true" /> </folding> @@ -150,8 +158,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-600"> - <caret line="125" selection-start-line="125" selection-end-line="125" /> + <state relative-caret-position="373"> + <caret line="60" selection-start-line="60" selection-end-line="60" /> </state> </provider> </entry> @@ -159,8 +167,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> + <state relative-caret-position="360"> + <caret line="36" selection-start-line="36" selection-end-line="36" /> </state> </provider> </entry> @@ -169,7 +177,6 @@ </component> <component name="FindInProjectRecents"> <findStrings> - <find>one=</find> <find>one =</find> <find>if</find> <find>train</find> @@ -199,6 +206,7 @@ <find>SU</find> <find>trainTimeMU</find> <find>MU</find> + <find>bdw</find> </findStrings> <replaceStrings> <replace>EvalCmp100</replace> @@ -261,19 +269,19 @@ <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$/TEST/TESTBuildingBlocks.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" /> - <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" /> <option value="$PROJECT_DIR$/Scripts/TestPPLR1.sh" /> <option value="$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py" /> + <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" /> + <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" /> + <option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" /> + <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> <option value="$PROJECT_DIR$/TEST/main.cpp" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" /> - <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" /> - <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> </list> </option> </component> @@ -305,42 +313,40 @@ <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="EXP" type="462c0819:PsiDirectoryNode" /> + <item name="DATA" type="462c0819:PsiDirectoryNode" /> </path> <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> <item name="EXP" type="462c0819:PsiDirectoryNode" /> - <item name="DebugNb" type="462c0819:PsiDirectoryNode" /> </path> <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> <item name="EXP" type="462c0819:PsiDirectoryNode" /> - <item name="DebugPPNB" type="462c0819:PsiDirectoryNode" /> + <item name="DebugNb" 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="EXP" type="462c0819:PsiDirectoryNode" /> + <item name="DebugPPNB" 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="EVAL" 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="PPNB" 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="TEST" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> @@ -479,14 +485,8 @@ <workItem from="1578409400958" duration="17369000" /> <workItem from="1578490199097" duration="52805000" /> <workItem from="1579510466382" duration="15110000" /> - <workItem from="1579596546931" duration="8852000" /> - </task> - <task id="LOCAL-00038" summary="10/01/2019 : Preparing tests for Nassim"> - <created>1547198786428</created> - <option name="number" value="00038" /> - <option name="presentableId" value="LOCAL-00038" /> - <option name="project" value="LOCAL" /> - <updated>1547198786428</updated> + <workItem from="1579596546931" duration="12503000" /> + <workItem from="1579687298370" duration="8960000" /> </task> <task id="LOCAL-00039" summary="10/01/2019 : Preparing tests for Nassim"> <created>1547323783222</created> @@ -824,11 +824,18 @@ <option name="project" value="LOCAL" /> <updated>1579538329823</updated> </task> - <option name="localTasksCounter" value="87" /> + <task id="LOCAL-00087" summary="New tests for the S&P paper"> + <created>1579617836597</created> + <option name="number" value="00087" /> + <option name="presentableId" value="LOCAL-00087" /> + <option name="project" value="LOCAL" /> + <updated>1579617836597</updated> + </task> + <option name="localTasksCounter" value="88" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="1186722000" /> + <option name="totallyTimeSpent" value="1199333000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -841,22 +848,21 @@ </component> <component name="ToolWindowManager"> <frame x="67" y="25" width="1853" height="1175" extended-state="6" /> - <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.23630327" /> + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.32761484" /> <window_info id="Structure" order="1" sideWeight="0.2735043" side_tool="true" weight="0.3390558" /> <window_info id="Favorites" order="2" sideWeight="0.19466667" side_tool="true" weight="0.28113064" /> <window_info anchor="bottom" id="Database Changes" order="0" /> <window_info anchor="bottom" id="Message" order="1" /> <window_info anchor="bottom" id="Find" order="2" sideWeight="0.49363586" weight="0.32600382" /> - <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.61981183" visible="true" weight="0.458891" /> + <window_info anchor="bottom" id="Run" order="3" sideWeight="0.66795796" visible="true" weight="0.5086042" /> <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.47703376" weight="0.41300192" /> - <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.38018817" side_tool="true" visible="true" weight="0.458891" /> - <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.46098506" weight="0.31548756" /> + <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.47426674" weight="0.41300192" /> + <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.33204207" side_tool="true" visible="true" weight="0.5086042" /> + <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" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> @@ -1101,12 +1107,12 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>116</line> + <line>119</line> <option name="timeStamp" value="611" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>159</line> + <line>164</line> <option name="timeStamp" value="612" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1125,7 +1131,7 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/TEST/main.cpp</url> - <line>981</line> + <line>1007</line> <option name="timeStamp" value="699" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1345,12 +1351,12 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>111</line> + <line>114</line> <option name="timeStamp" value="868" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>145</line> + <line>150</line> <option name="timeStamp" value="870" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1420,7 +1426,7 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/TEST/main.cpp</url> - <line>866</line> + <line>892</line> <option name="timeStamp" value="942" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1430,12 +1436,12 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/TEST/main.cpp</url> - <line>894</line> + <line>920</line> <option name="timeStamp" value="945" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/TEST/main.cpp</url> - <line>896</line> + <line>922</line> <option name="timeStamp" value="946" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1445,17 +1451,17 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp</url> - <line>175</line> + <line>177</line> <option name="timeStamp" value="977" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp</url> - <line>183</line> + <line>185</line> <option name="timeStamp" value="978" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp</url> - <line>176</line> + <line>178</line> <option name="timeStamp" value="979" /> </line-breakpoint> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1480,7 +1486,7 @@ </line-breakpoint> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>59</line> + <line>60</line> <option name="timeStamp" value="1013" /> </line-breakpoint> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1549,43 +1555,6 @@ </watches-manager> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <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/EvalSqrt.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <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/EvalStandardDiv.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="376"> - <caret line="101" selection-start-line="101" selection-end-line="101" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <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#0#20#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub2.cpp"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="446"> @@ -1842,16 +1811,6 @@ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h"> <provider selected="true" editor-type-id="text-editor" /> </entry> - <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="414"> - <caret line="531" column="186" selection-start-line="531" selection-start-column="175" selection-end-line="531" selection-end-column="186" /> - <folding> - <element signature="e#52#93#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-09:22:39-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="30"> @@ -1859,33 +1818,30 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-09:36:30-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-600"> - <caret line="125" selection-start-line="125" selection-end-line="125" /> + <state relative-caret-position="30"> + <caret line="2" column="86" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="86" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-14:11:28-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="129"> - <caret line="612" column="41" selection-start-line="612" selection-start-column="41" selection-end-line="612" selection-end-column="41" /> - <folding> - <element signature="e#227#244#0" expanded="true" /> - </folding> + <state> + <caret column="6" selection-end-line="3" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-09:36:30-Stats.csv"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-13:54:38-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="86" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="86" /> + <state relative-caret-position="45"> + <caret line="3" selection-start-line="3" selection-end-line="3" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="870"> + <state relative-caret-position="7080"> <caret line="472" selection-start-line="472" selection-end-line="472" /> <folding> <element signature="e#0#17#0" expanded="true" /> @@ -1907,48 +1863,85 @@ </entry> <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> + <state relative-caret-position="360"> + <caret line="36" selection-start-line="36" selection-end-line="36" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> + <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="450"> - <caret line="328" selection-start-line="328" selection-end-line="328" /> + <state relative-caret-position="5265"> + <caret line="516" selection-start-line="516" selection-end-line="516" /> <folding> - <element signature="e#0#17#0" expanded="true" /> - <element signature="e#373#2168#0" /> - <element signature="e#2170#2586#0" /> - <element signature="e#2624#2889#0" /> - <element signature="e#2891#3263#0" /> - <element signature="e#3299#4012#0" /> - <element signature="e#4015#6477#0" /> + <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/DTPKC.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="373"> + <caret line="60" selection-start-line="60" selection-end-line="60" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:26:54-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:28:45-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="417"> - <caret line="192" column="63" lean-forward="true" selection-start-line="192" selection-start-column="63" selection-end-line="192" selection-end-column="63" /> + <state relative-caret-position="30"> + <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="74" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="75"> + <caret line="32" column="20" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="20" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="177"> + <caret line="525" column="116" selection-start-line="525" selection-start-column="116" selection-end-line="525" selection-end-column="116" /> <folding> - <element signature="e#0#20#0" expanded="true" /> + <element signature="e#52#93#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-21-13:54:38-Stats.csv"> + <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" /> + <state relative-caret-position="30"> + <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" /> + <state relative-caret-position="144"> + <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" /> + <folding> + <element signature="e#0#20#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="297"> + <caret line="216" column="22" lean-forward="true" selection-start-line="216" selection-start-column="22" selection-end-line="217" selection-end-column="22" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + <element signature="e#373#2168#0" /> + <element signature="e#2170#2586#0" /> + <element signature="e#2624#2889#0" /> + <element signature="e#2891#3263#0" /> + <element signature="e#6456#7877#0" /> + <element signature="e#7880#10803#0" /> + </folding> </state> </provider> </entry> diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config index c8acb59d..a9c2db37 100755 --- a/CONFIG/DAPPLE.config +++ b/CONFIG/DAPPLE.config @@ -9,7 +9,7 @@ Incremental="false"; OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/DebugNb/"; scenarioName="bla"; - debug="false"; + debug="true"; maxTrainSize="20"; maxTestSize="20"; } diff --git a/CRYPTO/DTPKC.cpp b/CRYPTO/DTPKC.cpp index 9ee4f0ad..a9c54961 100755 --- a/CRYPTO/DTPKC.cpp +++ b/CRYPTO/DTPKC.cpp @@ -23,6 +23,7 @@ double DTPKC:: timeMU; double DTPKC:: timeSU; double DTPKC:: bdwMU; double DTPKC:: bdwSU; +int DTPKC::cmpCtr; std::chrono::milliseconds DTPKC :: delay; @@ -57,6 +58,7 @@ DTPKC::keygen(int pr, gmp_randstate_t state, std::chrono::milliseconds delay, u DTPKC::timeSU = 0.0; DTPKC::bdwMU = 0.0; DTPKC::bdwMU = 0.0; + DTPKC::cmpCtr = 0; // // a : Exponent used to find a generator g with a high probability // s : SK1+ SK2, (SK*invlambda)%(SK*n2). @@ -126,6 +128,8 @@ DTPKC::keygen(int pr, gmp_randstate_t state, std::chrono::milliseconds delay, u }while(!valid); + + } /** @@ -506,6 +510,7 @@ DTPKC ::deserializeDtpkc(string path) { DTPKC::timeSU = 0.0; DTPKC::bdwMU = 0.0; DTPKC::bdwMU = 0.0; + DTPKC::cmpCtr = 0; delete In; return 1; diff --git a/CRYPTO/DTPKC.h b/CRYPTO/DTPKC.h index 3942f5bf..9bfdb51d 100755 --- a/CRYPTO/DTPKC.h +++ b/CRYPTO/DTPKC.h @@ -55,7 +55,7 @@ public : bool operator<(const DTPKC::Cipher val ) const { - + DTPKC::cmpCtr++; return DTPKC::EvalCmp_U2_step2(DTPKC::EvalCmp_U1_step1(*this,val)); } @@ -117,6 +117,7 @@ public : static double timeMU; static double bdwSU; static double bdwMU; + static int cmpCtr; private : diff --git a/PPML/PPNB/PPNB_Classifier.cpp b/PPML/PPNB/PPNB_Classifier.cpp index 47ef5b5a..0ba58ea5 100755 --- a/PPML/PPNB/PPNB_Classifier.cpp +++ b/PPML/PPNB/PPNB_Classifier.cpp @@ -15,7 +15,7 @@ double PPNB_Classifier:: testTimeMU; double PPNB_Classifier:: testTimeSU; double PPNB_Classifier:: trainBdw; double PPNB_Classifier:: testBdw; - +int PPNB_Classifier::addCtr, PPNB_Classifier::cmpCtr, PPNB_Classifier::divCtr, PPNB_Classifier::logCtr; PPRecord * PPNB_Classifier::recvPPRecord(int sockfd, sockaddr_in cliaddr, int dim, DTPKC dtpkc, int id) @@ -153,6 +153,8 @@ PPNB_Classifier::PPNB_Classifier(PPDatasetReader *datasetReader, PPStats *stats, this->testTimeSU=0.0; this->trainBdw=0.0; this->testBdw=0.0; + + this->addCtr = 0, this->cmpCtr =0 , this->divCtr = 0 , this->logCtr = 0; } @@ -167,7 +169,7 @@ void PPNB_Classifier::Test() { std::ofstream inter; inter.open(logfile+".enc"); classOutput.open (logfile); - + this->addCtr = 0, this->cmpCtr =0 , this->divCtr = 0 , this->logCtr = 0; extTestBd = 0; auto begin = chrono::high_resolution_clock::now(); while (counter < size) { @@ -205,8 +207,8 @@ void PPNB_Classifier::Test() { std::chrono::duration<double, std::milli> duration = end - begin ; this->testTime = duration.count(); - this->testTimeSU = dtpkc.timeSU; - this->testTimeMU = dtpkc.timeMU; + /*this->testTimeSU = dtpkc.timeSU; + this->testTimeMU = dtpkc.timeMU;*/ this->testBdw = dtpkc.bdwSU + dtpkc.bdwMU; @@ -214,7 +216,7 @@ void PPNB_Classifier::Test() { dtpkc.timeMU = 0.0; dtpkc.bdwMU = 0.0; dtpkc.bdwSU = 0.0; - + dtpkc.cmpCtr = 0; inter.close(); //currentModel->print(); @@ -276,6 +278,7 @@ void PPNB_Classifier::train() { dtpkc.timeMU = 0.0; dtpkc.bdwMU = 0.0; dtpkc.bdwSU = 0.0; + dtpkc.cmpCtr = 0; extTrainBd = 0; @@ -313,8 +316,8 @@ void PPNB_Classifier::train() { this->trainTime = duration.count(); //cout << "dtpkc.timeSU " << dtpkc.timeSU << " this->trainTimeSU " << this->trainTimeSU << " this->trainTime " << this->trainTime << endl; - this->trainTimeMU += dtpkc.timeMU; - this->trainTimeSU += dtpkc.timeSU; + //this->trainTimeMU += dtpkc.timeMU; + // //this->trainTimeSU += dtpkc.timeSU; this->trainBdw += dtpkc.bdwSU + dtpkc.bdwMU; @@ -322,6 +325,7 @@ void PPNB_Classifier::train() { dtpkc.timeMU = 0.0; dtpkc.bdwMU = 0.0; dtpkc.bdwSU = 0.0; + dtpkc.cmpCtr = 0; } @@ -385,10 +389,10 @@ void PPNB_Classifier::RemoteTest(){ std::chrono::duration<double, std::milli> duration = en - begin ; this->testTime = duration.count(); - this->testTimeMU = dtpkc.timeMU; + // this->testTimeMU = dtpkc.timeMU; this->testBdw = dtpkc.bdwSU + dtpkc.bdwMU; - this->testTimeSU = this->testTime - this->testTimeMU; + //this->testTimeSU = this->testTime - this->testTimeMU; dtpkc.timeSU = 0.0; dtpkc.timeMU = 0.0; diff --git a/PPML/PPNB/PPNB_Classifier.h b/PPML/PPNB/PPNB_Classifier.h index 7f56b3e2..ada610a2 100755 --- a/PPML/PPNB/PPNB_Classifier.h +++ b/PPML/PPNB/PPNB_Classifier.h @@ -35,6 +35,10 @@ public : static double testBdw; + static int addCtr, cmpCtr, divCtr, logCtr; + + + public: diff --git a/PPML/PPNB/PPStats.cpp b/PPML/PPNB/PPStats.cpp index fea7a164..593904bb 100755 --- a/PPML/PPNB/PPStats.cpp +++ b/PPML/PPNB/PPStats.cpp @@ -46,6 +46,7 @@ PPStats::updateDataAVC(PPRecord *r, int i) { { EvalAdd evalAdd (classOcc->second,one); classOcc->second=evalAdd.EvalAdd_U1(); + PPNB_Classifier::addCtr++; }else{ @@ -81,6 +82,7 @@ PPStats::incrementClassOccurence(PPRecord *r) { { EvalAdd evalAdd (iter->second ,one); iter->second =evalAdd.EvalAdd_U1(); + PPNB_Classifier::addCtr++; } else { @@ -99,6 +101,7 @@ void PPStats::UpdateStatistics(PPRecord *r) { EvalAdd evalAdd (this->totSampleNum ,one); + PPNB_Classifier::addCtr++; this->totSampleNum =evalAdd.EvalAdd_U1(); this->incrementClassOccurence(r); } @@ -128,10 +131,12 @@ PPStats::InitStats() { Cipher C_C=evalLog.EvalLog_U1_step3(evalLog.EvalLog_U2_step2(in[0],in[1])); //COUT << "prior proba " << C_C << " res " << mpz_class_log (dtpkc.Sdec(proba) + 1 , 100)<< " " <<proba << endl; LogproProba.insert(std::make_pair(i->first, C_C)); - PPNB_Classifier::trainTimeMU += evalDiv100.timeMU; + /*PPNB_Classifier::trainTimeMU += evalDiv100.timeMU; PPNB_Classifier::trainTimeMU += evalLog.timeMU; PPNB_Classifier::trainTimeSU += evalDiv100.timeSU; - PPNB_Classifier::trainTimeSU += evalLog.timeSU; + PPNB_Classifier::trainTimeSU += evalLog.timeSU;*/ + PPNB_Classifier::divCtr++; + PPNB_Classifier::logCtr++; PPNB_Classifier::trainBdw += evalDiv100.bdwMU + evalDiv100.bdwSU + evalLog.bdwMU + evalLog.bdwSU; }; @@ -176,8 +181,8 @@ PPStats::InitStats() { vector<Cipher> res1 = evalDiv100.EvalDiv_U1_step1(); probaxjkl = evalDiv100.EvalDiv_U1_step3( evalDiv100.EvalDiv_U2_step2(res1[0], res1[1], res1[2], res1[3])); - costTimeDiv = evalDiv100.timeMU; - costTimeDivSU = evalDiv100.timeSU; + //costTimeDiv = evalDiv100.timeMU; + //costTimeDivSU = evalDiv100.timeSU; costBdwDiv = evalDiv100.bdwMU + evalDiv100.bdwSU; } @@ -187,10 +192,9 @@ PPStats::InitStats() { Cipher C_C=evalLog.EvalLog_U1_step3(evalLog.EvalLog_U2_step2(in[0],in[1])); LogcdProbaClasses.insert(std::make_pair(l.first, C_C)); //COUT << "cond proba " << C_C << " res " <<mpz_class_log (dtpkc.Sdec(probaxjkl) + 1 , 100) << endl; - - costTimeLog = evalLog.timeMU; - costTimeLogSU = evalLog.timeSU; - costBdwLog = evalLog.bdwMU + evalLog.bdwSU; + //costTimeLog = evalLog.timeMU; + //costTimeLogSU = evalLog.timeSU; + //costBdwLog = evalLog.bdwMU + evalLog.bdwSU; } //cdProbaValues.insert(std::make_pair(k.first, cdProbaClasses)); LogcdProbaValues.insert(std::make_pair(k.first, LogcdProbaClasses)); @@ -206,8 +210,10 @@ PPStats::InitStats() { } //condProba.insert(std::make_pair(j->first, cdProbaValues)); LogcondProba.insert(std::make_pair(j->first, LogcdProbaValues)); - PPNB_Classifier::trainTimeMU += size*(costTimeLog + costTimeDiv); - PPNB_Classifier::trainTimeSU += size*(costTimeLogSU + costTimeDivSU); + //PPNB_Classifier::trainTimeMU += size*(costTimeLog + costTimeDiv); + //PPNB_Classifier::trainTimeSU += size*(costTimeLogSU + costTimeDivSU); + PPNB_Classifier::divCtr+=size; + PPNB_Classifier::logCtr+=size; PPNB_Classifier::trainBdw += size*(costBdwLog + costBdwDiv); }; @@ -258,6 +264,7 @@ Cipher PPStats::Classify(PPRecord *r) { + } else { h(); finalProbaCi2 = zero; @@ -271,7 +278,8 @@ Cipher PPStats::Classify(PPRecord *r) { } #pragma omp critical - proba.insert(std::make_pair(i->first, finalProbaCi2)); + {proba.insert(std::make_pair(i->first, finalProbaCi2)); + PPNB_Classifier::addCtr++;} } } @@ -285,6 +293,7 @@ Cipher PPStats::Classify(PPRecord *r) { { maxProba = i.second; maxClass = i.first; + PPNB_Classifier::cmpCtr++; } } diff --git a/SER/dtpkc.ser b/SER/dtpkc.ser index 94a908ee..4fb6eaa0 100644 --- a/SER/dtpkc.ser +++ b/SER/dtpkc.ser @@ -1,11 +1,11 @@ -132652683575526803148911294357422212377499327845149868356073014542176283487019122009201061850480352064061900153007901960693565104678338612283730577394650502658210542677191502844542093690869352515645340190970368297664451039299816268545700464888981225385074630282762573013671002812817142066678550090279068355879 --5127353447089521785926870925987224897646781692415335087405458170202404661178312911806987453043295819223119072657238434077905579598888211289693965080737509021763598452120282934133630833441404488741607866042147891057777952416780573475659650448055536035291673877522418272887848601644957975069674365190338422160004348795230856496086250297991793023456998501007370572790981922682723236435095264860483129700361307424948928916809042675430922715736989768701354758619658190738475986463964559807548614335189319534299370729226597374072186937049222221236829420581179424725657975380919437416488076404132118083214699137346471297005 -17596734459788838483462964593835326237755053347532756154498855715447767473129846679186717295537121587549222612122981980401721219235801927442020229809588747648001780329558457791386807139634347780436147233194920234652107150463938488346749820806678889786624293148505863093559352372180935537952429102622076214601549874949770135330089630068523976959294829328295246234923553501451419143905431611466512760179140037226071574727803061417378814175019942820889069220497040565108941638536576607419011784153003860246987686911377204638143476670657882525145679818639416520411432968163120051694730554270110428101574105473008193862641 -3033063132347984277699558203450275220326004229271873134201584491118994986911542945605503520229472517818167368059740613167810400380854968604372918708082148228625406132843113500468393005026203799600885332688967087985405737381291930364923558177935235237522098978886277339062414916073475807849993917521388137342180670170107186909842566458824482504767189203015691322371212705240386665056258743152995283979264894754602705518082348438343804856735511365565325084143507058825647176756848995362945349355300850343054927826818614126042339957911782287210214713150645635209986837352014545539426839428683958261001061588536950711973871829001377157779799129371425276693795745210974800669487236805782068449531311748717781837298302134621772981158780416958320588138846792599855741922583237296521805799295078127963327008010973525745190130720828527333585895470587164540609674645391922692012979458527137091806635057720250111497197145610577009168307249331063406863231690731383929179575576488465492670605831889930427050376684252560918460067218656260787449914979715951923996242299229213418201129778399626803000856415840690030898499583058005467124119697682222921931841844244979807161482377043605815427834483535535462432993497478784984690814562994903718220179323137685044648032517871401882523200898681620938316124396654576499198452213309794820170174436464762417479494297705248944808629397849345723032147714267705530780194541100596306034261291876373473430566861402903959123395265007165470232567625577739585996710938454304775793307267244296731257306063520868082986343296376859003356231742611371083308441095914642459866570383410145192295398039339490305896886214212632936048425775680677270316787695860720141664251389010109102401985345489578914964841433806631669934080480127599592862681306575233782106447971910818373964153897085612596243382426893745872142767081731833091493704753000 +124836659959831504575750139183669627786543010357942310626530132014830068451166066239220558125430242417703657850440782850109739036640647711571887908055284222295663995061655910011967429479091358316271964318223967761365172611593246920960242951474900688181737584676352707134539530476226764086851565210058626379383 +-10179008696415522026174413479609818537285252049616304298196986982485738662335699258685455161392882171645853895780261517868800976312352174604316730983432043734202638616573819791859390644894841433730603995316825197139454836089333929404922470923861508477965371785188662561369884438418732188824552848008204295397023998861824291706138441606741001973598498167210598501473827964273560107173166678207281804339554700100147239095961147019700926622482956058718258900227743074136444692373571160345288570942485874494226021156800270541550767536601766361114381872711679723899406721189551306267989632142760953612698524142967114922218 +15584191669926598389636236765096867758521314070746310021910462852290548699458052232738850493638051486666839261871298414905937415513642981418662727894496874376054011461263777919306315806945655032224931137041636688368921391784596073866770448532434493767563583337461274330491240209873257069664420441054306086543320998006524472974494503381323462632343835982384129808746359749294324478059894277841867011632321200265196064910983927232947250248659741757655489267136692951665567547482227356921937164133532070363470999008225442111388857003536572953333922811314672247527181023655514803175181294270742948021085183219559447460689 +13915434321260363223394306928388045784959383719725684571458597503615158977097746837379706617979339787966163085409431228595036934351119814579689526371742585980418793110598907288936085890556776616961880954359001786837473226280949789709347079519802568769147271874420800575424437570222269246851656938446400743215572480014589855744006624248033690517218065944918957563271044097417903405041625610465368245450382219025741573140775443608137339132148436010569526390179822610024012736873364659076900157396638966311604981483165808018200142809258585252488883371288637848597243489377799893269883692824119790492727155044738893804025107167494433981531536230301602454369400085137929184164505830538220426362570712996747182685157751141856125674223264846468478976981662254267777974484172977124282747662552617514162404933970105141265922341166794353392803025839845762030849612302881390082676764025833948201304133222813624276174004484599305569016553987068097354279674262815956367620265532474879425904457117059664231992861346348504346483424786756533849226682699885526402859708747788448070354597284126371544497235448735908880384492383443441310847712122489428117749004559524920044399473832509193717025048523318352624858095169036538763401208810586675236881284804840061618657817140078123111877760313047916158456270589476440798525870464640958337307475726881517082501032037381951290392634974389716654225889776771865407130839406723612172692928347216486897982369323646201807639552285560663996087237479852159779467367060050011254926871919726222598995837778432054583392861014571752151686286011557115146358052591663615145441488239161759236542841125926405787834669907299816673776126974537044396187398752816363134878255764180304633968626992289350726542427596395056682390652392532390039510269473872806663279101348771280717908184144092061120314689468635478269094926963627145035416406976 1024 -13119243662631289225817146708799106079051744890346379645368881432360141266071200595474649297922033563699801074414546918418019060080370830891640655218670691 -10111305726668776066575817264247262080502678285244016226107683874672343739258849758183599947567477047027509714985125805814941173089559368190196799721340269 -178755742329101091159270398210728815203355387271099068462570910975636684762482401968534087177538341630413150516979192455567451691502643212668262146644588358414944475050432130323587380798369141810361525732604517856066205157694299965490904317365087242325023082838254537398031312146673382436292425651064419377393 -33163170893881700787227823589355553094374831961287467089018253635544070871754780502300265462620088016015475038251975490173391276169584653070932644348662619856915288344281552612894530161125298240305541150143624205274786001703702734623836701659933933968615975742993293335236692463145993034119867063206032086230 -172029248902680159059092970324936127674670065892365005790259750419936953896350774492714058900683033958851833328642342124330459723120291106747249699890272225745375126782824252283152627935129798825595100454611913931376801276951734983357744544825214928140635652923928993387764910358304243133085710543750973622350 -17607800342669535804459101620228327433355102211715277630138429223085937191931897523900485860525145518619549622061821739073997036693810369437876472882733435752121399270376546725845194788311879454578097678462563997228166846071008358052670567456435612365051046464853290100654642148286605992011488719892929959134710375761398971709487636235700864505668203193936440857428292844953144642289878074383687503602744904886540040456332071424755211850163556880054805473963154073527252311192532655296374107341387059039545531524747752231908028677535849994837920718811718163271602085701306603606460658109872104134751044982111945173451618171035771421763476459107070207154500501517974962551549699959649561490747808465197589906900531340820056756574773251645877424678401728619623208958920667412062281245499494722225186380220043034999734714811689128126168078035626601777134683490084020140826611851938966447482507817207434827792276861699270976270 +9445802161408621027759497430348405031832587656826380104808836514772538855450823698449718622074394463973850273662500464839012772197309122775370959409513751 +13216099366325816536409928870412065582117166272583277965675395130024582287095712632705769290578661794236039321317819575345979275045105192101667884060425633 +119035423364653880300866070729495612981784498154041602425518401049367931324907900363152269428425395973369473874763834838893842299908801989111041964692615235155877235934095190442047658437728786987242164827253084896803063285244778592231700445397965301505186332337094801987404121986033086723360543557073507443811 +31209164989957876143937534795917406946635752589485577656632533003707517112791516559805139531357560604425914462610195712527434759160161927892971977013821049908440616831804586460635282179655186091629508727141474319283381953618026093605977948996747008781369843696689431703624836371044880418134172042803789110000 +19673812846404376616331940852116017039053126284166408940533626248527244275035969367911047062375875800468957595617286400153269556069271131491315595712901571262206774831846384592744995575502186130001542798145234888336882003673463038876405076965134580151791376395272784100509189647482931971464416840855208936127 +32684953499707809635194331409292238728516719409936483458169360660112310867519456113751600316016886999673600959118302767896770073805519406980203592892588352228073879054495993279128246049784243719736578442832040862569582703139429473666612828821293489127561860000076466785448676578175588856529125926937340219783556758279054558382373714481688653090954478999964502718544124667558554350131725672516791970525437702138416577696862935063655832443320982003850458797717432300411377155043853597294905414919065114234953829498804334208111081060528576445012785436405402813263542930231988410863805132872692422510646371611630406237089617541715868675267178353939599132234600145036603624405578886600175284734509564461331360244340785117818915911739283966262613867785954177057817020502468053410026154421676454801535792820246361448858470499397974084199493372249069181784014650719444405194171880095642242568379803157638563102689533872318749203873 diff --git a/TEST/main.cpp b/TEST/main.cpp index e1621619..24b46feb 100755 --- a/TEST/main.cpp +++ b/TEST/main.cpp @@ -501,6 +501,12 @@ int main (int argc, char **argv) { classifier->train(); + double t1=0.0, t2=0.0; + t1 = PPNB_Classifier::addCtr * 0.00092 + (PPNB_Classifier::cmpCtr+DTPKC::cmpCtr)*6.39 + PPNB_Classifier::divCtr*9.15 + PPNB_Classifier::logCtr*9.62; + t2 = PPNB_Classifier::divCtr*9 + PPNB_Classifier::logCtr*6.01 + (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr)*6.56; + PPNB_Classifier::trainTimeMU = t1/(t1+t2); + PPNB_Classifier::trainTimeSU = t2/(t1+t2); + datasetReader->nextChunk(); if (remoteClient) { @@ -525,6 +531,15 @@ int main (int argc, char **argv) { evaluateAccuracy(clearPath, mainPath, OutputPath, classOutput, datasetReader->test_size, P, R, F1); + + t1 = PPNB_Classifier::addCtr * 0.00092 + (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr )*6.39; + t2 = (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr)*6.56; + + PPNB_Classifier::testTimeMU = t1/(t1+t2); + PPNB_Classifier::testTimeSU = t2/(t1+t2); + + + stats << std::to_string(classifier->trainTime) + "," + classifier->extTrainBd.get_str() + "," + std::to_string(classifier->testTime) + "," + std::to_string(classifier->clientTestTime) + "," + @@ -536,8 +551,14 @@ int main (int argc, char **argv) { datasetReader->reloadTest(); } } else { + + double t1,t2; if (debug) cout << "Training started" << endl; classifier->train(); + t1 = PPNB_Classifier::addCtr * 0.00092 + (PPNB_Classifier::cmpCtr+DTPKC::cmpCtr)*6.39 + PPNB_Classifier::divCtr*9.15 + PPNB_Classifier::logCtr*9.62; + t2 = PPNB_Classifier::divCtr*9 + PPNB_Classifier::logCtr*6.01 + (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr)*6.56; + PPNB_Classifier::trainTimeMU = t1/(t1+t2); + PPNB_Classifier::trainTimeSU = t2/(t1+t2); if (debug) cout << "Training done" << endl; if (remoteClient) { @@ -557,6 +578,11 @@ int main (int argc, char **argv) { evaluateAccuracy(clearPath, mainPath, OutputPath, classOutput, datasetReader->test_size, P, R, F1); + t1 = PPNB_Classifier::addCtr * 0.00092 + (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr )*6.39; + t2 = (PPNB_Classifier::cmpCtr + DTPKC::cmpCtr)*6.56; + + PPNB_Classifier::testTimeMU = t1/(t1+t2); + PPNB_Classifier::testTimeSU = t2/(t1+t2); stats << std::to_string(classifier->trainTime) + "," + classifier->extTrainBd.get_str() + "," + std::to_string(classifier->testTime) + "," + std::to_string(classifier->clientTestTime) + "," + diff --git a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache index 9ee65a51..fe7fe762 100644 --- a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache +++ b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache @@ -38,56 +38,16 @@ chrono 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 - /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.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/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 @@ -104,38 +64,6 @@ 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/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/EvalSub2.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 -- - /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/SkeySwitch.h DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h @@ -144,168 +72,6 @@ DTPKC.h vector - -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/Configuration.h -namespace.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/namespace.h -ConfigurationException.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/ConfigurationException.h -StringBuffer.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/StringBuffer.h -StringVector.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/StringVector.h -stddef.h -- - -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/ConfigurationException.h -namespace.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/namespace.h -string.h -- - -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/StringBuffer.h -namespace.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/namespace.h -assert.h -- - -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/StringVector.h -namespace.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/namespace.h -StringBuffer.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/StringBuffer.h - -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/namespace.h - -/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/LR/LR.h -string -- -fstream -- -vector -- -math.h -- -stdlib.h -- -iostream -- -string.h -- -netinet/in.h -- -../IO/Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h -../IO/DatasetReader.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/DatasetReader.h -chrono -- - -/home/rania/CLionProjects/DAPPLE-2.0/ML/NB/NB_Classifier.h -netinet/in.h -- -../IO/DatasetReader.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/DatasetReader.h -../../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -Stats.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/NB/Stats.h -math.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/NB/math.h - -/home/rania/CLionProjects/DAPPLE-2.0/ML/NB/Stats.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/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/PPML/IO/PPDatasetReader.h PPRecord.h /home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h @@ -330,21 +96,11 @@ iostream ../../CRYPTO/DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPLR/PPLR_Classifier.h -../IO/PPDatasetReader.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPDatasetReader.h -../../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -../../CRYPTO/EvalSigmoid.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSigmoid.h -../../CRYPTO/EvalDotProd.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDotProd.h -../../CRYPTO/EvalLrUpdate.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLrUpdate.h -../../CRYPTO/EvalSub2.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalSub2.h -math.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPLR/math.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPNB_Classifier.cpp +chrono +- +PPNB_Classifier.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPNB_Classifier.h /home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPNB_Classifier.h ../IO/PPDatasetReader.h @@ -390,236 +146,6 @@ omp.h ../../CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNode.h -../IO/PPRecord.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h -PPNodeStats.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNodeStats.h -PPNodeTest.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNodeTest.h - -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNodeStats.h -iostream -- -map -- -iterator -- -../IO/PPRecord.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.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 -../../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/EvalAddPow2.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAddPow2.h - -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNodeTest.h -map -- -../IO/PPRecord.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h -../../CRYPTO/EvalCmp.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalCmp.h - -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPVFDT_Classifier.h -netinet/in.h -- -../IO/PPDatasetReader.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPDatasetReader.h -PPNode.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPNode.h -../../UTIL/math_util.hh -/home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh -math.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/math.h -../../CRYPTO/DTPKC.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../../CRYPTO/EvalEntropy.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalEntropy.h -../../CRYPTO/EvalHBound.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalHBound.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/EvalDiv.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv.h -../../CRYPTO/EvalDiv100.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.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/EvalThreashold.h -/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalThreashold.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/TEST/TESTElementaryOps.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/TEST/TESTpacking.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/TEST/main.cpp -../PPML/PPNB/PPNB_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPNB_Classifier.h -../PPML/PPLR/PPLR_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPLR/PPLR_Classifier.h -../PPML/PPVFDT/PPVFDT_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPVFDT/PPVFDT_Classifier.h -../ML/NB/NB_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/NB/NB_Classifier.h -../ML/VFDT/VFDT_Classifier.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/VFDT_Classifier.h -../LIB/config4cpp/include/config4cpp/Configuration.h -/home/rania/CLionProjects/DAPPLE-2.0/LIB/config4cpp/include/config4cpp/Configuration.h -TESTBuildingBlocks.h -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTBuildingBlocks.h -TESTElementaryOps.h -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTElementaryOps.h -TESTpacking.h -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTpacking.h -../ML/LR/LR.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/LR/LR.h -stdio.h -- -stdlib.h -- -string.h -- -unistd.h -- -sys/types.h -- -sys/socket.h -- -netinet/in.h -- -arpa/inet.h -- -mcheck.h -- - /home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh vector - -- GitLab