diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4468761efe5247132033fb80151f24e27615096..a0c224ba136b614d1da72eb448fa73868aff3e8d 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,12 +14,16 @@
<list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="New tests for the S&P paper">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CONFIG/DAPPLE.config" beforeDir="false" afterPath="$PROJECT_DIR$/CONFIG/DAPPLE.config" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.h" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/DATA/Datasets/Nursery/DO_1.enc" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/DO_1.enc" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/testing.enc" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/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$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" afterDir="false" />
</list>
@@ -50,59 +54,51 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="297">
- <caret line="216" column="22" lean-forward="true" selection-start-line="216" selection-start-column="22" selection-end-line="217" selection-end-column="22" />
+ <state relative-caret-position="8135">
+ <caret line="742" column="27" selection-start-line="742" selection-start-column="27" selection-end-line="742" selection-end-column="27" />
<folding>
- <element signature="e#0#17#0" expanded="true" />
- <element signature="e#373#2168#0" />
- <element signature="e#2170#2586#0" />
- <element signature="e#2624#2889#0" />
- <element signature="e#2891#3263#0" />
- <element signature="e#6456#7877#0" />
- <element signature="e#7880#10803#0" />
+ <element signature="e#21038#21680#0" />
+ <element signature="e#21683#21913#0" />
+ <element signature="e#24556#27388#0" />
</folding>
</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/PPVFDT/PPNodeStats.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="32" column="20" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="20" />
+ <state relative-caret-position="135">
+ <caret line="42" selection-start-line="42" selection-end-line="42" />
+ <folding>
+ <element signature="e#325#344#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:28:45-Stats.csv">
+ <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="30">
- <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="74" />
+ <state relative-caret-position="225">
+ <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" />
- <folding>
- <element signature="e#0#20#0" expanded="true" />
- </folding>
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:36:01-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="177">
- <caret line="525" column="116" selection-start-line="525" selection-start-column="116" selection-end-line="525" selection-end-column="116" />
+ <state relative-caret-position="-200">
+ <caret line="472" column="34" selection-start-line="472" selection-start-column="34" selection-end-line="472" selection-end-column="34" />
<folding>
<element signature="e#52#93#0" expanded="true" />
</folding>
@@ -111,64 +107,56 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:22:24-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" />
+ <state relative-caret-position="75">
+ <caret line="5" column="128" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="128" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7080">
- <caret line="472" selection-start-line="472" selection-end-line="472" />
+ <state relative-caret-position="345">
+ <caret line="639" selection-start-line="639" selection-end-line="639" />
<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" />
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#264#7839#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5265">
- <caret line="516" selection-start-line="516" selection-end-line="516" />
+ <state relative-caret-position="115">
+ <caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
- <element signature="e#227#244#0" expanded="true" />
+ <element signature="e#166#185#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="373">
- <caret line="60" selection-start-line="60" selection-end-line="60" />
+ <state relative-caret-position="325">
+ <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+ <folding>
+ <element signature="e#186#209#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="36" selection-start-line="36" selection-end-line="36" />
+ <state relative-caret-position="185">
+ <caret line="89" column="70" selection-start-line="89" selection-start-column="70" selection-end-line="89" selection-end-column="70" />
</state>
</provider>
</entry>
@@ -177,10 +165,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>one =</find>
- <find>if</find>
- <find>train</find>
- <find>Update</find>
<find>class</find>
<find>classif</find>
<find>omp</find>
@@ -207,6 +191,10 @@
<find>trainTimeMU</find>
<find>MU</find>
<find>bdw</find>
+ <find>dtpkc.</find>
+ <find>Inform</find>
+ <find>informationGain</find>
+ <find>PPVFDT</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -231,11 +219,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/TEST/TESTElementaryOps.h" />
- <option value="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" />
- <option value="$PROJECT_DIR$/TEST/TESTpacking.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalAddPow2.h" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalCmp.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalCmp100.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalDiv.h" />
<option value="$PROJECT_DIR$/CRYPTO/EvalDiv100.h" />
@@ -268,9 +251,7 @@
<option value="$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
- <option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalExpo.cpp" />
<option value="$PROJECT_DIR$/Scripts/TestPPLR1.sh" />
@@ -278,10 +259,17 @@
<option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h" />
<option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
+ <option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" />
- <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" />
+ <option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" />
<option value="$PROJECT_DIR$/TEST/main.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
+ <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
</list>
</option>
</component>
@@ -298,6 +286,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -313,35 +302,36 @@
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="DATA" 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="DEBUG-VFDT" 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="Tuning" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="EXP" type="462c0819:PsiDirectoryNode" />
- <item name="DebugPPNB" type="462c0819:PsiDirectoryNode" />
+ <item name="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" />
<item name="PPML" type="462c0819:PsiDirectoryNode" />
- <item name="PPNB" type="462c0819:PsiDirectoryNode" />
+ <item name="PPVFDT" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
@@ -352,7 +342,6 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -486,14 +475,10 @@
<workItem from="1578490199097" duration="52805000" />
<workItem from="1579510466382" duration="15110000" />
<workItem from="1579596546931" duration="12503000" />
- <workItem from="1579687298370" duration="8960000" />
- </task>
- <task id="LOCAL-00039" summary="10/01/2019 : Preparing tests for Nassim">
- <created>1547323783222</created>
- <option name="number" value="00039" />
- <option name="presentableId" value="LOCAL-00039" />
- <option name="project" value="LOCAL" />
- <updated>1547323783222</updated>
+ <workItem from="1579687298370" duration="11565000" />
+ <workItem from="1579704162533" duration="4384000" />
+ <workItem from="1579733182270" duration="5798000" />
+ <workItem from="1579786820041" duration="8883000" />
</task>
<task id="LOCAL-00040" summary="LR npp part 1">
<created>1552450240194</created>
@@ -831,11 +816,18 @@
<option name="project" value="LOCAL" />
<updated>1579617836597</updated>
</task>
- <option name="localTasksCounter" value="88" />
+ <task id="LOCAL-00088" summary="New tests for the S&P paper">
+ <created>1579701349750</created>
+ <option name="number" value="00088" />
+ <option name="presentableId" value="LOCAL-00088" />
+ <option name="project" value="LOCAL" />
+ <updated>1579701349751</updated>
+ </task>
+ <option name="localTasksCounter" value="89" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1199333000" />
+ <option name="totallyTimeSpent" value="1221003000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -847,21 +839,21 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="67" y="25" width="1853" height="1175" extended-state="6" />
+ <frame x="67" y="25" width="1853" height="925" extended-state="6" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.32761484" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.22080797" />
<window_info id="Structure" order="1" sideWeight="0.2735043" side_tool="true" weight="0.3390558" />
<window_info id="Favorites" order="2" sideWeight="0.19466667" side_tool="true" weight="0.28113064" />
<window_info anchor="bottom" id="Database Changes" order="0" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" sideWeight="0.49363586" weight="0.32600382" />
- <window_info anchor="bottom" id="Run" order="3" sideWeight="0.66795796" visible="true" weight="0.5086042" />
- <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5207526" weight="0.53441685" />
+ <window_info anchor="bottom" id="Run" order="3" sideWeight="0.6591035" visible="true" weight="0.35050252" />
+ <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5196458" weight="0.53266335" />
<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.47426674" weight="0.41300192" />
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.33204207" side_tool="true" visible="true" weight="0.5086042" />
+ <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.4648589" weight="0.41080403" />
+ <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.34089652" side_tool="true" visible="true" weight="0.35050252" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.50359714" weight="0.40935114" />
<window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.4864416" weight="0.32026768" />
<window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7094632" weight="0.36466166" />
@@ -1131,7 +1123,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>1007</line>
+ <line>1019</line>
<option name="timeStamp" value="699" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1166,102 +1158,102 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>297</line>
+ <line>331</line>
<option name="timeStamp" value="770" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>298</line>
+ <line>332</line>
<option name="timeStamp" value="771" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>315</line>
+ <line>352</line>
<option name="timeStamp" value="772" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>326</line>
+ <line>364</line>
<option name="timeStamp" value="773" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>650</line>
+ <line>727</line>
<option name="timeStamp" value="775" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>192</line>
+ <line>195</line>
<option name="timeStamp" value="776" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>193</line>
+ <line>196</line>
<option name="timeStamp" value="777" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>194</line>
+ <line>197</line>
<option name="timeStamp" value="778" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>205</line>
+ <line>208</line>
<option name="timeStamp" value="779" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>206</line>
+ <line>209</line>
<option name="timeStamp" value="780" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>207</line>
+ <line>210</line>
<option name="timeStamp" value="781" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>195</line>
+ <line>198</line>
<option name="timeStamp" value="782" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp</url>
- <line>199</line>
+ <line>202</line>
<option name="timeStamp" value="783" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>417</line>
+ <line>476</line>
<option name="timeStamp" value="784" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>414</line>
+ <line>473</line>
<option name="timeStamp" value="785" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>415</line>
+ <line>474</line>
<option name="timeStamp" value="786" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>452</line>
+ <line>513</line>
<option name="timeStamp" value="787" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>453</line>
+ <line>514</line>
<option name="timeStamp" value="788" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>454</line>
+ <line>515</line>
<option name="timeStamp" value="789" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>455</line>
+ <line>516</line>
<option name="timeStamp" value="790" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1276,27 +1268,27 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>337</line>
+ <line>377</line>
<option name="timeStamp" value="823" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>338</line>
+ <line>378</line>
<option name="timeStamp" value="825" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>339</line>
+ <line>379</line>
<option name="timeStamp" value="826" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>349</line>
+ <line>389</line>
<option name="timeStamp" value="827" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>227</line>
+ <line>256</line>
<option name="timeStamp" value="828" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1306,17 +1298,17 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>384</line>
+ <line>440</line>
<option name="timeStamp" value="831" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>385</line>
+ <line>441</line>
<option name="timeStamp" value="832" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
- <line>387</line>
+ <line>444</line>
<option name="timeStamp" value="833" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1426,7 +1418,7 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>892</line>
+ <line>904</line>
<option name="timeStamp" value="942" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1436,12 +1428,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>920</line>
+ <line>932</line>
<option name="timeStamp" value="945" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/main.cpp</url>
- <line>922</line>
+ <line>934</line>
<option name="timeStamp" value="946" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1464,51 +1456,61 @@
<line>178</line>
<option name="timeStamp" value="979" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url>
<line>377</line>
<option name="timeStamp" value="997" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/ML/VFDT/VFDT_Classifier.cpp</url>
<line>336</line>
<option name="timeStamp" value="1010" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
<line>46</line>
<option name="timeStamp" value="1011" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
<line>47</line>
<option name="timeStamp" value="1012" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
<line>60</line>
<option name="timeStamp" value="1013" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
<line>12</line>
<option name="timeStamp" value="1015" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
<line>11</line>
<option name="timeStamp" value="1016" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
- <line>655</line>
+ <line>638</line>
<option name="timeStamp" value="1019" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp</url>
- <line>656</line>
+ <line>639</line>
<option name="timeStamp" value="1020" />
</line-breakpoint>
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
+ <line>130</line>
+ <option name="timeStamp" value="1023" />
+ </line-breakpoint>
+ <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+ <url>file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp</url>
+ <line>665</line>
+ <option name="timeStamp" value="1024" />
+ </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/DATA/Scripts/Clean_Adult.py</url>
<line>8</line>
@@ -1555,143 +1557,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSub2.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="446">
- <caret line="59" column="1" selection-start-line="59" selection-start-column="1" selection-end-line="59" selection-end-column="1" />
- <folding>
- <element signature="e#0#21#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="441">
- <caret line="142" selection-start-line="142" selection-end-line="142" />
- <folding>
- <element signature="e#0#27#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalThreashold.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="16" column="18" selection-start-line="15" selection-end-line="17" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="420">
- <caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="35" column="10" selection-start-line="34" selection-end-line="35" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="406">
- <caret line="45" column="16" selection-start-line="44" selection-end-line="47" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAdd.cpp">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="311">
- <caret line="124" column="12" selection-start-line="123" selection-end-line="128" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp100.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" column="42" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="54" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="351">
- <caret line="104" column="91" selection-start-line="101" selection-start-column="2" selection-end-line="104" selection-end-column="91" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
- <caret line="82" column="43" selection-start-line="82" selection-start-column="38" selection-end-line="82" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalAddPow2.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="32" selection-start-line="31" selection-end-line="34" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="465">
- <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="519" column="10" selection-start-line="519" selection-start-column="8" selection-end-line="519" selection-end-column="10" />
- <folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#264#7839#0" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalExpo.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1244">
- <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
- <folding>
- <element signature="e#0#21#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2265">
- <caret line="151" column="1" lean-forward="true" selection-start-line="151" selection-start-column="1" selection-end-line="151" selection-end-column="1" />
- <folding>
- <element signature="e#0#24#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTNppVFDT.cpp">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTppNB.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="975">
- <caret line="65" column="27" selection-start-line="65" selection-start-column="27" selection-end-line="65" selection-end-column="27" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/TEST/TESTCryptoDatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -1756,23 +1621,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="312">
- <caret line="107" column="44" selection-start-line="107" selection-start-column="44" selection-end-line="107" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLog.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1155">
- <caret line="98" column="45" selection-start-line="98" selection-start-column="45" selection-end-line="98" selection-end-column="45" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-20-13:09:09-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -1861,17 +1709,120 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:26:54-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:28:45-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="30">
+ <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="74" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="30">
+ <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="144">
+ <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" />
+ <folding>
+ <element signature="e#0#20#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:54:20-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <element signature="e#0#18#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1365">
+ <caret line="91" column="66" selection-start-line="91" selection-start-column="50" selection-end-line="91" selection-end-column="66" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSqrt.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2355">
+ <caret line="157" column="10" selection-start-line="157" selection-start-column="4" selection-end-line="157" selection-end-column="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1725">
+ <caret line="115" column="1" selection-start-line="115" selection-start-column="1" selection-end-line="115" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.h">
+ <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="1275">
+ <caret line="85" column="29" selection-start-line="85" selection-start-column="16" selection-end-line="85" selection-end-column="29" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="3210">
+ <caret line="214" selection-start-line="214" selection-end-line="218" selection-end-column="21" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.h">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.h">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
<entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="36" selection-start-line="36" selection-end-line="36" />
+ <state relative-caret-position="420">
+ <caret line="28" selection-start-line="28" selection-end-line="34" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="326">
+ <caret line="64" selection-start-line="64" selection-end-line="64" />
+ <folding>
+ <element signature="e#348#851#0" />
+ <element signature="e#855#1369#0" />
+ <element signature="e#1559#2847#0" />
+ <element signature="e#2849#4085#0" />
+ <element signature="e#4088#4457#0" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5265">
- <caret line="516" selection-start-line="516" selection-end-line="516" />
+ <state relative-caret-position="-3364">
+ <caret line="495" column="27" selection-start-line="495" selection-start-column="27" selection-end-line="495" selection-end-column="27" />
<folding>
<element signature="e#227#244#0" expanded="true" />
</folding>
@@ -1880,70 +1831,107 @@
</entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="373">
- <caret line="60" selection-start-line="60" selection-end-line="60" />
+ <state relative-caret-position="56">
+ <caret line="62" column="9" selection-start-line="62" selection-start-column="9" selection-end-line="62" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:26:54-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/BankCipher-2019-06-25-15:04:30-Config.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:28:45-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryClearVFDT-2019-06-26-09:47:17-Config.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="74" />
+ <state relative-caret-position="195">
+ <caret line="13" column="23" selection-end-line="68" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="185">
+ <caret line="89" column="70" selection-start-line="89" selection-start-column="70" selection-end-line="89" selection-end-column="70" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:22:24-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
- <caret line="32" column="20" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="20" />
+ <caret line="5" column="128" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="128" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="177">
- <caret line="525" column="116" selection-start-line="525" selection-start-column="116" selection-end-line="525" selection-end-column="116" />
+ <state relative-caret-position="-200">
+ <caret line="472" column="34" selection-start-line="472" selection-start-column="34" selection-end-line="472" selection-end-column="34" />
<folding>
<element signature="e#52#93#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/EXP/DebugNb/bla-2020-01-22-13:40:11-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="91" selection-start-line="2" selection-start-column="85" selection-end-line="2" selection-end-column="91" />
+ <state relative-caret-position="345">
+ <caret line="639" selection-start-line="639" selection-end-line="639" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#264#7839#0" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="196" column="62" selection-start-line="196" selection-start-column="59" selection-end-line="196" selection-end-column="62" />
+ <state relative-caret-position="135">
+ <caret line="42" selection-start-line="42" selection-end-line="42" />
<folding>
- <element signature="e#0#20#0" expanded="true" />
+ <element signature="e#325#344#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="297">
- <caret line="216" column="22" lean-forward="true" selection-start-line="216" selection-start-column="22" selection-end-line="217" selection-end-column="22" />
+ <state relative-caret-position="325">
+ <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
<folding>
- <element signature="e#0#17#0" expanded="true" />
- <element signature="e#373#2168#0" />
- <element signature="e#2170#2586#0" />
- <element signature="e#2624#2889#0" />
- <element signature="e#2891#3263#0" />
- <element signature="e#6456#7877#0" />
- <element signature="e#7880#10803#0" />
+ <element signature="e#186#209#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="115">
+ <caret line="97" selection-start-line="97" selection-end-line="97" />
+ <folding>
+ <element signature="e#166#185#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="8135">
+ <caret line="742" column="27" selection-start-line="742" selection-start-column="27" selection-end-line="742" selection-end-column="27" />
+ <folding>
+ <element signature="e#21038#21680#0" />
+ <element signature="e#21683#21913#0" />
+ <element signature="e#24556#27388#0" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-01-23-15:36:01-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config
index a9c2db376214e158845b62f1a95ea064028b8ba9..10bc8a1f6ba91da41465ac68958642946d87fceb 100755
--- a/CONFIG/DAPPLE.config
+++ b/CONFIG/DAPPLE.config
@@ -1,38 +1,38 @@
# Experiments parameters
perf{
testBuildingBlocks="false";
- PrivacyPreservation= "true";
- MLAlgorithm="nb";
+ PrivacyPreservation="true";
+ MLAlgorithm="vfdt";
runs_number ="1";
thread_number="14";
remoteClient="false";
Incremental="false";
- OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/DebugNb/";
- scenarioName="bla";
- debug="true";
- maxTrainSize="20";
- maxTestSize="20";
+ OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/Tuning/";
+ scenarioName ="_NurseryVFDT";
+ debug="false";
+ maxTrainSize="10";
+ maxTestSize="10";
}
# The dataset configuration parameters
dataset{
mainPath = "/home/rania/CLionProjects/DAPPLE-2.0/";
- path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
- clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/BANK2/";
+ path="/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/";
+ clearPath= "/home/rania/CLionProjects/DAPPLE-2.0/DATA/Datasets/Nursery/";
chunk_prefix="DO";
- class_number="2";
- dimension="17";
- chunk_number="2";
+ class_number="5";
+ dimension="9";
+ chunk_number="16";
}
# The vfdt algorithm parameters
vfdt{
- delta="0.0000001";
+ delta="0.000001";
tau="1";
- grace="10";
+ grace="50";
max_depth="10";
threshold_number="2";
- maxNodes="80";
+ maxNodes="100";
}
# DTPKC parameters
@@ -44,11 +44,10 @@
ComputationalPrecision="1000";
useORE="false";
sendParaClient="true";
- blindingSize="20";
+ blindingSize="100";
encryptData="true";
-
- delay="2";
- }
+ delay="1";
+ }
# Naive Bayes parameters
nb{
diff --git a/CRYPTO/DTPKC.h b/CRYPTO/DTPKC.h
index 9bfdb51db84ec764fc350ddc9ead2122a14e2eab..7b34f7ddfe8bae89028e65e06e6a0917cfee8b12 100755
--- a/CRYPTO/DTPKC.h
+++ b/CRYPTO/DTPKC.h
@@ -55,7 +55,10 @@ public :
bool operator<