diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 35d0b0227cf406e847ac36b60464020328b4c8d3..dab04be02cb6d454f9a38d81672db69325c4a1eb 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,39 +11,14 @@ </configurations> </component> <component name="ChangeListManager"> - <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Updated version of PPLR with para"> + <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Working version of logistic regression"> + <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$/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$/CRYPTO/EvalDotProd.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDotProd.cpp" 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$/CRYPTO/EvalSub2.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalSub2.cpp" 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" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_12.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_12.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_13.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_13.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_14.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_14.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_15.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_15.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_16.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_16.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_2.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_2.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_3.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_3.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_4.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_4.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_5.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_5.data" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_6.data" beforeDir="false" afterPath="$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_6.data" afterDir="false" /> - <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/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" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.internal" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/depend.make" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -58,37 +33,32 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="true"> + <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="105"> - <caret line="7" column="27" lean-forward="true" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" /> + <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> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="245"> - <caret line="617" selection-start-line="617" selection-end-line="617" /> - </state> - </provider> + <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> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Bank/LR/DO_1.data"> + <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" /> </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/main.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="93"> - <caret line="322" column="10" selection-start-line="322" selection-start-column="10" selection-end-line="322" selection-end-column="10" /> + <state relative-caret-position="-273"> + <caret line="931" selection-start-line="931" selection-end-line="931" /> <folding> - <element signature="e#0#17#0" expanded="true" /> - <element signature="e#92#1009#0" /> + <element signature="e#52#93#0" expanded="true" /> </folding> </state> </provider> @@ -97,8 +67,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="123"> - <caret line="276" column="30" selection-start-line="276" selection-start-column="30" selection-end-line="276" selection-end-column="30" /> + <state relative-caret-position="153"> + <caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" /> <folding> <element signature="e#0#16#0" expanded="true" /> <element signature="e#891#2113#0" /> @@ -111,32 +81,58 @@ </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:09:55-Stats.csv"> + <entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="255"> - <caret line="17" column="69" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="69" /> + <state relative-caret-position="168"> + <caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-11-15:54:14-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> + <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="213"> + <caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="251"> + <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + <element signature="e#92#1009#0" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="195"> + <caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> + </state> + </provider> </entry> </file> </leaf> </component> <component name="FindInProjectRecents"> <findStrings> - <find>preci</find> - <find>Hb</find> - <find>vfdt</find> - <find>-1</find> - <find>100</find> - <find>Test</find> - <find>sendm</find> - <find>classi</find> - <find>classify</find> <find>update</find> <find>omp</find> <find>time</find> @@ -157,7 +153,16 @@ <find>chunk</find> <find>chun</find> <find>shuff</find> + <find>Test</find> <find>shuffle</find> + <find>epochs</find> + <find>train</find> + <find>LR</find> + <find>size</find> + <find>nextC</find> + <find>nextCh</find> + <find>test</find> + <find>print</find> </findStrings> <replaceStrings> <replace>EvalCmp100</replace> @@ -178,8 +183,6 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/CRYPTO/EvalMult.cpp" /> - <option value="$PROJECT_DIR$/CRYPTO/EvalProba.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalStandardDiv.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/SkeySwitch.cpp" /> <option value="$PROJECT_DIR$/PPML/EVAL/EvaluateClassification.py" /> @@ -226,9 +229,11 @@ <option value="$PROJECT_DIR$/TEST/main.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp" /> <option value="$PROJECT_DIR$/CRYPTO/EvalSub2.cpp" /> - <option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp" /> <option value="$PROJECT_DIR$/ML/LR/LR.cpp" /> <option value="$PROJECT_DIR$/CONFIG/DAPPLE.config" /> + <option value="$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp" /> + <option value="$PROJECT_DIR$/Scripts/TestPPLR2.sh" /> + <option value="$PROJECT_DIR$/Scripts/TestPPLR1.sh" /> </list> </option> </component> @@ -261,46 +266,7 @@ <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-LR" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> - <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="ML" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> - <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="ML" type="462c0819:PsiDirectoryNode" /> - <item name="LR" 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> - <path> - <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> - <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="PPML" type="462c0819:PsiDirectoryNode" /> - <item name="PPLR" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> - <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="PPML" type="462c0819:PsiDirectoryNode" /> - <item name="PPVFDT" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="DAPPLE" type="b2602c69:ProjectViewProjectNode" /> - <item name="DAPPLE-2.0" type="462c0819:PsiDirectoryNode" /> - <item name="TEST" type="462c0819:PsiDirectoryNode" /> + <item name="Scripts" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> @@ -318,19 +284,19 @@ <property name="settings.editor.selected.configurable" value="dynamic.analysis.tools.valgrind" /> </component> <component name="RecentsManager"> - <key name="MoveFile.RECENT_KEYS"> - <recent name="$PROJECT_DIR$/DATA/Datasets/Adult" /> - <recent name="$PROJECT_DIR$/ML/IO" /> - <recent name="$PROJECT_DIR$/ML" /> - <recent name="$PROJECT_DIR$/TEST" /> - </key> <key name="CopyFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Scripts" /> <recent name="$PROJECT_DIR$/CRYPTO" /> <recent name="$PROJECT_DIR$/DATA/Scripts" /> <recent name="$PROJECT_DIR$/PPML/PPLR" /> - <recent name="$PROJECT_DIR$/Scripts" /> <recent name="$PROJECT_DIR$/cmake-build-debug" /> </key> + <key name="MoveFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/DATA/Datasets/Adult" /> + <recent name="$PROJECT_DIR$/ML/IO" /> + <recent name="$PROJECT_DIR$/ML" /> + <recent name="$PROJECT_DIR$/TEST" /> + </key> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -412,14 +378,7 @@ <workItem from="1554464277043" duration="13193000" /> <workItem from="1554794662948" duration="1201000" /> <workItem from="1554894851081" duration="14949000" /> - <workItem from="1554980604962" duration="20519000" /> - </task> - <task id="LOCAL-00010" summary="05/11/2018 (DTPKC functions tested and working)"> - <created>1541412012150</created> - <option name="number" value="00010" /> - <option name="presentableId" value="LOCAL-00010" /> - <option name="project" value="LOCAL" /> - <updated>1541412012150</updated> + <workItem from="1554980604962" duration="30936000" /> </task> <task id="LOCAL-00011" summary="05/11/2018 (DTPKC functions tested and working)"> <created>1541412044955</created> @@ -757,11 +716,18 @@ <option name="project" value="LOCAL" /> <updated>1554478129023</updated> </task> - <option name="localTasksCounter" value="59" /> + <task id="LOCAL-00059" summary="Working version of logistic regression"> + <created>1555060445012</created> + <option name="number" value="00059" /> + <option name="presentableId" value="LOCAL-00059" /> + <option name="project" value="LOCAL" /> + <updated>1555060445023</updated> + </task> + <option name="localTasksCounter" value="60" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="768090000" /> + <option name="totallyTimeSpent" value="778507000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -774,6 +740,7 @@ </component> <component name="ToolWindowManager"> <frame x="67" y="25" width="1355" height="678" extended-state="6" /> + <editor active="true" /> <layout> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.29411766" /> <window_info id="Structure" order="1" sideWeight="0.2735043" side_tool="true" weight="0.3390558" /> @@ -782,7 +749,7 @@ <window_info anchor="bottom" id="Message" order="1" /> <window_info anchor="bottom" id="Find" order="2" sideWeight="0.49503437" weight="0.32675046" /> <window_info anchor="bottom" id="Run" order="3" sideWeight="0.6355997" visible="true" weight="0.3387978" /> - <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.58594346" weight="0.45960504" /> + <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.58594346" weight="0.5027322" /> <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.49920928" weight="0.32786885" /> @@ -846,7 +813,6 @@ <component name="VcsManagerConfiguration"> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_NEW_TODO" value="false" /> - <MESSAGE value="21/11/2018 : NPPVFDT almost works but still has a problem with the choice of the thresholds" /> <MESSAGE value="22/11/2018 : Still having really low accuracy" /> <MESSAGE value="22/11/2018 : VFDT works just fine" /> <MESSAGE value="26/11/2018 : CryptoDatasetReader + SKeySwitch works just fine !!" /> @@ -871,7 +837,8 @@ <MESSAGE value="Added dot product test" /> <MESSAGE value="Added the call to the PPLR classifier" /> <MESSAGE value="Updated version of PPLR with para" /> - <option name="LAST_COMMIT_MESSAGE" value="Updated version of PPLR with para" /> + <MESSAGE value="Working version of logistic regression" /> + <option name="LAST_COMMIT_MESSAGE" value="Working version of logistic regression" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -1060,11 +1027,6 @@ <line>927</line> <option name="timeStamp" value="699" /> </line-breakpoint> - <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> - <url>file://$PROJECT_DIR$/ML/LR/LR.cpp</url> - <line>270</line> - <option name="timeStamp" value="701" /> - </line-breakpoint> <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp</url> <line>33</line> @@ -1326,9 +1288,44 @@ <option name="timeStamp" value="897" /> </line-breakpoint> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> - <url>file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp</url> - <line>34</line> - <option name="timeStamp" value="916" /> + <url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url> + <line>320</line> + <option name="timeStamp" value="920" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url> + <line>372</line> + <option name="timeStamp" value="924" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url> + <line>366</line> + <option name="timeStamp" value="925" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp</url> + <line>323</line> + <option name="timeStamp" value="926" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/ML/LR/LR.cpp</url> + <line>272</line> + <option name="timeStamp" value="927" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/ML/LR/LR.cpp</url> + <line>314</line> + <option name="timeStamp" value="928" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/ML/LR/LR.cpp</url> + <line>275</line> + <option name="timeStamp" value="929" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/ML/LR/LR.cpp</url> + <line>276</line> + <option name="timeStamp" value="930" /> </line-breakpoint> <line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <url>file://$PROJECT_DIR$/DATA/Scripts/Clean_Adult.py</url> @@ -1376,76 +1373,6 @@ </watches-manager> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/PlzWork-2019-04-05-15:29:24-ClassOutput.txt"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/PlzWork-2019-04-05-15:29:24-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:28:20-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:38:55-Config.txt"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:38:55-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:38:55-ClassOutput.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalProba.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="42"> - <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:31:13-ClassOutput.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="90"> - <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:28:20-ClassOutput.txt.enc"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Debug-2019-04-10-12:28:20-ClassOutput.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> - <caret line="10" selection-start-line="10" selection-end-line="10" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-225"> - <caret line="53" column="24" selection-start-line="53" selection-start-column="24" selection-end-line="53" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file:///usr/local/include/gmpxx.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="83"> - <caret line="2254" selection-start-line="2254" selection-end-line="2254" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/EXP/DebugPPNB/Cipher-2019-04-03-10:50:29-Config.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-90" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/testing.data"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-5746" /> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/DATA/Datasets/Nursery/data-clean.csv"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="209"> @@ -1474,16 +1401,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="231"> - <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" /> - <folding> - <element signature="e#52#93#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/Cipher-2019-04-03-13:21:49-Config.txt"> <provider selected="true" editor-type-id="text-editor" /> </entry> @@ -1516,16 +1433,6 @@ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-11-14:42:14-ClassOutput.txt"> <provider selected="true" editor-type-id="text-editor" /> </entry> - <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="190"> - <caret line="86" column="10" selection-start-line="86" selection-start-column="10" selection-end-line="86" selection-end-column="10" /> - <folding> - <element signature="e#0#24#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/CRYPTO/EvalLrUpdate.cpp"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="109"> @@ -1594,17 +1501,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="93"> - <caret line="322" column="10" selection-start-line="322" selection-start-column="10" selection-end-line="322" selection-end-column="10" /> - <folding> - <element signature="e#0#17#0" expanded="true" /> - <element signature="e#92#1009#0" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:01:04-Stats.csv"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="165"> @@ -1621,10 +1517,82 @@ <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:06:11-Stats.csv"> <provider selected="true" editor-type-id="text-editor" /> </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:08:50-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:09:55-Stats.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="17" column="69" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="69" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-10:59:43-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:10:41-Stats.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="45"> + <caret line="3" column="67" selection-start-line="3" selection-start-column="61" selection-end-line="3" selection-end-column="67" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:13:19-Stats.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" column="73" selection-start-line="4" selection-start-column="73" selection-end-line="4" selection-end-column="73" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-10:47:57-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-10:49:49-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-10:50:50-Stats.csv"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:13:19-Config.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="14" column="2" lean-forward="true" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/CRYPTO/EvalSigmoid.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="90"> + <caret line="34" selection-start-line="34" selection-end-line="34" /> + <folding> + <element signature="e#0#24#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-13:00:07-Config.txt"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <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" /> + </entry> + <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" /> + </entry> + <entry file="file://$PROJECT_DIR$/TEST/main.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-273"> + <caret line="931" selection-start-line="931" selection-end-line="931" /> + <folding> + <element signature="e#52#93#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/ML/LR/LR.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="123"> - <caret line="276" column="30" selection-start-line="276" selection-start-column="30" selection-end-line="276" selection-end-column="30" /> + <state relative-caret-position="153"> + <caret line="277" column="23" selection-start-line="277" selection-start-column="19" selection-end-line="277" selection-end-column="23" /> <folding> <element signature="e#0#16#0" expanded="true" /> <element signature="e#891#2113#0" /> @@ -1635,23 +1603,52 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:08:50-Stats.csv"> - <provider selected="true" editor-type-id="text-editor" /> + <entry file="file://$PROJECT_DIR$/ML/IO/DatasetReader.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="168"> + <caret line="181" column="26" selection-start-line="181" selection-start-column="26" selection-end-line="181" selection-end-column="26" /> + </state> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/EXP/DEBUG-LR/LetsSeeHowItworks-2019-04-12-09:10:41-Stats.csv"> + <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="213"> + <caret line="243" column="24" selection-start-line="243" selection-start-column="14" selection-end-line="243" selection-end-column="24" /> + </state> + </provider> + </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-09:09:55-Stats.csv"> + <entry file="file://$PROJECT_DIR$/PPML/PPLR/PPLR_Classifier.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="255"> - <caret line="17" column="69" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="69" /> + <state relative-caret-position="251"> + <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" /> + <folding> + <element signature="e#0#17#0" expanded="true" /> + <element signature="e#92#1009#0" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config"> + <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR2.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Scripts/TestPPLR1.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="27" lean-forward="true" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" /> + <state relative-caret-position="195"> + <caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> </state> </provider> </entry> diff --git a/CONFIG/DAPPLE.config b/CONFIG/DAPPLE.config index 3e03ea9e1f3c7aca580903923e03dbe4faff823f..6a99ccc15f306165a2149578acb1e905367af50a 100755 --- a/CONFIG/DAPPLE.config +++ b/CONFIG/DAPPLE.config @@ -9,7 +9,7 @@ Incremental="true"; OutputPath="/home/rania/CLionProjects/DAPPLE-2.0/EXP/DEBUG-LR/"; scenarioName ="LetsSeeHowItworks"; - debug="true"; + debug="false"; maxTrainSize="100"; maxTestSize="400"; } @@ -22,7 +22,7 @@ chunk_prefix="DO"; class_number="2"; dimension="17"; - chunk_number="16"; + chunk_number="2"; } # The vfdt algorithm parameters @@ -59,7 +59,7 @@ lr{ alpha="10"; LRTH="0.5"; batchSize="5"; - epochs="3"; + epochs="1"; } # Network parameters diff --git a/ML/LR/LR.cpp b/ML/LR/LR.cpp index b8d1b8b7d934c962ebf5da1452662ecbe032ef86..ee3eb3ff4c589522d5e7830b6b010c1abc251393 100644 --- a/ML/LR/LR.cpp +++ b/ML/LR/LR.cpp @@ -311,6 +311,8 @@ void LR::train () } + counter = 0; + //cout << epochCpt << endl; } @@ -338,7 +340,9 @@ void LR::Test( ){ try { record = dt->getTestRecord(); - extTestBd += sizeof(int)*record->values.size(); + record->print(); + + extTestBd += sizeof(int)*record->values.size(); } catch (std::exception const &e) { //std::cout << "Exception: " << e.what() << "\n"; @@ -384,6 +388,7 @@ void LR::RemoteTest(){ try { record = recvRecord(sockfd,cliaddr,dt->dimension-1, counter); + if (debug) record->print(); extTestBd += sizeof(int)*record->values.size(); diff --git a/PPML/PPLR/PPLR_Classifier.cpp b/PPML/PPLR/PPLR_Classifier.cpp index 6aed4652197f299c7a1eeaac5998f73724ab5086..50263a48af17c3a5f3b8fca439c7ce92bf65241f 100755 --- a/PPML/PPLR/PPLR_Classifier.cpp +++ b/PPML/PPLR/PPLR_Classifier.cpp @@ -362,7 +362,15 @@ void PPLR_Classifier::train() { } + counter = 0; + } + + auto end = chrono::high_resolution_clock::now(); + + std::chrono::duration<double, std::milli> duration = end - begin; + + trainTime = duration.count(); } @@ -383,6 +391,7 @@ void PPLR_Classifier::Test() { try { record = datasetReader->getTestRecord(); + if (debug) record->print(); extTestBd += record->getSize(); } catch (std::exception const &e) { diff --git a/SER/dtpkc.ser b/SER/dtpkc.ser index 88e948d184015e5cb4feb2607be08c314a91aa2c..4860d55bd4592bc5a0a1d62cee1962401b451c74 100644 --- a/SER/dtpkc.ser +++ b/SER/dtpkc.ser @@ -1,11 +1,11 @@ -127743588400120984190489585056056552545033463764781356156189626152170851111381414797999825616739371786239625889320136181725210380786815926459761401630546574863287408083932657202455483375034723749330226094752534631369605561859942428107320009948102218734224200310608734396755550624690341281531104331653195944851 --112887966402807756766056421643807907350895522095467553273547953766793324298888318284172536028786042276531067803218965248396876649101648287346586060132262836924985631049305624460063160848536793902002115656699149989508010827334440827893104404358996147910956534319688208521154727108343411859750160802677097407480242544367591257615591117958239786764451671942903354872303330649293082089689105426371188327306424149648823261847912699178274457842511436932134284434833600072905176684303186334068832909162746805616853583375196712468137060619023522093652688122677751266019684240965376131971798379853203026584213306019004844460 -16318424377339524469265632132949706771074580425523908475590997776817552836622922968731940379195347137349929749351354578266292603607292103796411004146499224537703372347808495999163762413162436997895662722830514493984065959662367091647679206352676004130745510450282757163003693224080551445288826221784565044257392538141868698137031263199931102977027459999033171952439481140633079260745157652305387827138326196167499304581976246975198364080405098154808697734490950937995154701427118543972403050117121941374499188033689538880305937570737811225169764040730555213548600228902403336043189357773677340292671441731790633412201 -413635496759521463361853762754175395826207837372809981179521755160809341177358249038004957400288258354954068980681152455512643358558112757836404288827026555621612230936158101839051009427284052229253937599697946191886276253508737057967867864999778064696422565044741171547579924749523183329792193170650973067250646286370789443825867110466135562836806040363550207827142687169406585867026077223096180670664666188162708942490111470394301111610149809966647261748204026815419551652886128237154699560122225648653574263236934499491299664114727561277020560425842975061899278129098529788475758986591570228268825376696775517292808211512352585969936298847447460552940091544777167206820954185137046855753629177683034540620611786319714824133489554681646158711573373514050493074475681724210179047800928111676908363726012003475649696660600380197157466100999997000109593093537358983785528456198823333844553369411149504564764844592067046101020184358602238680411305600837054426725240440221054276930143366664316600200736649931928741033245457215220081179946791074991658671684396627060155303485137501444053485769220759049687475303594644828552659767900024571530500752587450413670988510609904681920298664860244429153132123653079104247330853577777296598356367772867483227740698497063928232167363616164253892431263688124959035032682797399944503359971587896805909617677711819053563589503923570111771678407137614563574990978970166162013148109317196303703401765888683444497742595247107603114123061899352146734225766306385746099640686357243757661543115045755941925342972090887674947359706761129551947832742240840963857592402383678966684089808465667383371614565403339079245010572456414363024940830661850499024328275251335136008934668726835281657268763946281751299046668757244473793478697933008881655950697023821271130143916265979916237650390291688488607005908041784817425288292672 +97381732283718262578591194629231257118504732870777550079612807502327951232008865047308688670041943858968418356517469186372920201664920565884435049735515671714766024243548723680280121520175649529270165215581184567409765470000758098404258820073496108908693502644530708663553952549082032858053821397900669293223 +-3752317145496869475826986411150989537699383521522219077868742548042525519655287461566332025403961056952078550130480559858178839110736421663306783218780358226585766870909631332535104731882717987957852052807770959847953398568779046667807411577458343968460024279666802199876043034625154984201119447594665519297032196822392586667409456795947434852006358519935256452049984072779775235186462032497945056243557912192784835206760543127267770405867291759111909536391046129633992216301450208572728071015430239371238298854162333147372994385385212111931793507548923577176446589454747054890870480016786664434797749052092458137030 +9483201782577775700364045826501695925660864108262846837246701069972268482387672012107945209941845274025192500375481953048642548440314650713072357364196852845846841583925335250060682535387677165334148357347042321958351411950334428662311903337456839032629070121568389220911348346339204499962327705798562539172244678491482543898095535747510151871378377898176951235060528288309177234987131533099511102531248682679493459459919685575928682933365686927768127930548742439397775242224482614038244147270905018437799485526631196191935893879423037379099541766587875764296902452963182999457409498197827611671734160816818353727729 +66899802321478703625181748591278621793662599192025893420040594525460146756352342990428249260083226153050384226513729785545117759641989473959937546710794830288060431047102215771220275074550562535917574044233354676182721717392497018422220434052760886262769568664394183365860684301461473250655134776512907778995750325606397500287324964632998591497902237695086956279409060101904955683793624194245133876880135694827709292028435413919509210927334283629038258705736162741613899504770691006783374048903054266688939278763834015659554326362256161738340449981260430767856931114832950105107978707922425100369560019169183501803197571610376329609206073464162530836259809815929980186869965231368251791382044441893890388891005859784032281929396744620614201692160258983963372469238151275338925930984829130281708398433799821554145057318627321800668440747491536511133380825668763808796998060997646725560486534355152525096911483418437534542946552894899250635323236600922415484719538665489018327344448704211026216731453467973792944732176190095149808340078197863133228410514397339138562141663248844747445207686244132276773436228162711027275135990268864031205448224122302464286196007993186790607833989451464648137863593754963522690105713097933105328364891313810221256904291165114083259118459630102259221139360987624856623469108143255018453370155706157376272014853344090896697265245724379205352634721481836813661976505198058552946603490662140429059499791248932830543323973401726316814821667240262601393165071934426489343863166606786098245149764826439930342835316941396893905975508646158833945084800623994169625784020394013021735397503765791643550861683677289776815115161691363093140583801725517818266086407749213752876965645940907317747298766432886612458615288399578652066385222671848014074677289478724953626482936757245245353139369903852778921005321693246101092902663323 1024 -11690319936113312129820577473632791337633081312015874751516656336615930844081377438401560022330658398046097309044899847762698080483345152418128630782027969 -10927296181646844963385518522112532627229298432766413808861178705964489761514762460495769370367885714405540950094525699869670774804775083504556858680253779 -148966611454324227733127535877438387756768880149399860560000930908582191550264223081948588106247346743250315428293401740454158189253902735115488528574510596254235783664357813335910312554467317556044402301648751950144234990158630478669236836595354193744947925786469149666397038134442508754062091009441361008039 -31935897100030246047622396264014138136258365941195339039047406538042712777845353699499956404184842946559906472330034045431302595196703981614940350407636638061417822580943890999089871907427689721737620328115993563383640745359834207991855278154677380047527937168087398742801979563958763290323795411540933415776 -64315834350451640121737809420042092232685531552787090944113810118518423335110599822949396087428245087523194392881646743253670559875973098402998000027308387321849811274093128645682876057556627254180547332260633834527339401034078437094972200187461225149552092546558238449555692216016920734875911691189670433788 -268899490427028924800533361403454573173735075963835285090481807310139544985965354153226297369096251103581724241782947755047755229718468332258847923667982382718615957788674239856042967731790689262131693140468464454255221557189200581192490085692254949004337118047933107809057370747043905127806999992342980847689925113107904674347921906483215871611857601293032414789704626801805267350917131013231572156289722055708237016120192487717718375592437692524054907829917396516427984606885517932667833530591588804532202245627491553118936151613168825385385936440536918359934331720590426654772927457830843827879401430827491602377099392304784761011450909954318635888384751313263216810441303429694433006026531986947711322677940216302466689232712551201955454008318242407643983296491815357209859297733218507865260732859269795131221856579582710504450612136872548469438484120648850835765628292827396381471289052124389885194914099389957834683172 +12638950835661280561280775538772592757499322586948741463315228394315627221813568353665638949204909734048538978350956504284171803790641006483505561680752201 +7704890504752340723936493484001096199707790590065754263880125724585372807490327470446345227925927260211315384018297073502845348417921883307794672562272623 +137406882457687816683941380457881725865863505407782311357469894561824033996601239859062031543347824395410087720786343141143749735875604699724313278856937170303981296999366350654848787095206961623439588634356595659427388969854332052296882434180883263844332725407112858245118983271233619266980112337253429971059 +24345433070929565644647798657307814279626183217694387519903201875581987808002216261827172167510485964742104589129367296593230050416230141471108762433878912842731170957481859615752774686621673080539247050271364343013911642250182198627108677022329744517924810697542084852494041382982456073791007524416606567100 +175749402041230770653777794984081651563214523473936753981765870176024792822910364918161229256992080452244794904290627735807232814482287210450337212323828145609799341408114421713108222805707098534547457831703599226287238834387676769722026374172941973319558241103135612291639811555231435877617775123101415845109 +64062791940660982176935926154904966914525459359599957615104260175774912449782419235822663444174341790447024782340831240765633947727004524893395192143262561514709159912638983270828325514074232074083514744634719820951379632328426458728864060704059819323671803067545354830598182143221320917293694851411452077497368043926691370293831466671381593332680995325146128181857360253316230064532686560248927339780636663216932407919553583024928820590016310869591359257112986344762001195485938387383941486957535651808480635297222613387027818613161685551632764016623695925109459747606582042246000096857042908268055549396082725212104589629123222783047599101042328233950082367234459347491208265769466959307195889270138225680372000583279664517098250119577130729427818225398723638859423287808320531252736573219271381261432424997937827491646778761976474115010245553081541772331531375954899509093785908321590211461996755128233127636832635905691 diff --git a/Scripts/TestPPLR1.sh b/Scripts/TestPPLR1.sh new file mode 100644 index 0000000000000000000000000000000000000000..faf887bcdb6107ed9700a321533781b23fbd6f15 --- /dev/null +++ b/Scripts/TestPPLR1.sh @@ -0,0 +1,28 @@ +#!/bin/sh +#5 runs of PPLR ( Number of cores variation + 5 runs ) + +maxCores=$1 +maxCores= expr $maxCores + 1 +threads=$2 + +./DAPPLE $threads +./DAPPLE $threads +./DAPPLE $threads +./DAPPLE $threads +./DAPPLE $threads + +# Vary cores + +cpt=2 +cpt2=1 +list=1,2 + +while [ $cpt -lt $maxCores ] +do +echo running with $cpt cores... +taskset --cpu-list $list ./DAPPLE $threads +cpt=$(( $cpt + 2 )) +cpt2=$(( $cpt2 + 2 )) +list=$list",$cpt2,$cpt" +echo $list +done \ No newline at end of file diff --git a/Scripts/TestPPLR2.sh b/Scripts/TestPPLR2.sh new file mode 100644 index 0000000000000000000000000000000000000000..b8fc26fc9e442b6f19366682fbee4320f95c0607 --- /dev/null +++ b/Scripts/TestPPLR2.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# 5 runs of PPLR ( thread variation + single core thread variation ) + +# 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