Skip to content
Snippets Groups Projects
Commit 070f549a authored by rtalbi's avatar rtalbi
Browse files

updated testing script for PPLR

parent d822f4b1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 55
− 48
View file @ 070f549a
...@@ -11,14 +11,9 @@ ...@@ -11,14 +11,9 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Working version of logistic regression"> <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Working version of logistic regression + Added testing scripts">
<change afterPath="$PROJECT_DIR$/Scripts/TestPPLR1.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Scripts/TestPPLR2.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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$/Scripts/TestPPLR1.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Scripts/TestPPLR1.sh" 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" />
</list> </list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -55,7 +50,7 @@ ...@@ -55,7 +50,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/TEST/main.cpp"> <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-273"> <state relative-caret-position="13965">
<caret line="931" selection-start-line="931" selection-end-line="931" /> <caret line="931" selection-start-line="931" selection-end-line="931" />
<folding> <folding>
<element signature="e#52#93#0" expanded="true" /> <element signature="e#52#93#0" expanded="true" />
...@@ -67,7 +62,7 @@ ...@@ -67,7 +62,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp"> <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="4155">
<caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" /> <caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" />
<folding> <folding>
<element signature="e#0#16#0" expanded="true" /> <element signature="e#0#16#0" expanded="true" />
...@@ -83,7 +78,7 @@ ...@@ -83,7 +78,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp"> <entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168"> <state relative-caret-position="2715">
<caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" /> <caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" />
</state> </state>
</provider> </provider>
...@@ -92,7 +87,7 @@ ...@@ -92,7 +87,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp"> <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213"> <state relative-caret-position="3645">
<caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" /> <caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" />
</state> </state>
</provider> </provider>
...@@ -101,7 +96,7 @@ ...@@ -101,7 +96,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251"> <state relative-caret-position="4875">
<caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" /> <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
<folding> <folding>
<element signature="e#0#17#0" expanded="true" /> <element signature="e#0#17#0" expanded="true" />
...@@ -114,8 +109,8 @@ ...@@ -114,8 +109,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh"> <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="462">
<caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -123,8 +118,8 @@ ...@@ -123,8 +118,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh"> <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="45">
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> <caret line="3" selection-start-line="3" selection-end-line="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -263,6 +258,17 @@ ...@@ -263,6 +258,17 @@
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
<item name="CONFIG" type="462c0819:PsiDirectoryNode" /> <item name="CONFIG" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
<item name="DATA" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
<item name="DATA" type="462c0819:PsiDirectoryNode" />
<item name="Datasets" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" />
<item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" />
...@@ -378,14 +384,8 @@ ...@@ -378,14 +384,8 @@
<workItem from="1554464277043" duration="13193000" /> <workItem from="1554464277043" duration="13193000" />
<workItem from="1554794662948" duration="1201000" /> <workItem from="1554794662948" duration="1201000" />
<workItem from="1554894851081" duration="14949000" /> <workItem from="1554894851081" duration="14949000" />
<workItem from="1554980604962" duration="30936000" /> <workItem from="1554980604962" duration="31618000" />
</task> <workItem from="1555104532157" duration="117000" />
<task id="LOCAL-00011" summary="05/11/2018 (DTPKC functions tested and working)">
<created>1541412044955</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1541412044955</updated>
</task> </task>
<task id="LOCAL-00012" summary="05/11/2018 (DTPKC functions tested and working)"> <task id="LOCAL-00012" summary="05/11/2018 (DTPKC functions tested and working)">
<created>1541412182543</created> <created>1541412182543</created>
...@@ -723,11 +723,18 @@ ...@@ -723,11 +723,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1555060445023</updated> <updated>1555060445023</updated>
</task> </task>
<option name="localTasksCounter" value="60" /> <task id="LOCAL-00060" summary="Working version of logistic regression + Added testing scripts">
<created>1555076615854</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1555076615855</updated>
</task>
<option name="localTasksCounter" value="61" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="778507000" /> <option name="totallyTimeSpent" value="779306000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -742,7 +749,7 @@ ...@@ -742,7 +749,7 @@
<frame x="67" y="25" width="1355" height="678" extended-state="6" /> <frame x="67" y="25" width="1355" height="678" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.29411766" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.2987013" />
<window_info id="Structure" order="1" sideWeight="0.2735043" side_tool="true" weight="0.3390558" /> <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 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="Database Changes" order="0" />
...@@ -813,7 +820,6 @@ ...@@ -813,7 +820,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="22/11/2018 : Still having really low accuracy" />
<MESSAGE value="22/11/2018 : VFDT works just fine" /> <MESSAGE value="22/11/2018 : VFDT works just fine" />
<MESSAGE value="26/11/2018 : CryptoDatasetReader + SKeySwitch works just fine !!" /> <MESSAGE value="26/11/2018 : CryptoDatasetReader + SKeySwitch works just fine !!" />
<MESSAGE value="26/11/2018 : Very rought implementation of PPVFDT, still need extra building blocks : multiplication, sum pow 2, stadard div and infoGain computtaion, review all code before even thinking of compiling !!!!!" /> <MESSAGE value="26/11/2018 : Very rought implementation of PPVFDT, still need extra building blocks : multiplication, sum pow 2, stadard div and infoGain computtaion, review all code before even thinking of compiling !!!!!" />
...@@ -838,7 +844,8 @@ ...@@ -838,7 +844,8 @@
<MESSAGE value="Added the call to the PPLR classifier" /> <MESSAGE value="Added the call to the PPLR classifier" />
<MESSAGE value="Updated version of PPLR with para" /> <MESSAGE value="Updated version of PPLR with para" />
<MESSAGE value="Working version of logistic regression" /> <MESSAGE value="Working version of logistic regression" />
<option name="LAST_COMMIT_MESSAGE" value="Working version of logistic regression" /> <MESSAGE value="Working version of logistic regression + Added testing scripts" />
<option name="LAST_COMMIT_MESSAGE" value="Working version of logistic regression + Added testing scripts" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1576,12 +1583,22 @@ ...@@ -1576,12 +1583,22 @@
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:00:07-Stats.csv"> <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:00:07-Stats.csv">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:23:02-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:00:43-Stats.csv"> <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:00:43-Stats.csv">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/TEST/main.cpp"> <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-273"> <state relative-caret-position="13965">
<caret line="931" selection-start-line="931" selection-end-line="931" /> <caret line="931" selection-start-line="931" selection-end-line="931" />
<folding> <folding>
<element signature="e#52#93#0" expanded="true" /> <element signature="e#52#93#0" expanded="true" />
...@@ -1591,7 +1608,7 @@ ...@@ -1591,7 +1608,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp"> <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="4155">
<caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" /> <caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" />
<folding> <folding>
<element signature="e#0#16#0" expanded="true" /> <element signature="e#0#16#0" expanded="true" />
...@@ -1605,31 +1622,21 @@ ...@@ -1605,31 +1622,21 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp"> <entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168"> <state relative-caret-position="2715">
<caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" /> <caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp"> <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213"> <state relative-caret-position="3645">
<caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" /> <caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:23:02-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251"> <state relative-caret-position="4875">
<caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" /> <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
<folding> <folding>
<element signature="e#0#17#0" expanded="true" /> <element signature="e#0#17#0" expanded="true" />
...@@ -1640,15 +1647,15 @@ ...@@ -1640,15 +1647,15 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh"> <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="45">
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> <caret line="3" selection-start-line="3" selection-end-line="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh"> <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="462">
<caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Scripts/TestPPLR1.sh
+ 21
− 1
View file @ 070f549a
...@@ -25,4 +25,24 @@ cpt=$(( $cpt + 2 )) ...@@ -25,4 +25,24 @@ cpt=$(( $cpt + 2 ))
cpt2=$(( $cpt2 + 2 )) cpt2=$(( $cpt2 + 2 ))
list=$list",$cpt2,$cpt" list=$list",$cpt2,$cpt"
echo $list echo $list
done done
\ No newline at end of file
# Vary number of threads
cpt=$threads
while [ $cpt -gt 0 ]
do
echo running with $cpt threads
./DAPPLE $cpt
cpt=$(( $cpt - 2 ))
done
# Vary number of threads for a single core
cpt=$threads
while [ $cpt -gt 0 ]
do
echo running with $cpt threads
taskset 1 ./DAPPLE $cpt
cpt=$(( $cpt - 2 ))
done
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment