diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 52156dbe334e9e6ec22d256b7424bb8c7d62fa34..c1c4b610158e745ece2ab91c32c47a511cf59491 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,65 +11,16 @@ </configurations> </component> <component name="ChangeListManager"> - <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Added a new dataset to compare with state of the art"> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/CRYPTO/EvalLog.h" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Iris/brute.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Iris/clean.csv" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Iris/result.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Iris/testing.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Iris/training.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/Clean.csv" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_1.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_10.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_11.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_12.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_13.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_14.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_15.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_16.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_2.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_3.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_4.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_5.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_6.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_7.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_8.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_9.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/result.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/testing.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery2/training.data" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Scripts/Clean_Iris.py" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/DATA/Scripts/brute.data" afterDir="false" /> + <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment=""> <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/EvalSigmoid.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Scripts/Split_Train_Test.py" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Scripts/Split_Train_Test.py" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/ML/NB/NB_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ML/NB/NB_Classifier.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/ML/NB/NB_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/ML/NB/NB_Classifier.h" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ML/NB/Stats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ML/NB/Stats.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/ML/NB/Stats.h" beforeDir="false" afterPath="$PROJECT_DIR$/ML/NB/Stats.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$/PPML/PPNB/PPStats.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/SER/dtpkc.ser" beforeDir="false" afterPath="$PROJECT_DIR$/SER/dtpkc.ser" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/TEST/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/TEST/main.cpp" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/UTIL/math_util.cc" beforeDir="false" afterPath="$PROJECT_DIR$/UTIL/math_util.cc" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/UTIL/math_util.hh" beforeDir="false" afterPath="$PROJECT_DIR$/UTIL/math_util.hh" 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" /> @@ -99,93 +50,70 @@ <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/UTIL/num_th_alg.cc"> + <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2347"> - <caret line="207" column="19" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="19" /> + <state relative-caret-position="120"> + <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> </state> </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="324"> - <caret line="67" column="40" selection-start-line="67" selection-start-column="40" selection-end-line="67" selection-end-column="40" /> - <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$/CRYPTO/EvalSigmoid.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="138"> - <caret line="75" column="50" selection-start-line="75" selection-start-column="50" selection-end-line="75" selection-end-column="50" /> - </state> - </provider> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-13:35:08-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.h"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="480"> - <caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" /> + <state relative-caret-position="218"> + <caret line="343" column="24" selection-start-line="343" selection-start-column="24" selection-end-line="343" selection-end-column="24" /> <folding> - <element signature="e#51#113#0" expanded="true" /> + <element signature="e#0#17#0" expanded="true" /> </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/UTIL/math_util.cc"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="202"> - <caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="8" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/UTIL/math_util.hh"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="77" column="49" selection-start-line="77" selection-start-column="49" selection-end-line="77" selection-end-column="49" /> + <state relative-caret-position="132"> + <caret line="113" column="22" selection-start-line="113" selection-start-column="18" selection-end-line="113" selection-end-column="22" /> + <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$/UTIL/mpz_class.hh"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2062"> - <caret line="16" column="2" lean-forward="true" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="2" /> + <state relative-caret-position="218"> + <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" /> + <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$/UTIL/util_gmp_rand.h"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp"> + <entry file="file://$PROJECT_DIR$/ML/NB/Stats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="38"> - <caret line="545" column="8" selection-start-line="545" selection-start-column="8" selection-end-line="545" selection-end-column="8" /> + <state relative-caret-position="330"> + <caret line="88" column="63" selection-start-line="88" selection-start-column="63" selection-end-line="88" selection-end-column="63" /> <folding> - <element signature="e#0#31#0" expanded="true" /> + <element signature="e#0#18#0" expanded="true" /> + <element signature="e#223#1383#0" /> </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/UTIL/prime_seq.hh"> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-03:37:52-Stats.csv"> <provider selected="true" editor-type-id="text-editor" /> </entry> </file> @@ -193,13 +121,6 @@ </component> <component name="FindInProjectRecents"> <findStrings> - <find>THe va</find> - <find>reloa</find> - <find>reload</find> - <find>epochs</find> - <find>shuffle</find> - <find>lr</find> - <find>NB</find> <find>stats</find> <find>initia</find> <find>initS</find> @@ -207,7 +128,6 @@ <find>InitStats</find> <find>INitS</find> <find>Class</find> - <find>Classify</find> <find>4</find> <find>3</find> <find>INit</find> @@ -223,11 +143,20 @@ <find>Log</find> <find>mpz_class_</find> <find>log</find> + <find>class</find> + <find>classify</find> + <find>cond proba</find> + <find>MaxP</find> + <find>Max</find> + <find>Classify</find> + <find>COUT</find> + <find>cout</find> </findStrings> <replaceStrings> <replace>EvalCmp100</replace> <replace>//cout</replace> <replace>Log</replace> + <replace>//COUT</replace> </replaceStrings> </component> <component name="Git.Settings"> @@ -279,22 +208,22 @@ <option value="$PROJECT_DIR$/ML/NB/NB_Classifier.h" /> <option value="$PROJECT_DIR$/ML/NB/NB_Classifier.cpp" /> <option value="$PROJECT_DIR$/ML/NB/Stats.h" /> - <option value="$PROJECT_DIR$/ML/NB/Stats.cpp" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" /> <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" /> <option value="$PROJECT_DIR$/TEST/main.cpp" /> - <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.h" /> - <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" /> <option value="$PROJECT_DIR$/DATA/Iris/brute.data" /> <option value="$PROJECT_DIR$/DATA/Scripts/Clean_Iris.py" /> <option value="$PROJECT_DIR$/DATA/Scripts/Split_Train_Test.py" /> - <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> <option value="$PROJECT_DIR$/CRYPTO/EvalLog.h" /> <option value="$PROJECT_DIR$/UTIL/math_util.cc" /> <option value="$PROJECT_DIR$/UTIL/math_util.hh" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" /> <option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" /> + <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.h" /> + <option value="$PROJECT_DIR$/ML/NB/Stats.cpp" /> + <option value="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" /> + <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" /> + <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> </list> </option> </component> @@ -347,11 +276,51 @@ <item name="Datasets" type="462c0819:PsiDirectoryNode" /> <item name="Iris" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="DATA" type="462c0819:PsiDirectoryNode" /> + <item name="Datasets" type="462c0819:PsiDirectoryNode" /> + <item name="Nursery2" 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" /> </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="EXP" type="462c0819:PsiDirectoryNode" /> + <item name="TESTS" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="LIB" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="ML" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="ML" type="462c0819:PsiDirectoryNode" /> + <item name="NB" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="PPML" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> + <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> + <item name="PPML" type="462c0819:PsiDirectoryNode" /> + <item name="PPNB" type="462c0819:PsiDirectoryNode" /> + </path> <path> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> @@ -479,21 +448,7 @@ <workItem from="1555420492797" duration="9561000" /> <workItem from="1556117036167" duration="16345000" /> <workItem from="1556985163497" duration="8721000" /> - <workItem from="1556999883524" duration="26605000" /> - </task> - <task id="LOCAL-00018" summary="14/11/2018 : Error in reading dataset"> - <created>1542222180978</created> - <option name="number" value="00018" /> - <option name="presentableId" value="LOCAL-00018" /> - <option name="project" value="LOCAL" /> - <updated>1542222180978</updated> - </task> - <task id="LOCAL-00019" summary="15/11/2018 : DatasetReader module works and tested"> - <created>1542294203443</created> - <option name="number" value="00019" /> - <option name="presentableId" value="LOCAL-00019" /> - <option name="project" value="LOCAL" /> - <updated>1542294203443</updated> + <workItem from="1556999883524" duration="35927000" /> </task> <task id="LOCAL-00020" summary="16/11/2018 : Half of the VFDT algo is coded but not tested"> <created>1542385015907</created> @@ -824,11 +779,25 @@ <option name="project" value="LOCAL" /> <updated>1557006929106</updated> </task> - <option name="localTasksCounter" value="67" /> + <task id="LOCAL-00067" summary="Added the iris dataset and updated the naive bayes classifier"> + <created>1557026773437</created> + <option name="number" value="00067" /> + <option name="presentableId" value="LOCAL-00067" /> + <option name="project" value="LOCAL" /> + <updated>1557026773438</updated> + </task> + <task id="LOCAL-00068" summary="Added the iris dataset and updated the naive bayes classifier"> + <created>1557027877923</created> + <option name="number" value="00068" /> + <option name="presentableId" value="LOCAL-00068" /> + <option name="project" value="LOCAL" /> + <updated>1557027877923</updated> + </task> + <option name="localTasksCounter" value="69" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="862303000" /> + <option name="totallyTimeSpent" value="871625000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -913,7 +882,6 @@ <component name="VcsManagerConfiguration"> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_NEW_TODO" value="false" /> - <MESSAGE value="28/11/2018 : Code cleansing almost done" /> <MESSAGE value="30/11/2018 : Added parallelism to the pp version" /> <MESSAGE value="30/11/2018 : Last parallel version" /> <MESSAGE value="07/01/2019 : started modifying NB" /> @@ -938,7 +906,8 @@ <MESSAGE value="Added the bank dataset files" /> <MESSAGE value="Updated parallelism in PVFDT" /> <MESSAGE value="Added a new dataset to compare with state of the art" /> - <option name="LAST_COMMIT_MESSAGE" value="Added a new dataset to compare with state of the art" /> + <MESSAGE value="Added the iris dataset and updated the naive bayes classifier" /> + <option name="LAST_COMMIT_MESSAGE" value="Added the iris dataset and updated the naive bayes classifier" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -1100,12 +1069,12 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>100</line> + <line>102</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>121</line> + <line>132</line> <option name="timeStamp" value="612" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1314,52 +1283,52 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>154</line> + <line>162</line> <option name="timeStamp" value="853" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>138</line> + <line>142</line> <option name="timeStamp" value="856" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>140</line> + <line>145</line> <option name="timeStamp" value="857" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>149</line> + <line>157</line> <option name="timeStamp" value="859" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>151</line> + <line>159</line> <option name="timeStamp" value="860" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>156</line> + <line>164</line> <option name="timeStamp" value="862" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>95</line> + <line>97</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>113</line> + <line>124</line> <option name="timeStamp" value="870" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>162</line> + <line>183</line> <option name="timeStamp" value="871" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>289</line> + <line>318</line> <option name="timeStamp" value="872" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1454,12 +1423,7 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>173</line> - <option name="timeStamp" value="975" /> - </line-breakpoint> - <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> - <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> - <line>160</line> + <line>169</line> <option name="timeStamp" value="976" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1479,27 +1443,27 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>168</line> + <line>189</line> <option name="timeStamp" value="980" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>171</line> + <line>192</line> <option name="timeStamp" value="984" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>170</line> + <line>191</line> <option name="timeStamp" value="985" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>172</line> + <line>193</line> <option name="timeStamp" value="986" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>173</line> + <line>194</line> <option name="timeStamp" value="987" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> @@ -1509,19 +1473,29 @@ </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>169</line> + <line>190</line> <option name="timeStamp" value="990" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>177</line> + <line>198</line> <option name="timeStamp" value="991" /> </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> - <line>175</line> + <line>196</line> <option name="timeStamp" value="992" /> </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/ML/NB/Stats.cpp</url> + <line>185</line> + <option name="timeStamp" value="994" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url> + <line>238</line> + <option name="timeStamp" value="995" /> + </line-breakpoint> <line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <url>file://$PROJECT_DIR$/DATA/Scripts/Clean_Adult.py</url> <line>8</line> @@ -1568,86 +1542,9 @@ </watches-manager> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/nursery.data"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Scripts/CSV_Splitter.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="100" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/Clean.csv"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/CLEAN/nursery_12960_8.csv"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-193751" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/result.data"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-427"> - <caret line="345" column="1" selection-start-line="345" selection-end-line="345" selection-end-column="1" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/training.data"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-23572" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-00:42:13-Stats.csv"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="255"> - <caret line="17" column="65" lean-forward="true" selection-start-line="17" selection-start-column="65" selection-end-line="17" selection-end-column="65" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_2.data"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1107" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery2/DO_1.data"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1102"> - <caret column="3" selection-start-column="3" selection-end-column="3" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-00:43:52-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="38" selection-start-line="38" selection-end-line="38" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="30" selection-start-line="30" selection-end-line="31" selection-end-column="44" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-00:51:38-Stats.csv"> <provider selected="true" editor-type-id="text-editor" /> </entry> - <entry file="file://$PROJECT_DIR$/ML/NB/Stats.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="233"> - <caret line="88" column="56" selection-start-line="88" selection-start-column="56" selection-end-line="88" selection-end-column="56" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - <element signature="e#223#1383#0" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-01:11:17-ClassOutput.txt"> <provider selected="true" editor-type-id="text-editor" /> </entry> @@ -1733,23 +1630,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="161"> - <caret line="162" selection-start-line="162" selection-end-line="162" /> - <folding> - <element signature="e#0#20#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="161"> @@ -1779,16 +1659,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="296"> - <caret line="162" selection-start-line="162" selection-end-line="162" /> - <folding> - <element signature="e#0#17#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="266"> @@ -1806,6 +1676,12 @@ <entry file="file://$PROJECT_DIR$/UTIL/prime_seq.cc"> <provider selected="true" editor-type-id="text-editor" /> </entry> + <entry file="file://$PROJECT_DIR$/UTIL/prime_seq.hh"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/UTIL/util_gmp_rand.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> <entry file="file://$PROJECT_DIR$/UTIL/mpz_class.hh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-2062"> @@ -1813,6 +1689,20 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/UTIL/math_util.hh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="77" column="49" selection-start-line="77" selection-start-column="49" selection-end-line="77" selection-end-column="49" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/UTIL/math_util.cc"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="202"> + <caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="8" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.h"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="480"> @@ -1823,59 +1713,122 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/UTIL/math_util.hh"> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="77" column="49" selection-start-line="77" selection-start-column="49" selection-end-line="77" selection-end-column="49" /> + <state relative-caret-position="138"> + <caret line="75" column="50" selection-start-line="75" selection-start-column="50" selection-end-line="75" selection-end-column="50" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> + <entry file="file://$PROJECT_DIR$/UTIL/num_th_alg.cc"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="138"> - <caret line="75" column="50" selection-start-line="75" selection-start-column="50" selection-end-line="75" selection-end-column="50" /> + <state relative-caret-position="-2347"> + <caret line="207" column="19" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="19" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/UTIL/prime_seq.hh"> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="285"> + <caret line="19" selection-start-line="19" selection-end-line="19" /> + <folding> + <element signature="e#51#70#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="158"> + <caret line="553" selection-start-line="549" selection-start-column="3" selection-end-line="553" /> + <folding> + <element signature="e#0#31#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ML/NB/NB_Classifier.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-1665" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-03:42:33-Stats.csv"> <provider selected="true" editor-type-id="text-editor" /> </entry> - <entry file="file://$PROJECT_DIR$/UTIL/math_util.cc"> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-03:37:52-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-03:45:03-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-11:14:41-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTStestingNB-2019-05-05-11:16:22-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="202"> - <caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="8" /> + <state relative-caret-position="218"> + <caret line="343" column="24" selection-start-line="343" selection-start-column="24" selection-end-line="343" selection-end-column="24" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp"> + <entry file="file://$PROJECT_DIR$/ML/NB/Stats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="324"> - <caret line="67" column="40" selection-start-line="67" selection-start-column="40" selection-end-line="67" selection-end-column="40" /> + <state relative-caret-position="330"> + <caret line="88" column="63" selection-start-line="88" selection-start-column="63" selection-end-line="88" selection-end-column="63" /> <folding> - <element signature="e#0#20#0" expanded="true" /> + <element signature="e#0#18#0" expanded="true" /> + <element signature="e#223#1383#0" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/UTIL/num_th_alg.cc"> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:47:43-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-12:47:43-Config.txt"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2347"> - <caret line="207" column="19" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="19" /> + <state relative-caret-position="218"> + <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" /> + <folding> + <element signature="e#0#20#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/UTIL/util_gmp_rand.h"> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-13:08:33-Stats.csv"> <provider selected="true" editor-type-id="text-editor" /> </entry> - <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp"> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-13:12:09-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="38"> - <caret line="545" column="8" selection-start-line="545" selection-start-column="8" selection-end-line="545" selection-end-column="8" /> + <state relative-caret-position="132"> + <caret line="113" column="22" selection-start-line="113" selection-start-column="18" selection-end-line="113" selection-end-column="22" /> <folding> - <element signature="e#0#31#0" expanded="true" /> + <element signature="e#0#20#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/TESTS/testingNB-2019-05-05-13:35:08-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> </component> </project> \ No newline at end of file diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config index ae1643a775f3765c521a963ddb73f8cc43d089fd..30a9b55a4f9169650c2a04d6325f77ff80e229b6 100755 --- a/CONFIG/DAPPLE.config +++ b/CONFIG/DAPPLE.config @@ -1,13 +1,13 @@ # Experiments parameters perf{ testBuildingBlocks="false"; - PrivacyPreservation="true"; + PrivacyPreservation="false"; MLAlgorithm="nb"; runs_number ="1"; - thread_number="16"; + thread_number="14"; remoteClient="false"; - Incremental="true"; - OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/TESTS"; + Incremental="false"; + OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/TESTS/"; scenarioName ="testingNB"; debug="true"; maxTrainSize="100"; @@ -17,12 +17,12 @@ # The dataset configuration parameters dataset{ mainPath = "/home/rania/CLionProjects/DAPPLE-2.0/"; - path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery2/"; - clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery2/"; + path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Iris/"; + clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Iris/"; chunk_prefix="DO"; - class_number="5"; - dimension="9"; - chunk_number="16"; + class_number="3"; + dimension="5"; + chunk_number="1"; } # The vfdt algorithm parameters diff --git a/CRYPTO/EvalLog.cpp b/CRYPTO/EvalLog.cpp index 173d9e9266393f7993abdbf1826306f959326af1..438d1075e0bd853f2e4312a41a8b1d02592b338c 100755 --- a/CRYPTO/EvalLog.cpp +++ b/CRYPTO/EvalLog.cpp @@ -18,7 +18,7 @@ EvalLog::EvalLog_U1_step1() gmp_randstate_t state; Cipher S1, S2; - Cipher one = dtpkc.enc(1, u.Pub); + Cipher one = dtpkc.enc(100, u.Pub); u.T1 = u.T1 * one.T1; u.T2 = u.T2 * one.T2; @@ -51,7 +51,7 @@ EvalLog::EvalLog_U2_step2(Cipher S1, Cipher S2) mpz_class S3; Cipher S4; S3=dtpkc.PSdec1(S1,S2); - S4=dtpkc.enc(mpz_class_log(S3,lambda),u.Pub); + S4=dtpkc.enc(mpz_class_log(S3,lambda)-200,u.Pub); S4.sign = 1; return S4; diff --git a/ML/NB/Stats.cpp b/ML/NB/Stats.cpp index 1d07087814bb82967688b42279ebb682afc64edc..8190d78087e247858aa88973daa4467523593507 100755 --- a/ML/NB/Stats.cpp +++ b/ML/NB/Stats.cpp @@ -87,6 +87,7 @@ Stats::InitStats() { float proba = (1.0 * i.second) / (1.0*totSampleNum ); proProba.insert(std::make_pair(i.first, proba)); LogproProba.insert(std::make_pair(i.first, log(1+proba))); + cout << "prior proba " << log(1+proba) << " " << proba << endl; } this->priorProba = proProba; @@ -116,6 +117,7 @@ Stats::InitStats() { probaxjkl = (1.0 *l.second)/(1.0 *i->second); cdProbaClasses.insert(std::make_pair(l.first,probaxjkl)); LogcdProbaClasses.insert(std::make_pair(l.first,log(1+probaxjkl))); + cout << "Cond proba " << log(1+probaxjkl) << endl; } cdProbaValues.insert(std::make_pair(k.first, cdProbaClasses)); LogcdProbaValues.insert(std::make_pair(k.first, LogcdProbaClasses)); @@ -136,7 +138,10 @@ int Stats::Classify(Record *r) { map<int,float> proba; + + cout << "*----------------------------------------------*" << endl; for ( auto & i : LogpriorProba ) { + cout << "prior proba " << i.second << endl; float finalProbaCi = i.second; for ( auto & j : LogconditionalProba) { @@ -147,7 +152,10 @@ int Stats::Classify(Record *r) { { map<int, float>::iterator probaClasses = probaValues->second.find(i.first); if (probaClasses != probaValues->second.end()) + { finalProbaCi += 1.0* probaClasses->second; + cout << "Cond proba " << probaClasses->second << endl; + } else finalProbaCi = 0.0; } @@ -156,13 +164,17 @@ int Stats::Classify(Record *r) { } proba.insert(std::make_pair(i.first,finalProbaCi)); } + cout << "*----------------------------------------------*" << endl; float maxProba = -100000; int maxClass = 0; + cout << "----------------------------------------------" << endl; for (auto & i : proba ) { + cout << "final probas " << i.second << endl; + if (i.second > maxProba ) { maxProba = i.second; @@ -170,7 +182,7 @@ int Stats::Classify(Record *r) { } } - + cout << "----------------------------------------------" << endl; return maxClass; } diff --git a/PPML/PPNB/PPStats.cpp b/PPML/PPNB/PPStats.cpp index f1a1b487fec5c0f97575a26808dac7dd48151687..a09261c5fb57060c76ab72295f52aab9748f79e7 100755 --- a/PPML/PPNB/PPStats.cpp +++ b/PPML/PPNB/PPStats.cpp @@ -111,6 +111,7 @@ PPStats::InitStats() { EvalLog evalLog(proba,100,dtpkc); std::vector<Cipher> in = evalLog.EvalLog_U1_step1(); 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)); }; } @@ -154,6 +155,7 @@ PPStats::InitStats() { std::vector<Cipher> in = evalLog.EvalLog_U1_step1(); 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; } cdProbaValues.insert(std::make_pair(k.first, cdProbaClasses)); LogcdProbaValues.insert(std::make_pair(k.first, LogcdProbaClasses)); @@ -184,12 +186,12 @@ Cipher PPStats::Classify(PPRecord *r) { size_t cnt = 0; int ithread = omp_get_thread_num(); int nthreads = omp_get_num_threads(); - + ////COUT << "*----------------------------------------------*" << endl; for (auto i = this->LogpriorProba.begin(); i != this->LogpriorProba.end(); ++i, cnt++) { if (cnt % nthreads != ithread) continue; Cipher finalProbaCi2 = i->second; - + //COUT << " prior proba " <<i->second << endl; for (auto &j : this->LogconditionalProba) { map<Cipher, map<Cipher, Cipher>> innerMap = j.second; map<Cipher, map<Cipher, Cipher >>::iterator probaValues = innerMap.find(r->values[j.first]); @@ -197,9 +199,13 @@ Cipher PPStats::Classify(PPRecord *r) { if (probaValues != innerMap.end()) { map<Cipher, Cipher>::iterator probaClasses = probaValues->second.find(i->first); if (probaClasses != probaValues->second.end()) { + + //COUT << " pobaClasses->second.T1 " << probaClasses->second << endl; finalProbaCi2.T1 = finalProbaCi2.T1 * probaClasses->second.T1; finalProbaCi2.T2 = finalProbaCi2.T2 * probaClasses->second.T2; + + } else { finalProbaCi2 = zero; break; @@ -220,6 +226,7 @@ Cipher PPStats::Classify(PPRecord *r) { for (auto & i : proba ) { + //COUT << "pro" << i.second << endl; if (i.second > maxProba ) { maxProba = i.second; @@ -228,6 +235,9 @@ Cipher PPStats::Classify(PPRecord *r) { } + + //COUT << " maxProba " << maxProba << " maxClass " << maxClass << endl; + return maxClass; } @@ -240,7 +250,7 @@ void PPStats::print () { for ( auto & k : j.second ) { - cout << "(A = " << i.first << ", a = " << dtpkc.Sdec (j.first) << ", c = " << dtpkc.Sdec (k.first)<< ", occ = " << dtpkc.Sdec (k.second) << " ) " << endl; + //COUT << "(A = " << i.first << ", a = " << dtpkc.Sdec (j.first) << ", c = " << dtpkc.Sdec (k.first)<< ", occ = " << dtpkc.Sdec (k.second) << " ) " << endl; } } @@ -248,7 +258,7 @@ void PPStats::print () } - cout << "$$$$$$$$$$$$" << endl; + //COUT << "$$$$$$$$$$$$" << endl; for ( auto & i : conditionalProba ) { @@ -257,7 +267,7 @@ void PPStats::print () { for ( auto & k : j.second ) { - cout << "(A = " << i.first << ", a = " << dtpkc.Sdec (j.first) << ", c = " << dtpkc.Sdec (k.first)<< ", proba = " << dtpkc.Sdec (k.second) << " ) " << endl; + //COUT << "(A = " << i.first << ", a = " << dtpkc.Sdec (j.first) << ", c = " << dtpkc.Sdec (k.first)<< ", proba = " << dtpkc.Sdec (k.second) << " ) " << endl; } } diff --git a/SER/dtpkc.ser b/SER/dtpkc.ser index 29d598dc7ea12e8a75e6faa950649b51ef5a60e2..86d48632d37ce7c6b27c903d6cd5afd08f59384a 100644 --- a/SER/dtpkc.ser +++ b/SER/dtpkc.ser @@ -1,11 +1,11 @@ -149205130276496534851756422367062365556817447243065860516675789883154670495991086610170678490010222955560397752702941460460488641972630421056010841053818255419150655555069271737523131818565213845453736083902440064327647312700255327463566742440877874995269382371127924398361819820498526254603546064155948283489 --8314501153698168934456706959043942871706924121545708577348150808281588429851071641131131985312772630009993540801250789840212861665043877664626896408090446416466425524073530962230062895980860661302442800759844052374173694327839411955846150176678175975953369187195307140646582426277412659635982424064766104676607223480397144614649278736017110114095884123470420284690103431153359327041011994288596793431102492157966186201298318461991606737685860115883799123153491862647665335221937402390053339709023281577766362579646175632890813949511264747567832323392590073197856201407806271745709825944253733725837754535184116551137 -22262170900826302930662029240253449860979581924479113510572602077935931806452414897236691542396723160315016211290389580738077495857781526489719678376964818372135699386570111740395244531690241714813818030250992241357480451089691970152424035517473320010171109781998754923880991230227353469572036857082843788809584171175228114542289309721169722130304230032321596971672603414111405565736955962259868910979816964613267621512157296756208270275763484258182654326204111718004753359023841976560086540866504892395399584818215152712019921898341701492833184155556716317334518912525194282291082894689138481811004141715165510013121 -976177802466061300937100292147031058264306453915705639161784874519968825698804680684807911307665517060469333189302330060802024818775189679706628225660967916567884327154675233272777575442437788255389108610907322859437464669596279922955433422644261421438545155662182810340428790895638321770615357896208559048687236072884275153011141954671143366716748793761813953233607429974523321455781280712945531899269402584450520265194988283243609279546141872648099712200258479633681599855878121967064434991556659604238148305970433441685454662949573292550787395155476546521972958336328016943063750642733535025637175921410624559961011848372755288428793473109642109637761163355111655647962040596650804046541671651467616409351530775166413479727344078387642659182149972477435465348007080081191533202011260152923125040407234155832506193929728591805622421831663271936228294598935913368732060621682504183944331468952002621688201357416035922340765760669472649646439946877854968820402025516661244649337267828920195747791066279582806242607457780187603002269687520808006030762859669439240658792818043330907217528758761388795249957811478817923574259245255447902680886656878241668500635263826015204148089281599545863955270129440189703907832121510518512080919662289243315476549779717491323169377646689576262832858166136861247878560868612925361711909325776668700992023950236278402010944651986104418743678603776394018930557094581765908725282845753790790562590572754888876835203650078762339286033653522991179911273164790232209288484126534570464266961163585651521554163898562950565217125503493308921517455398617827364314454375469665162364941596238492393237501762133318848013326949639522372204125817748813608306866180592561922325513005220756179548528580169348511085604228946352494830478504684766235896519040552258628393180899913568311316568450765112457075383036076150427217154048000 +144063836314093184365057423479028517151770979209083433115495823351926698402185773166301187892748788139113921929145295767801139436344950097342857808539452092050274226106159220607698660725215248949895261978259211789236558005624252582246408125450236107266272476536206312700961891153073360045173662480171401957701 +-15939327246413201574449744554444513219664454472138797987122139638109183823134468757071624938462668604519604282782459504508059674105642343143398838038711916356610226668548570427063403370406746284132563403110507757698013686560281256963069813880848835993809928621986703313568986415050311823068225152611204496530524198530788746991949140806798469463313173771917155467018695402988389450470049264073944959884180349126820756901225346000861125695177251163498091089711357068347498102129497136950436714304977792404880198264203736534623944454428139844941472651693022029471848491993183685943513147648405884363738104257007605742989 +20754388933533834100825322037912580568547613711817088293835100523041817897520428204915423109073564283519074976359515977264344279358824248751043959240997867535879701479782231020368024044222705430725406545444064239048619476089066619390667290394378465470942972752451080972074055352195901266103698371775726878668956682476248170687571515187181287311577269324537165671652067311006611419482563073356553165611562700154566461659845210923764397244956812583716635831826942375119145779941207691964910203078483348222930788581350443343975667164248290562625338186544804810551525081626858938589474206185349491221800148063735393205401 +324516949862809758345303002862474961377645439194973538938410591450548129642035470346125652628500938954586391880599950424102224199749221918825723461720334901691645881404372343011261695683117722105930228912242314479467672508292241401852223185178184701838672025508280385038643851245981206101498722223509089807323239552178083662527552277381079776548977009676240467590027487178763224874216654877610699442246763700718687719435790339266935294109776178767027379296862853017851103561528237419004589245866884339503691730106479153415983860756332741367757662222029111825339570502487359755582718666702432323664508064436368519659815534453304407945340379917003458974594535814096826270984559178947841905416543704525185721668684129367017334053593680065915739022531847216980173325505867542740065219816200485502848896914995527864338219689074534068871210413451751906273284255792398757281891890491388470842839273071743091927357645921506355439415493442102464658109633055038493939578303279885288272190174779786344064849728394507845983193135304789400811584254522396412435401440688897857444495328148993339924825601419590895331814966531144708717973356378360042773379830845394743342645568759517685367928108833485070084368529326962380854834569386656019929505179432661195307871726985739249594929893173107042387153774568603285855908161921493396846834314354740048827684199810678294738772124710943641913495155832427606942058151091141815713958594253327042951596176042041749952652177079874186154621350100333089737555883370751512465479629519202512475631484692174685887039149478084120802874320809504881938087236665691345993464695737677381035882281505918790491093373028894650547493611392727618777193196512983777769692279082544427496179031638232322294855811312022295429192992300625144614929504300855781569758179512597309890373619726566762274825198148078593115656045333310863489325861864 1024 -11874699564241518687690443491700634514395972759604377707912079635456861222992849205125090485444776987647238762874921005353350811471883963398478010511538393 -12564960441256167691208284025895433218742840770177136434498040460606896167719793197670987698810439598601138337301743160588203671784105897737036063061865673 -104878396997649574777769308703446994886853182989169431633820586784659102664033627171266288240689132462443403349285534283446657821669081610723332280969135223153177395459946686004756566625036303950419957994314475209612372055181510711869914488998797483128369487831202466141632147090681625026155094694335487871611 -9325320642281033428234776397941397847301090452691616282292236867697166905999442913135667405625638934722524859543933841278780540123289401316000677565863639436218165628586430802424725888906092544165012893899268603387971953058929038426322746647668351236167695874626734233387242391625954391546400659380148429964 -133271679695954341470745532450465907152805377447609531349248494344356750022058505421898460476481739035390787456747634760415929213673190186741272550447341592351855959377539386438223730478470471661985092321294288665726073669666286619675518771469436839984625374406243294508568235343209524058067010675971369910860 -80881871078843321674424396272117466772647761312605021232640988070880295582813833776276717781870254112054009395636205430135636992171686042524566710028208085194138050352204734595112822269209890270158454732973129059444806701026613716688652466800668108583563692727751624131749976124800752635080700618208767393969939787484868070962372936886320569717099919765464292316565234252945572631948544031017301776336218534869470192049693508668191684804911851614310676532924782726716432867543920592920634462903924011427440916593879754351336950740722893287486136485880539335299399048400044459807297279666530365480943197144406041813344093893837609406271382403705663454944571033181248525316115015373851187918673903077024741523747139822445924302396733700545499174514657745693144502913634326166544781203537984403269680188931053338965873545572727845496880840894581090664387665408349319727053044429097122269901694032400658251417319503937681022640 +11996507992516992279253320842292581062160666520989351464727677430545363622909624752429828357902139846961708954806590304184170425725206666034029126912802909 +12008814265280799565103987419767402483829954819751502119597606023071179795547526616494066274921970873158066672032006258316227383661032821726508857994913289 +175256923399008388952199328789176628216182986758691804666539940919269412134675535518697966313359416163675370659232917449503578680315638937033364833448292994394264139045856701033910763268760148256570273713589559402439596472897148812052438334382817294843420906335387432676659490064583412323178213084587154780973 +18007979539261648045632177934878564643971372401135429139436977918990837300273221645787648486593598517389240241143161970975142429543118762167857226067431508505618996038545922031298799833153962869909240154675703432994138048635104265636879900194450410394444044595072434263049923844407996725710737742773311780188 +143853903271182321513002066437781800594236575923874126699682537172658109590368053610720851829462764717070206378605790820999380202727768909909442528835969072851838181427750662301238851974663582332173679853523483031849060352452284455852313419111059942480281399991155392787408705579354065789302332990355458289493 +96244934624211278144276821575816026414304606827369124430811124104088036915846656479352056504521903136314576745013030052035478458510902249607703863923292282355231500176783000259539067530211184592963082497352458162419086420145634722552310325809391731423125461032166672065355823138927670843511796514433636247937620835147658288124557128189713226469405123649048307155362811794489338210538287972979413920294315919042529415711099837869605922964117255609674344211958213024246327128234956318023697337702968329464464883850967450924035725750292752075852590325715211667880447289027204925814455580694366879527847024201216897909013023105117043622119313239666884373534734788685283619237616533391127416747680409602687402198090068566273781333231445668603309023126397448734278201697332506086329858595840132745621689408593322492451975714742778820348459265505655414162554455936880705746847868390321527074729819683659051424325831237928721625847 diff --git a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache index 176ee78d18bdd7a537f18c733f1742fd2bd7cfa5..d1adf225c82fc658b879c8a7730b417b3b1d03bb 100644 --- a/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache +++ b/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache @@ -36,56 +36,16 @@ netinet/in.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 - /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 @@ -102,165 +62,55 @@ 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/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 -../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 +/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h vector - iostream - +../../CRYPTO/DTPKC.h +/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -/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/PPML/PPNB/PPStats.cpp +PPStats.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPStats.h +map +- +math.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/math.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/VFDT/NodeStats.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/PPNB/PPStats.h iostream - map - iterator - -../IO/Record.h -/home/rania/CLionProjects/DAPPLE-2.0/ML/IO/Record.h +../IO/PPRecord.h +/home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h gmpxx.h - gmp.h - +omp.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 - -/home/rania/CLionProjects/DAPPLE-2.0/TEST/TESTBuildingBlocks.h -iostream -- -../CRYPTO/DTPKC.h +../../CRYPTO/DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h -../CRYPTO/EvalAdd.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 +../../CRYPTO/EvalMult.h +/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.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 +../../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 +../../CRYPTO/EvalLog.h +/home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/UTIL/math_util.hh vector diff --git a/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal b/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal index f4705b847043bf697c866811ac95d094e854641b..1b227ee9129ed1e0f1d5769454a58a3b4ef8affb 100644 --- a/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal +++ b/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal @@ -247,6 +247,7 @@ CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAdd.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.h + /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/SkeySwitch.h @@ -263,6 +264,7 @@ CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAdd.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.h + /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h /home/rania/CLionProjects/DAPPLE-2.0/PPML/IO/PPRecord.h @@ -438,6 +440,7 @@ CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/DTPKC.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalAdd.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDiv100.h + /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/SkeySwitch.h @@ -500,6 +503,7 @@ CMakeFiles/DAPPLE.dir/TEST/main.cpp.o /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalDotProd.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalEntropy.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalHBound.h + /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLog.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalLrUpdate.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalMult.h /home/rania/CLionProjects/DAPPLE-2.0/CRYPTO/EvalProba.h diff --git a/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make b/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make index 069b13d3e7ecd85436f815e824a698909384ea54..40d76263654085f74f77e0f90098d0a7d6705d0f 100644 --- a/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make +++ b/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make @@ -246,6 +246,7 @@ CMakeFiles/DAPPLE.dir/PPML/PPLR/PPLR_Classifier.cpp.o: ../UTIL/util_gmp_rand.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/DTPKC.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/EvalAdd.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/EvalDiv100.h +CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/EvalLog.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/EvalMult.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/EvalProba.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../CRYPTO/SkeySwitch.h @@ -262,6 +263,7 @@ CMakeFiles/DAPPLE.dir/PPML/PPNB/PPNB_Classifier.cpp.o: ../UTIL/util_gmp_rand.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/DTPKC.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/EvalAdd.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/EvalDiv100.h +CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/EvalLog.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/EvalMult.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../CRYPTO/EvalProba.h CMakeFiles/DAPPLE.dir/PPML/PPNB/PPStats.cpp.o: ../PPML/IO/PPRecord.h @@ -437,6 +439,7 @@ CMakeFiles/DAPPLE.dir/TEST/TESTNppVFDT.cpp.o: ../UTIL/util_gmp_rand.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/DTPKC.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/EvalAdd.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/EvalDiv100.h +CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/EvalLog.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/EvalMult.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/EvalProba.h CMakeFiles/DAPPLE.dir/TEST/TESTppNB.cpp.o: ../CRYPTO/SkeySwitch.h @@ -499,6 +502,7 @@ CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalDiv100.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalDotProd.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalEntropy.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalHBound.h +CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalLog.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalLrUpdate.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalMult.h CMakeFiles/DAPPLE.dir/TEST/main.cpp.o: ../CRYPTO/EvalProba.h