diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99717f20620bd5212797a844d308c8e7711dae2b..e3fbab279c6e15b6221fe23d7405066023e6ddc3 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,16 +11,13 @@
</configurations>
</component>
<component name="ChangeListManager">
- <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="micro bench lr">
+ <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="updates for microBench">
<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$/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.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.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/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$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -49,40 +46,16 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="359">
- <caret line="193" selection-start-line="193" selection-end-line="193" />
- <folding>
- <element signature="e#271#295#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="259">
- <caret line="57" column="26" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="33" />
- </state>
- </provider>
- </entry>
- </file>
<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="312">
- <caret line="768" column="24" selection-start-line="768" selection-start-column="21" selection-end-line="768" selection-end-column="29" />
+ <state relative-caret-position="406">
+ <caret line="412" selection-start-line="412" selection-end-line="413" selection-end-column="68" />
<folding>
<element signature="e#3427#3804#0" />
<element signature="e#3805#4076#0" />
<element signature="e#4078#4453#0" />
<element signature="e#4456#6013#0" />
- <element signature="e#18356#23003#0" />
- <element signature="e#23007#24249#0" />
- <element signature="e#24251#26305#0" />
</folding>
</state>
</provider>
@@ -91,7 +64,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="402">
+ <state relative-caret-position="1545">
<caret line="103" column="25" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="26" />
</state>
</provider>
@@ -100,7 +73,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
+ <state relative-caret-position="300">
<caret line="20" column="47" selection-start-line="20" selection-start-column="47" selection-end-line="20" selection-end-column="47" />
</state>
</provider>
@@ -109,17 +82,47 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="66" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
+ <state relative-caret-position="285">
+ <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1275">
+ <caret line="311" column="5" selection-start-line="311" selection-start-column="5" selection-end-line="311" selection-end-column="5" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#594#2389#0" />
+ <element signature="e#2391#2807#0" />
+ <element signature="e#2845#3110#0" />
+ <element signature="e#3112#3484#0" />
+ <element signature="e#3520#4400#0" />
+ <element signature="e#4403#7032#0" />
+ </folding>
+ </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="586">
+ <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+ <folding>
+ <element signature="e#0#20#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/EXP/debug/NurseryVFDT-2020-03-12-13:38:34-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="20" />
+ <state relative-caret-position="75">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
@@ -187,6 +190,7 @@
<find>high_resolution_clock</find>
<find>infoGain</find>
<find>clock</find>
+ <find>max</find>
</findStrings>
<replaceStrings>
<replace>EvalCmp100</replace>
@@ -255,7 +259,6 @@
<option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" />
<option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
- <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.h" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp" />
<option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.h" />
@@ -265,6 +268,7 @@
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPVFDT_Classifier.cpp" />
<option value="$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp" />
<option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
+ <option value="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" />
</list>
</option>
</component>
@@ -294,22 +298,6 @@
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
<item name="CONFIG" type="462c0819:PsiDirectoryNode" />
</path>
- <path>
- <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
- <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="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" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
- <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
- <item name="PPML" type="462c0819:PsiDirectoryNode" />
- </path>
</expand>
<select />
</subPane>
@@ -461,14 +449,8 @@
<workItem from="1582721479106" duration="28227000" />
<workItem from="1583169882045" duration="75000" />
<workItem from="1583169995289" duration="32772000" />
- <workItem from="1584006697197" duration="5840000" />
- </task>
- <task id="LOCAL-00050" summary="reverted from the big keys thingy">
- <created>1553276671944</created>
- <option name="number" value="00050" />
- <option name="presentableId" value="LOCAL-00050" />
- <option name="project" value="LOCAL" />
- <updated>1553276671952</updated>
+ <workItem from="1584006697197" duration="6982000" />
+ <workItem from="1584097774650" duration="3407000" />
</task>
<task id="LOCAL-00051" summary="reverted from the big keys thingy">
<created>1553278524769</created>
@@ -806,11 +788,18 @@
<option name="project" value="LOCAL" />
<updated>1583428556502</updated>
</task>
- <option name="localTasksCounter" value="99" />
+ <task id="LOCAL-00099" summary="updates for microBench">
+ <created>1584021013947</created>
+ <option name="number" value="00099" />
+ <option name="presentableId" value="LOCAL-00099" />
+ <option name="project" value="LOCAL" />
+ <updated>1584021013947</updated>
+ </task>
+ <option name="localTasksCounter" value="100" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1363322000" />
+ <option name="totallyTimeSpent" value="1367871000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -822,20 +811,20 @@
</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="935" extended-state="6" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.2722745" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.17819591" />
<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.3253769" />
- <window_info anchor="bottom" id="Run" order="3" sideWeight="0.6303265" visible="true" weight="0.42160612" />
+ <window_info anchor="bottom" id="Find" order="2" sideWeight="0.49363586" weight="0.32506204" />
+ <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.6303265" visible="true" weight="0.42059553" />
<window_info anchor="bottom" id="Debug" order="4" sideWeight="0.5146652" weight="0.5223325" />
<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.43054786" weight="0.47609943" />
+ <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.43054786" weight="0.4751861" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.4853348" side_tool="true" weight="0.5325048" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.50359714" weight="0.54396987" />
<window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.4864416" weight="0.32026768" />
@@ -895,7 +884,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
- <MESSAGE value="Added the maxNode parameter" />
<MESSAGE value="Testing PPNB" />
<MESSAGE value="Added the LrUpdate building block and updated the sigmoid one." />
<MESSAGE value="Almost their (Third classifier)" />
@@ -920,7 +908,8 @@
<MESSAGE value="micro bench" />
<MESSAGE value="micro bench vfdt" />
<MESSAGE value="micro bench lr" />
- <option name="LAST_COMMIT_MESSAGE" value="micro bench lr" />
+ <MESSAGE value="updates for microBench" />
+ <option name="LAST_COMMIT_MESSAGE" value="updates for microBench" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1082,12 +1071,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>142</line>
+ <line>134</line>
<option name="timeStamp" value="611" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>197</line>
+ <line>189</line>
<option name="timeStamp" value="612" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1326,12 +1315,12 @@
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>137</line>
+ <line>129</line>
<option name="timeStamp" value="868" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp</url>
- <line>182</line>
+ <line>174</line>
<option name="timeStamp" value="870" />
</line-breakpoint>
<line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -1764,32 +1753,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="660">
- <caret line="163" column="29" selection-start-line="163" selection-start-column="29" selection-end-line="163" selection-end-column="29" />
- <folding>
- <element signature="e#0#17#0" expanded="true" />
- <element signature="e#594#2389#0" />
- <element signature="e#2391#2807#0" />
- <element signature="e#2845#3110#0" />
- <element signature="e#3112#3484#0" />
- <element signature="e#3520#4400#0" />
- <element signature="e#4403#7032#0" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="239" column="17" selection-start-line="239" selection-start-column="17" selection-end-line="239" selection-end-column="17" />
- <folding>
- <element signature="e#0#20#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/Tuning/NurseryVFDT-2020-03-05-14:37:40-Stats.csv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
@@ -1852,6 +1815,44 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2895">
+ <caret line="193" selection-start-line="193" selection-end-line="193" />
+ <folding>
+ <element signature="e#271#295#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="855">
+ <caret line="57" column="26" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="33" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNode.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1545">
+ <caret line="103" column="25" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="300">
+ <caret line="20" column="47" selection-start-line="20" selection-start-column="47" selection-end-line="20" selection-end-column="47" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/debug/NurseryVFDT-2020-03-12-13:38:34-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
@@ -1878,64 +1879,49 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.h">
+ <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="259">
- <caret line="57" column="26" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="33" />
+ <state relative-caret-position="285">
+ <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeStats.cpp">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPStats.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="359">
- <caret line="193" selection-start-line="193" selection-end-line="193" />
+ <state relative-caret-position="586">
+ <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
<folding>
- <element signature="e#271#295#0" expanded="true" />
+ <element signature="e#0#20#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="312">
- <caret line="768" column="24" selection-start-line="768" selection-start-column="21" selection-end-line="768" selection-end-column="29" />
+ <state relative-caret-position="406">
+ <caret line="412" selection-start-line="412" selection-end-line="413" selection-end-column="68" />
<folding>
<element signature="e#3427#3804#0" />
<element signature="e#3805#4076#0" />
<element signature="e#4078#4453#0" />
<element signature="e#4456#6013#0" />
- <element signature="e#18356#23003#0" />
- <element signature="e#23007#24249#0" />
- <element signature="e#24251#26305#0" />
</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="402">
- <caret line="103" column="25" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="26" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PPML/PPVFDT/PPNodeTest.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="20" column="47" selection-start-line="20" selection-start-column="47" selection-end-line="20" selection-end-column="47" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="66" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/debug/NurseryVFDT-2020-03-12-13:38:34-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="20" />
+ <state relative-caret-position="1275">
+ <caret line="311" column="5" selection-start-line="311" selection-start-column="5" selection-end-line="311" selection-end-column="5" />
+ <folding>
+ <element signature="e#0#17#0" expanded="true" />
+ <element signature="e#594#2389#0" />
+ <element signature="e#2391#2807#0" />
+ <element signature="e#2845#3110#0" />
+ <element signature="e#3112#3484#0" />
+ <element signature="e#3520#4400#0" />
+ <element signature="e#4403#7032#0" />
+ </folding>
</state>
</provider>
</entry>