diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4939549a2e6858a0cc886d47fe83e60903acb9d..325f0d0543ac6254168588c95c36b9b79f5e9bdd 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,15 +14,9 @@
<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$/PPML/EVAL/EvaluateClassification.py" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py" 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/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" />
- <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" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -54,41 +48,44 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="426">
- <caret line="450" column="16" selection-start-line="450" selection-start-column="16" selection-end-line="450" selection-end-column="16" />
+ <state relative-caret-position="450">
+ <caret line="328" selection-start-line="328" selection-end-line="328" />
<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" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:42:50-Stats.csv">
+ <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="15">
- <caret line="1" column="74" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="85" />
+ <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>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="399">
- <caret line="513" column="61" selection-start-line="513" selection-start-column="61" selection-end-line="513" selection-end-column="61" />
- <folding>
- <element signature="e#52#93#0" expanded="true" />
- </folding>
+ <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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-14:10:32-Stats.csv">
+ <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="45">
- <caret line="3" selection-start-line="3" selection-end-line="3" />
+ <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>
</provider>
</entry>
@@ -96,8 +93,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="169">
- <caret line="175" column="72" selection-start-line="175" selection-start-column="70" selection-end-line="175" selection-end-column="72" />
+ <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" />
<folding>
<element signature="e#0#20#0" expanded="true" />
</folding>
@@ -106,28 +103,34 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:15:33-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="15">
- <caret line="1" column="87" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="87" />
+ <state relative-caret-position="45">
+ <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-16:04:58-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="870">
+ <caret line="472" selection-start-line="472" selection-end-line="472" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#92#1009#0" />
+ <element signature="e#1011#1262#0" />
+ <element signature="e#1264#3020#0" />
+ <element signature="e#3022#3397#0" />
+ <element signature="e#3399#3664#0" />
+ <element signature="e#3666#4038#0" />
+ <element signature="e#4041#5181#0" />
+ <element signature="e#5184#5457#0" />
+ <element signature="e#5459#5989#0" />
+ <element signature="e#5992#7352#0" />
+ <element signature="e#7356#8985#0" />
+ <element signature="e#8988#11212#0" />
+ </folding>
</state>
</provider>
</entry>
@@ -135,8 +138,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="409">
- <caret line="752" column="1" selection-start-line="752" selection-end-line="753" />
+ <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>
@@ -147,8 +150,17 @@
<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="313">
- <caret line="77" column="44" selection-start-line="77" selection-start-column="28" selection-end-line="77" selection-end-column="44" />
+ <state relative-caret-position="-600">
+ <caret line="125" selection-start-line="125" selection-end-line="125" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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>
</provider>
</entry>
@@ -157,8 +169,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>AVC</find>
- <find>Classify</find>
<find>one=</find>
<find>one =</find>
<find>if</find>
@@ -187,6 +197,8 @@
<find>evalu</find>
<find>dese</find>
<find>SU</find>
+ <find>trainTimeMU</find>
+ <find>MU</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -258,14 +270,14 @@
<option value="$PROJECT_DIR$/Scripts/TestPPLR1.sh" />
<option value="$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
<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>
- <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
+ <component name="OCFindUsagesOptions" text="false" ivars="false" properties="true" derivedClasses="false" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="33" />
<option name="y" value="6" />
@@ -293,18 +305,19 @@
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="CRYPTO" 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="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="DebugNb" type="462c0819:PsiDirectoryNode" />
+ <item name="DebugPPNB" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
@@ -315,12 +328,19 @@
<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="EVAL" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="TEST" type="462c0819:PsiDirectoryNode" />
+ <item name="PPML" type="462c0819:PsiDirectoryNode" />
+ <item name="PPLR" 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>
</expand>
<select />
@@ -458,14 +478,8 @@
<workItem from="1578400995489" duration="2901000" />
<workItem from="1578409400958" duration="17369000" />
<workItem from="1578490199097" duration="52805000" />
- <workItem from="1579510466382" duration="14610000" />
- </task>
- <task id="LOCAL-00037" summary="10/01/2019 : Preparing tests for Nassim">
- <created>1547160647775</created>
- <option name="number" value="00037" />
- <option name="presentableId" value="LOCAL-00037" />
- <option name="project" value="LOCAL" />
- <updated>1547160647775</updated>
+ <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>
@@ -803,11 +817,18 @@
<option name="project" value="LOCAL" />
<updated>1578848478692</updated>
</task>
- <option name="localTasksCounter" value="86" />
+ <task id="LOCAL-00086" summary="New tests for the S&P paper">
+ <created>1579538329823</created>
+ <option name="number" value="00086" />
+ <option name="presentableId" value="LOCAL-00086" />
+ <option name="project" value="LOCAL" />
+ <updated>1579538329823</updated>
+ </task>
+ <option name="localTasksCounter" value="87" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1177370000" />
+ <option name="totallyTimeSpent" value="1186722000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -819,22 +840,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="67" y="25" width="1853" height="935" extended-state="6" />
+ <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.23353624" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.23630327" />
<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.49418926" weight="0.32600382" />
- <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.62202543" visible="true" weight="0.5669975" />
+ <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="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.47924736" weight="0.41315135" />
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.37797454" side_tool="true" visible="true" weight="0.5669975" />
+ <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="Version Control" order="11" sideWeight="0.4864416" weight="0.32026768" />
<window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7094632" weight="0.36466166" />
@@ -1085,7 +1106,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>155</line>
+ <line>159</line>
<option name="timeStamp" value="612" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1329,7 +1350,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>143</line>
+ <line>145</line>
<option name="timeStamp" value="870" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1528,40 +1549,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalEntropy.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="346">
- <caret line="252" column="4" selection-start-line="252" selection-start-column="4" selection-end-line="252" selection-end-column="4" />
- <folding>
- <element signature="e#205#222#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalHBound.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="391">
- <caret line="167" column="4" selection-start-line="167" selection-start-column="4" selection-end-line="167" selection-end-column="4" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="376">
- <caret line="170" selection-start-line="170" selection-end-line="170" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalMult.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="416">
- <caret line="198" selection-start-line="198" selection-end-line="198" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
@@ -1726,13 +1713,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="29" column="11" lean-forward="true" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/TEST/TESTNppVFDT.cpp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1752,28 +1732,6 @@
</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="7140">
- <caret line="476" selection-start-line="476" selection-end-line="476" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- <element signature="e#92#1009#0" />
- <element signature="e#1011#1262#0" />
- <element signature="e#1264#3020#0" />
- <element signature="e#3022#3397#0" />
- <element signature="e#3399#3664#0" />
- <element signature="e#3666#4038#0" />
- <element signature="e#4041#5181#0" />
- <element signature="e#5184#5457#0" />
- <element signature="e#5459#5989#0" />
- <element signature="e#5992#7352#0" />
- <element signature="e#7356#8985#0" />
- <element signature="e#8988#11212#0" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/Scripts/TestPPNB.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -1853,6 +1811,20 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:42:50-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="15">
+ <caret line="1" column="74" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="85" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-14:10:32-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="45">
+ <caret line="3" selection-start-line="3" selection-end-line="3" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:15:33-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
@@ -1860,78 +1832,123 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-16:04:58-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <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.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">
+ <caret line="2" column="87" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="87" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="313">
- <caret line="77" column="44" selection-start-line="77" selection-start-column="28" selection-end-line="77" selection-end-column="44" />
+ <state relative-caret-position="-600">
+ <caret line="125" selection-start-line="125" selection-end-line="125" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="409">
- <caret line="752" column="1" selection-start-line="752" selection-end-line="753" />
+ <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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:42:50-Stats.csv">
+ <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="15">
- <caret line="1" column="74" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="85" />
+ <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$/PPML/PPNB/PPStats.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="169">
- <caret line="175" column="72" selection-start-line="175" selection-start-column="70" selection-end-line="175" selection-end-column="72" />
+ <state relative-caret-position="870">
+ <caret line="472" selection-start-line="472" selection-end-line="472" />
<folding>
- <element signature="e#0#20#0" expanded="true" />
+ <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#92#1009#0" />
+ <element signature="e#1011#1262#0" />
+ <element signature="e#1264#3020#0" />
+ <element signature="e#3022#3397#0" />
+ <element signature="e#3399#3664#0" />
+ <element signature="e#3666#4038#0" />
+ <element signature="e#4041#5181#0" />
+ <element signature="e#5184#5457#0" />
+ <element signature="e#5459#5989#0" />
+ <element signature="e#5992#7352#0" />
+ <element signature="e#7356#8985#0" />
+ <element signature="e#8988#11212#0" />
</folding>
</state>
</provider>
</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>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="426">
- <caret line="450" column="16" selection-start-line="450" selection-start-column="16" selection-end-line="450" selection-end-column="16" />
+ <state relative-caret-position="450">
+ <caret line="328" selection-start-line="328" selection-end-line="328" />
<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" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="399">
- <caret line="513" column="61" selection-start-line="513" selection-start-column="61" selection-end-line="513" selection-end-column="61" />
+ <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" />
<folding>
- <element signature="e#52#93#0" expanded="true" />
+ <element signature="e#0#20#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-14:10:32-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="45">
- <caret line="3" selection-start-line="3" selection-end-line="3" />
+ <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-16:04:58-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="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>
</provider>
</entry>
diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config
index a9c2db376214e158845b62f1a95ea064028b8ba9..c8acb59decde8f379c1809baa3511d94d68d40bc 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="true";
+ debug="false";
maxTrainSize="20";
maxTestSize="20";
}
diff --git a/PPML/PPNB/PPNB_Classifier.cpp b/PPML/PPNB/PPNB_Classifier.cpp
index 1021ad4871a5be675d918dc3e58e6b9027b85f1f..47ef5b5a38a93a80e64d9e486a74e1dd169dc212 100755
--- a/PPML/PPNB/PPNB_Classifier.cpp
+++ b/PPML/PPNB/PPNB_Classifier.cpp
@@ -206,9 +206,9 @@ void PPNB_Classifier::Test() {
this->testTime = duration.count();
this->testTimeSU = dtpkc.timeSU;
+ this->testTimeMU = dtpkc.timeMU;
this->testBdw = dtpkc.bdwSU + dtpkc.bdwMU;
- this->testTimeMU = this->testTime - this->testTimeSU;
dtpkc.timeSU = 0.0;
dtpkc.timeMU = 0.0;
@@ -216,8 +216,6 @@ void PPNB_Classifier::Test() {
dtpkc.bdwSU = 0.0;
-
-
inter.close();
//currentModel->print();
@@ -280,6 +278,7 @@ void PPNB_Classifier::train() {
dtpkc.bdwSU = 0.0;
extTrainBd = 0;
+
auto begin = chrono::high_resolution_clock::now();
while (counter < size) {
@@ -314,10 +313,10 @@ void PPNB_Classifier::train() {
this->trainTime = duration.count();
//cout << "dtpkc.timeSU " << dtpkc.timeSU << " this->trainTimeSU " << this->trainTimeSU << " this->trainTime " << this->trainTime << endl;
- //this->trainTimeSU += dtpkc.timeSU;
+ this->trainTimeMU += dtpkc.timeMU;
+ this->trainTimeSU += dtpkc.timeSU;
this->trainBdw += dtpkc.bdwSU + dtpkc.bdwMU;
- this->trainTimeSU = this->trainTime - this->trainTimeMU;
dtpkc.timeSU = 0.0;
dtpkc.timeMU = 0.0;
diff --git a/PPML/PPNB/PPStats.cpp b/PPML/PPNB/PPStats.cpp
index 3f5259428ff041bae6b0bcef537fe2c358a260a0..fea7a164a09b0127acbb49bbe120bb3afb4dfa77 100755
--- a/PPML/PPNB/PPStats.cpp
+++ b/PPML/PPNB/PPStats.cpp
@@ -130,6 +130,8 @@ PPStats::InitStats() {
LogproProba.insert(std::make_pair(i->first, C_C));
PPNB_Classifier::trainTimeMU += evalDiv100.timeMU;
PPNB_Classifier::trainTimeMU += evalLog.timeMU;
+ PPNB_Classifier::trainTimeSU += evalDiv100.timeSU;
+ PPNB_Classifier::trainTimeSU += evalLog.timeSU;
PPNB_Classifier::trainBdw += evalDiv100.bdwMU + evalDiv100.bdwSU + evalLog.bdwMU + evalLog.bdwSU;
};
@@ -147,8 +149,10 @@ PPStats::InitStats() {
int ithread = omp_get_thread_num();
int nthreads = omp_get_num_threads();
double costTimeDiv = 0.0;
+ double costTimeDivSU = 0.0;
double costBdwDiv =0.0;
double costTimeLog= 0.0;
+ double costTimeLogSU= 0.0;
double costBdwLog =0.0;
for (auto j = dataAVC.begin(); j!=dataAVC.end(); ++j, cnt++) {
if(cnt%nthreads != ithread) continue;
@@ -173,6 +177,7 @@ PPStats::InitStats() {
probaxjkl = evalDiv100.EvalDiv_U1_step3(
evalDiv100.EvalDiv_U2_step2(res1[0], res1[1], res1[2], res1[3]));
costTimeDiv = evalDiv100.timeMU;
+ costTimeDivSU = evalDiv100.timeSU;
costBdwDiv = evalDiv100.bdwMU + evalDiv100.bdwSU;
}
@@ -184,6 +189,7 @@ PPStats::InitStats() {
//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;
}
//cdProbaValues.insert(std::make_pair(k.first, cdProbaClasses));
@@ -201,6 +207,7 @@ 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::trainBdw += size*(costBdwLog + costBdwDiv);
};
diff --git a/SER/dtpkc.ser b/SER/dtpkc.ser
index de5dd2c32efa73b2a9d639f14061321dddfca7d6..94a908eee5deabf8848ae6669d5497a1568ac01f 100644
--- a/SER/dtpkc.ser
+++ b/SER/dtpkc.ser
@@ -1,11 +1,11 @@
-144338374988220331082992977978653113418374672187527808523025892265964501981668662325176672554308772153109550533059807956311800922325340219731531350996602594111989539440567222959248439373898475406489198152194332583298193446538311712061470897558013222066631241252898449519227824291273485962802043240577825810817
--11254212703100368368648198119614804341207888578234626923672958248792461969807656211357538198511177060156569828604932591639004807023889875826415860060389977320284588429779257587991716976684185647615406062181920433618212127195661224197705149953587131776046947953821765385552065926022497061783766852991173271008757587032017148677961064801682641954933236554525784211823878073054269896133717471156950001046323280428814631430096687301640997680945437523989697799343599391777537382526766396772101196075014522343153245272270997441983078712111175162380905107372511503881410266039836356303347036753482289266591037665433026665647
-20833566494240108461101153755493451546059979559400294609925285215757710316409594611434780870571285972894735614721862692755564310002886529811529659889745424116250742383715118680321014783019197414067695724198103136944950926810775130116546345626760425861839494769371999426829814580025553420740970725902418038617437782975720519189599250968460159857450690624342474315827623391808459549628698550723669891452821308491028183624460519211666162106771462130350270841823531525207735694131837646322205350723385455134276416279199567308586764837886704533525175387626981168011224530478369064461087926730014673168470121806323474207489
-711491450028367984842360811427569802154710044054071363910603788615760778303292937829561398886649521186673370487017111667473711492984819431579993856229134367033621796554097132062572389168006268810464953875826796265030437567597836336873313970410274124112845815211728689675200139987944674794861441292478784466805742724867694354377480733079817029465500996661169226905922462431466387846844243510131410840756831894071550393737364658955704136759976894775004903587374186078056289165979995876034560504434458352699301885107518263998564955793087094846659755864516022795116918318453241197018688750651776990021926514766159106879078551521687316277276174539964860315695729835278900178143321838011651092057516084965209700069862193812722555125836361521135709586875261299782676999359755751831114437999699027857713170276629267704564899712774533856101869370499031001855426403312991127371944892393145872884591276400498986068446155018593829088709905687598894492000051266564018239965409933852086404114789050606086059436952077028208447637175316937061926107461238642800554025310757639724186734171510587652008136799093495934662208315352415053839898824776812948996366735387288038006293137486666894336159088878609306197733452242539837374214047453123672885776721506566127176936397660252353347133406132492411774845228670842974002617635430226203623153211388830843344261068757019450291175041346840480845439615469436490184082834474266561245488894081580765927539665575469148312235507493078064327796528405020732110607514554282077784910804619815970435921134085491773717023924626244214971012767661854830245528863930713620278672228286777511043829043092648747208895714877954282590863179476643435773685677755434260997658195492060803908929783098559612710888093297148816967535262306142857740925489798216203493737428101919473778409033249588635156357207191566083383497300042515470703125000
+132652683575526803148911294357422212377499327845149868356073014542176283487019122009201061850480352064061900153007901960693565104678338612283730577394650502658210542677191502844542093690869352515645340190970368297664451039299816268545700464888981225385074630282762573013671002812817142066678550090279068355879
+-5127353447089521785926870925987224897646781692415335087405458170202404661178312911806987453043295819223119072657238434077905579598888211289693965080737509021763598452120282934133630833441404488741607866042147891057777952416780573475659650448055536035291673877522418272887848601644957975069674365190338422160004348795230856496086250297991793023456998501007370572790981922682723236435095264860483129700361307424948928916809042675430922715736989768701354758619658190738475986463964559807548614335189319534299370729226597374072186937049222221236829420581179424725657975380919437416488076404132118083214699137346471297005
+17596734459788838483462964593835326237755053347532756154498855715447767473129846679186717295537121587549222612122981980401721219235801927442020229809588747648001780329558457791386807139634347780436147233194920234652107150463938488346749820806678889786624293148505863093559352372180935537952429102622076214601549874949770135330089630068523976959294829328295246234923553501451419143905431611466512760179140037226071574727803061417378814175019942820889069220497040565108941638536576607419011784153003860246987686911377204638143476670657882525145679818639416520411432968163120051694730554270110428101574105473008193862641
+3033063132347984277699558203450275220326004229271873134201584491118994986911542945605503520229472517818167368059740613167810400380854968604372918708082148228625406132843113500468393005026203799600885332688967087985405737381291930364923558177935235237522098978886277339062414916073475807849993917521388137342180670170107186909842566458824482504767189203015691322371212705240386665056258743152995283979264894754602705518082348438343804856735511365565325084143507058825647176756848995362945349355300850343054927826818614126042339957911782287210214713150645635209986837352014545539426839428683958261001061588536950711973871829001377157779799129371425276693795745210974800669487236805782068449531311748717781837298302134621772981158780416958320588138846792599855741922583237296521805799295078127963327008010973525745190130720828527333585895470587164540609674645391922692012979458527137091806635057720250111497197145610577009168307249331063406863231690731383929179575576488465492670605831889930427050376684252560918460067218656260787449914979715951923996242299229213418201129778399626803000856415840690030898499583058005467124119697682222921931841844244979807161482377043605815427834483535535462432993497478784984690814562994903718220179323137685044648032517871401882523200898681620938316124396654576499198452213309794820170174436464762417479494297705248944808629397849345723032147714267705530780194541100596306034261291876373473430566861402903959123395265007165470232567625577739585996710938454304775793307267244296731257306063520868082986343296376859003356231742611371083308441095914642459866570383410145192295398039339490305896886214212632936048425775680677270316787695860720141664251389010109102401985345489578914964841433806631669934080480127599592862681306575233782106447971910818373964153897085612596243382426893745872142767081731833091493704753000
1024
-12243427704620470954026315490635153662667328998637368820255752042845145722226079343508638073801170213342812835113867035177273750082242895525677315455721443
-11789049477847561463120268123725230285272301601360333899152048796135248734079790474217402446903253669081016164481021062247903475029825786573147555445343819
-97557326290052027016517920863224086104301047402718527679061750064234417225191158782687883679108393530711110249079724621563157338534037591363158092015843514235136155676150810919474807618858126497505282480043887012048567898825588630977356880116950581260241853789305902330745543828551063634520777598318814719519
-36084593747055082770748244494663278354593668046881952130756473066491125495417165581294168138577193038277387633264951989077950230581335054932882837749150642519878089243133701453166206253378631866714649538622903293874338616535963851547913292879373129410687204355974713657782599778512093473529986103926731186389
-58713233929900801363232153471056487089142124573520611513780494598588045411506092092172859281292974859560097407306508973518274674205631657924243071092714386492811511500564443674357839418006295205701901256894023244405322921873878172748074900880580465492060487143258788310669068827907262493043483055406836022878
-283259982011214453620594767728205763576741345186341269355326684105896391484149751735076551757028307081835041699337327819941652245055275703069500219896653239732817002010828970580214411542901533184288710343616555738091793840073113947066853863117258883003393427509609923582978143050006606119122078324935406786374684223518249990844100704629546998537527423142955716304346606657943676594680126141785486867100224816701536240790787684234904507980946187014724105175770317484528780977243271640078522134321055081866499233040084762658185806027498452773212462128568803380368864820464028639927032175093927230714391712325156159906541272414707566218347055063680487378644015997428529057712259207320807612802913288902895546153085601388374676057153982461238677555628702599406403117000488147561496948817127165681377487287637096752786546597764881428111135022136862963132077991906880470321990115789235393739981486904430386062098093821005353347416
+13119243662631289225817146708799106079051744890346379645368881432360141266071200595474649297922033563699801074414546918418019060080370830891640655218670691
+10111305726668776066575817264247262080502678285244016226107683874672343739258849758183599947567477047027509714985125805814941173089559368190196799721340269
+178755742329101091159270398210728815203355387271099068462570910975636684762482401968534087177538341630413150516979192455567451691502643212668262146644588358414944475050432130323587380798369141810361525732604517856066205157694299965490904317365087242325023082838254537398031312146673382436292425651064419377393
+33163170893881700787227823589355553094374831961287467089018253635544070871754780502300265462620088016015475038251975490173391276169584653070932644348662619856915288344281552612894530161125298240305541150143624205274786001703702734623836701659933933968615975742993293335236692463145993034119867063206032086230
+172029248902680159059092970324936127674670065892365005790259750419936953896350774492714058900683033958851833328642342124330459723120291106747249699890272225745375126782824252283152627935129798825595100454611913931376801276951734983357744544825214928140635652923928993387764910358304243133085710543750973622350
+17607800342669535804459101620228327433355102211715277630138429223085937191931897523900485860525145518619549622061821739073997036693810369437876472882733435752121399270376546725845194788311879454578097678462563997228166846071008358052670567456435612365051046464853290100654642148286605992011488719892929959134710375761398971709487636235700864505668203193936440857428292844953144642289878074383687503602744904886540040456332071424755211850163556880054805473963154073527252311192532655296374107341387059039545531524747752231908028677535849994837920718811718163271602085701306603606460658109872104134751044982111945173451618171035771421763476459107070207154500501517974962551549699959649561490747808465197589906900531340820056756574773251645877424678401728619623208958920667412062281245499494722225186380220043034999734714811689128126168078035626601777134683490084020140826611851938966447482507817207434827792276861699270976270