From 08b1fd9d722d1848768e675af737676bdaa5c597 Mon Sep 17 00:00:00 2001
From: rtalbi <dr_talbi@esi.dz>
Date: Mon, 6 Jan 2020 10:15:30 +0100
Subject: [PATCH] New tests for the S&P paper
---
.idea/workspace.xml | 209 +++++++++++++++++++-----------------------
CRYPTO/EvalDiv100.cpp | 4 +-
TEST/main.cpp | 8 +-
3 files changed, 98 insertions(+), 123 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 194b9bbc..0ba03f09 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,33 +11,10 @@
</configurations>
</component>
<component name="ChangeListManager">
- <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="corrected the naive bayes implem">
- <change afterPath="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/TEST/TESTElementaryOps.h" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/TEST/TESTpacking.cpp" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/TEST/TESTpacking.h" afterDir="false" />
+ <list default="true" id="2624f523-8bdb-4867-a32b-0c8fa25f5cda" name="Default" comment="Packing tests">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CONFIG/DAPPLE.config" beforeDir="false" afterPath="$PROJECT_DIR$/CONFIG/DAPPLE.config" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CRYPTO/DTPKC.h" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/DTPKC.h" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PPML/PPNB/PPStats.h" beforeDir="false" afterPath="$PROJECT_DIR$/PPML/PPNB/PPStats.h" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/SER/dtpkc.ser" beforeDir="false" afterPath="$PROJECT_DIR$/SER/dtpkc.ser" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/CRYPTO/EvalDiv100.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/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/DependInfo.cmake" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/build.make" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/cmake_clean.cmake" 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" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/link.txt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/progress.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DAPPLE.dir/progress.make" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/DAPPLE.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/DAPPLE.cbp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -66,11 +43,11 @@
</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$/TEST/TESTpacking.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="174">
- <caret line="97" column="49" lean-forward="true" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+ <state relative-caret-position="188">
+ <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
@@ -79,10 +56,22 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="248">
+ <caret line="1096" column="76" selection-start-line="1096" selection-start-column="76" selection-end-line="1096" selection-end-column="76" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="33" column="54" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="33" selection-end-column="54" />
+ <state relative-caret-position="138">
+ <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
</state>
</provider>
</entry>
@@ -90,8 +79,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1236">
- <caret line="18" selection-start-line="18" selection-end-line="18" />
+ <state relative-caret-position="399">
+ <caret line="124" lean-forward="true" selection-start-line="124" selection-end-line="124" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
@@ -102,7 +91,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
+ <state relative-caret-position="465">
<caret line="31" column="91" selection-end-line="31" selection-end-column="91" />
</state>
</provider>
@@ -111,7 +100,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/TEST/TestOpenMp.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="355">
+ <state relative-caret-position="2475">
<caret line="165" selection-start-line="165" selection-end-line="165" />
<folding>
<element signature="e#0#19#0" expanded="true" />
@@ -123,7 +112,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
+ <state relative-caret-position="11835">
<caret line="789" selection-start-line="789" selection-end-line="789" />
<folding>
<element signature="e#462#3260#0" />
@@ -135,7 +124,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
+ <state relative-caret-position="2040">
<caret line="136" column="30" selection-start-line="136" selection-start-column="15" selection-end-line="136" selection-end-column="35" />
</state>
</provider>
@@ -144,7 +133,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
+ <state relative-caret-position="2745">
<caret line="183" column="40" selection-start-line="183" selection-start-column="40" selection-end-line="183" selection-end-column="40" />
</state>
</provider>
@@ -159,18 +148,6 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="16380">
- <caret line="1092" column="80" selection-start-line="1092" selection-start-column="80" selection-end-line="1092" selection-end-column="80" />
- <folding>
- <element signature="e#52#93#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -264,7 +241,6 @@
<option value="$PROJECT_DIR$/EXP/Tuning2/Nursery-Clear-vfdt-2019-07-01-13:28:43-Config.txt" />
<option value="$PROJECT_DIR$/ML/NB/Stats.h" />
<option value="$PROJECT_DIR$/ML/NB/NB_Classifier.cpp" />
- <option value="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" />
<option value="$PROJECT_DIR$/CRYPTO/EvalLog.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTBuildingBlocks.cpp" />
<option value="$PROJECT_DIR$/ML/NB/Stats.cpp" />
@@ -275,11 +251,12 @@
<option value="$PROJECT_DIR$/PPML/PPNB/PPNB_Classifier.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTElementaryOps.h" />
<option value="$PROJECT_DIR$/TEST/TESTElementaryOps.cpp" />
- <option value="$PROJECT_DIR$/TEST/main.cpp" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.h" />
<option value="$PROJECT_DIR$/CRYPTO/DTPKC.cpp" />
<option value="$PROJECT_DIR$/TEST/TESTpacking.cpp" />
+ <option value="$PROJECT_DIR$/TEST/main.cpp" />
+ <option value="$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp" />
</list>
</option>
</component>
@@ -465,14 +442,8 @@
<workItem from="1577402904705" duration="8748000" />
<workItem from="1577552973318" duration="2692000" />
<workItem from="1577566516419" duration="6843000" />
- <workItem from="1577718521115" duration="13453000" />
- </task>
- <task id="LOCAL-00030" summary="27/11/2018 : PPVFDT still needs tweeking :'(">
- <created>1543352728939</created>
- <option name="number" value="00030" />
- <option name="presentableId" value="LOCAL-00030" />
- <option name="project" value="LOCAL" />
- <updated>1543352728939</updated>
+ <workItem from="1577718521115" duration="14738000" />
+ <workItem from="1578301835088" duration="267000" />
</task>
<task id="LOCAL-00031" summary="28/11/2018 : Code cleansing almost done">
<created>1543426843573</created>
@@ -810,11 +781,18 @@
<option name="project" value="LOCAL" />
<updated>1562314458539</updated>
</task>
- <option name="localTasksCounter" value="79" />
+ <task id="LOCAL-00079" summary="Packing tests">
+ <created>1577751375604</created>
+ <option name="number" value="00079" />
+ <option name="presentableId" value="LOCAL-00079" />
+ <option name="project" value="LOCAL" />
+ <updated>1577751375607</updated>
+ </task>
+ <option name="localTasksCounter" value="80" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="1084498000" />
+ <option name="totallyTimeSpent" value="1086050000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -827,24 +805,23 @@
</component>
<component name="ToolWindowManager">
<frame x="67" y="25" width="1853" height="925" extended-state="6" />
- <editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.36247924" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8053333" visible="true" weight="0.21914776" />
<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.49474266" weight="0.32663316" />
- <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.5423354" visible="true" weight="0.37688443" />
+ <window_info anchor="bottom" id="Run" order="3" sideWeight="0.54178196" weight="0.37688443" />
<window_info anchor="bottom" id="Debug" order="4" sideWeight="0.52241284" weight="0.32663316" />
<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.5135584" weight="0.41457286" />
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.45766464" side_tool="true" visible="true" weight="0.37688443" />
- <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4654123" weight="0.31658292" />
- <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.48976204" weight="0.32160804" />
- <window_info anchor="bottom" id="CMake" order="12" sideWeight="0.71278363" weight="0.36432162" />
+ <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.51300496" weight="0.41457286" />
+ <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5351411" side_tool="true" visible="true" weight="0.31658292" />
+ <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4648589" visible="true" weight="0.31658292" />
+ <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.48810184" weight="0.32035175" />
+ <window_info anchor="bottom" id="CMake" order="12" sideWeight="0.7122302" weight="0.36432162" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -900,7 +877,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
- <MESSAGE value="LR npp part 2" />
<MESSAGE value="Corrected some possible memory leaks mpfr log exp init variables LR, clear randstate" />
<MESSAGE value="Debugging the trace diff between PP and NPP" />
<MESSAGE value="Debugging the trace diff between PP and NPP : I think the pb is fixed !" />
@@ -925,7 +901,8 @@
<MESSAGE value="New dataset config PLR" />
<MESSAGE value="BANK2" />
<MESSAGE value="corrected the naive bayes implem" />
- <option name="LAST_COMMIT_MESSAGE" value="corrected the naive bayes implem" />
+ <MESSAGE value="Packing tests" />
+ <option name="LAST_COMMIT_MESSAGE" value="Packing tests" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1669,13 +1646,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="900">
- <caret line="60" selection-start-line="60" selection-end-line="60" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/EXP/DebugNb/Bank-Cipher-debug-time-2019-07-14-17:26:47-Stats.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1779,90 +1749,97 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="16380">
- <caret line="1092" column="80" selection-start-line="1092" selection-start-column="80" selection-end-line="1092" selection-end-column="80" />
- <folding>
- <element signature="e#52#93#0" expanded="true" />
- </folding>
+ <state relative-caret-position="495">
+ <caret line="33" column="54" selection-start-line="32" selection-start-column="11" selection-end-line="33" selection-end-column="54" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
+ <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
+ <state relative-caret-position="465">
+ <caret line="31" column="91" selection-end-line="31" selection-end-column="91" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/TestOpenMp.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="136" column="30" selection-start-line="136" selection-start-column="15" selection-end-line="136" selection-end-column="35" />
+ <state relative-caret-position="2475">
+ <caret line="165" selection-start-line="165" selection-end-line="165" />
+ <folding>
+ <element signature="e#0#19#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/TestOpenMp.cpp">
+ <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="355">
- <caret line="165" selection-start-line="165" selection-end-line="165" />
+ <state relative-caret-position="11835">
+ <caret line="789" selection-start-line="789" selection-end-line="789" />
<folding>
- <element signature="e#0#19#0" expanded="true" />
+ <element signature="e#462#3260#0" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
+ <entry file="file://$PROJECT_DIR$/PPML/IO/PPDatasetReader.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="31" column="91" selection-end-line="31" selection-end-column="91" />
+ <state relative-caret-position="2040">
+ <caret line="136" column="30" selection-start-line="136" selection-start-column="15" selection-end-line="136" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
+ <state relative-caret-position="2745">
<caret line="183" column="40" selection-start-line="183" selection-start-column="40" selection-end-line="183" selection-end-column="40" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/DTPKC.cpp">
+ <entry file="file://$PROJECT_DIR$/CONFIG/DAPPLE.config">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
- <caret line="789" selection-start-line="789" selection-end-line="789" />
- <folding>
- <element signature="e#462#3260#0" />
- </folding>
+ <state relative-caret-position="30">
+ <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTpacking.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1236">
- <caret line="18" selection-start-line="18" selection-end-line="18" />
+ <state relative-caret-position="188">
+ <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
<folding>
- <element signature="e#0#30#0" expanded="true" />
+ <element signature="e#0#24#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CRYPTO/EvalCmp.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/main.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="33" column="54" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="33" selection-end-column="54" />
+ <state relative-caret-position="248">
+ <caret line="1096" column="76" selection-start-line="1096" selection-start-column="76" selection-end-line="1096" selection-end-column="76" />
+ <folding>
+ <element signature="e#52#93#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TEST/TESTpacking.cpp">
+ <entry file="file://$PROJECT_DIR$/TEST/TESTElementaryOps.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="174">
- <caret line="97" column="49" lean-forward="true" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+ <state relative-caret-position="399">
+ <caret line="124" lean-forward="true" selection-start-line="124" selection-end-line="124" />
<folding>
- <element signature="e#0#24#0" expanded="true" />
+ <element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/CRYPTO/EvalDiv100.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="138">
+ <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/CRYPTO/EvalDiv100.cpp b/CRYPTO/EvalDiv100.cpp
index 041bab97..1f6a9d72 100755
--- a/CRYPTO/EvalDiv100.cpp
+++ b/CRYPTO/EvalDiv100.cpp
@@ -1,6 +1,3 @@
-
-
-
#include "EvalDiv100.h"
@@ -45,6 +42,7 @@ EvalDiv100 ::EvalDiv_U1_step1()
S5=dtpkc.PSdec0(S9);
S7=dtpkc.PSdec0(S4);
+
return {S9,S4,S5,S7};
}
diff --git a/TEST/main.cpp b/TEST/main.cpp
index 23b8ce65..c6d9c2a5 100755
--- a/TEST/main.cpp
+++ b/TEST/main.cpp
@@ -1089,12 +1089,12 @@ else {
/*TESTBuildingBlocks testBuildingBlocks;
testBuildingBlocks.run(deserialize, keySize, blindVal, DTPKC_Err, pathSer);*/
- TESTpacking tesTpacking;
- tesTpacking.run(deserialize, keySize, blindVal, DTPKC_Err, pathSer);
+ //TESTpacking tesTpacking;
+ //tesTpacking.run(deserialize, keySize, blindVal, DTPKC_Err, pathSer);
- /*TESTElementaryOps testOps;
- testOps.run(deserialize, keySize, blindVal, DTPKC_Err, pathSer);*/
+ TESTElementaryOps testOps;
+ testOps.run(deserialize, keySize, blindVal, DTPKC_Err, pathSer);
}
--
GitLab