From 4da32ba70c74c9778ade55d15b720d6f126587e4 Mon Sep 17 00:00:00 2001
From: rtalbi <dr_talbi@esi.dz>
Date: Tue, 14 May 2019 02:56:49 +0200
Subject: [PATCH] New dataset config PLR
---
.idea/workspace.xml | 175 +++++++++++++++++++-------------------------
ML/LR/LR.cpp | 2 +-
2 files changed, 77 insertions(+), 100 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f91f7935..99062d7b 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,27 +11,8 @@
</configurations>
</component>
<component name="ChangeListManager">
- <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Added eval print for the naive bayes classifier in the case of non-incremental scenario">
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_1.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_10.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_2.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_3.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_4.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_5.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_6.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_7.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_8.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/DO_9.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/result.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/testing.data" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/DATA/Datasets/Nursery/LR/training.data" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="New dataset config PLR">
<change beforePath="$PROJECT_DIR$/CONFIG/DAPPLE.config" beforeDir="false" afterPath="$PROJECT_DIR$/CONFIG/DAPPLE.config" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_1.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_1.data" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_4.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_4.data" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_9.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/DO_9.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_1.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_1.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_10.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_10.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_11.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_11.data" afterDir="false" />
@@ -48,13 +29,6 @@
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_7.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_7.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_8.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_8.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_9.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_9.data" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/ML/LR/LR.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ML/LR/LR.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.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$/UTIL/math_util.cc" beforeDir="false" afterPath="$PROJECT_DIR$/UTIL/math_util.cc" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/UTIL/math_util.hh" beforeDir="false" afterPath="$PROJECT_DIR$/UTIL/math_util.hh" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/CXX.includecache" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -84,52 +58,59 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:19:22-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="296">
+ <caret line="273" selection-start-line="273" selection-end-line="273" />
+ <folding>
+ <element signature="e#0#16#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:19:56-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:46:33-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:20:51-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:47:22-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:21:33-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:47:51-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:23:21-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:48:19-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:24:00-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:48:46-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:24:32-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:49:24-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:25:04-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:49:49-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:26:05-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:54:52-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:27:09-Stats.csv">
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:55:26-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
@@ -237,9 +218,9 @@
<option value="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_13.data" />
<option value="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_14.data" />
<option value="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_15.data" />
- <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
<option value="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_16.data" />
<option value="$PROJECT_DIR$/ML/LR/LR.cpp" />
+ <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" />
</list>
</option>
</component>
@@ -440,14 +421,7 @@
<workItem from="1556117036167" duration="16345000" />
<workItem from="1556985163497" duration="8721000" />
<workItem from="1556999883524" duration="37306000" />
- <workItem from="1557400655578" duration="40706000" />
- </task>
- <task id="LOCAL-00022" summary="19/11/2018 : Clean code :: still didn't code threshold selection">
- <created>1542734423884</created>
- <option name="number" value="00022" />
- <option name="presentableId" value="LOCAL-00022" />
- <option name="project" value="LOCAL" />
- <updated>1542734423884</updated>
+ <workItem from="1557400655578" duration="41316000" />
</task>
<task id="LOCAL-00023" summary="20/11/2018 : NPPVFDT entirely coded but not properly tested : don't forget to add parallelism to this version too">
<created>1542738520880</created>
@@ -785,11 +759,18 @@
<option name="project" value="LOCAL" />
<updated>1557081446555</updated>
</task>
- <option name="localTasksCounter" value="71" />
+ <task id="LOCAL-00071" summary="New dataset config PLR">
+ <created>1557794782265</created>
+ <option name="number" value="00071" />
+ <option name="presentableId" value="LOCAL-00071" />
+ <option name="project" value="LOCAL" />
+ <updated>1557794782273</updated>
+ </task>
+ <option name="localTasksCounter" value="72" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="913710000" />
+ <option name="totallyTimeSpent" value="914320000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -874,7 +855,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
- <MESSAGE value="07/01/2019 : started modifying NB" />
<MESSAGE value="08/01/2019 : Clean implementation of NB" />
<MESSAGE value="10/01/2019 : Preparing tests for Nassim" />
<MESSAGE value="LR npp part 1" />
@@ -899,7 +879,8 @@
<MESSAGE value="Added the iris dataset and updated the naive bayes classifier" />
<MESSAGE value="Updated code for Naive Bayes classifier" />
<MESSAGE value="Added eval print for the naive bayes classifier in the case of non-incremental scenario" />
- <option name="LAST_COMMIT_MESSAGE" value="Added eval print for the naive bayes classifier in the case of non-incremental scenario" />
+ <MESSAGE value="New dataset config PLR" />
+ <option name="LAST_COMMIT_MESSAGE" value="New dataset config PLR" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1544,37 +1525,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="124">
- <caret line="105" selection-start-line="105" selection-end-line="105" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:33:28-ClassOutput.txt">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:33:28-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:34:59-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:37:22-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:37:13-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:37:59-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:39:31-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-13-23:39:49-Stats.csv">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
<entry file="file://$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_10.data">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
@@ -1637,23 +1587,6 @@
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:00:25-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="74">
- <caret line="24" column="21" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="296">
- <caret line="273" selection-start-line="273" selection-end-line="273" />
- <folding>
- <element signature="e#0#16#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:01:52-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1748,5 +1681,49 @@
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:27:09-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="220">
+ <caret line="61" column="13" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="296">
+ <caret line="273" selection-start-line="273" selection-end-line="273" />
+ <folding>
+ <element signature="e#0#16#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:46:33-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:47:22-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:47:51-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:48:19-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:48:46-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:49:24-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:49:49-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:54:52-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR2/NewDataset-2019-05-14-00:55:26-Stats.csv">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/ML/LR/LR.cpp b/ML/LR/LR.cpp
index bf576154..58a36fd0 100644
--- a/ML/LR/LR.cpp
+++ b/ML/LR/LR.cpp
@@ -272,7 +272,7 @@ void LR::train ()
for (int epochCpt = 0; epochCpt < epochs ; epochCpt ++ ) {
- shuffle(dt);
+ //shuffle(dt);
while (counter < size) {
if (size - counter < batchSize)
sizeBatch = size - counter;
--
GitLab