Browse Source

working ID connection

willi 5 years ago
parent
commit
bbe92619db
3 changed files with 138 additions and 164 deletions
  1. 105 131
      .idea/workspace.xml
  2. 23 23
      lib/src/ModuleMath.cpp
  3. 10 10
      lib/test/test_ProcessorManual.cpp

+ 105 - 131
.idea/workspace.xml

@@ -2,10 +2,10 @@
 <project version="4">
   <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
     <generated>
-      <config projectName="mdd" targetName="auslegung_test" />
-      <config projectName="mdd" targetName="gtest_main" />
       <config projectName="mdd" targetName="gtest" />
       <config projectName="mdd" targetName="mdd_lib" />
+      <config projectName="mdd" targetName="auslegung_test" />
+      <config projectName="mdd" targetName="gtest_main" />
     </generated>
   </component>
   <component name="CMakeSettings">
@@ -15,13 +15,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4ddbafad-b85e-492e-80ec-3c73ef45688f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/thirdparty/json/single_include/json.hpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/ProcessorManual.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ProcessorManual.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/test/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/ModuleMath.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleMath.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/thirdparty/json" beforeDir="false" afterPath="$PROJECT_DIR$/thirdparty/json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@@ -43,8 +40,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="59" lean-forward="true" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" />
+            <state relative-caret-position="420">
+              <caret line="28" column="25" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="25" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -53,81 +50,71 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="302">
-              <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
+            <state relative-caret-position="229">
+              <caret line="24" column="45" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="45" />
               <folding>
-                <element signature="e#0#24#0" expanded="true" />
-                <element signature="e#70#98#0" expanded="true" />
+                <element signature="e#0#23#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-733">
-              <caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#24#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="300">
+              <caret line="20" column="26" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/test/CMakeLists.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="214">
-              <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
-              <folding>
-                <element signature="e#0#23#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="45">
+              <caret line="3" column="33" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
+        <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="26" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
+            <state relative-caret-position="512">
+              <caret line="78" column="74" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="74" />
+              <folding>
+                <element signature="e#0#24#0" expanded="true" />
+                <element signature="e#70#98#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/CMakeLists.txt">
+        <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="3" column="33" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
+            <state relative-caret-position="330">
+              <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/include/IModule.h">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/ModuleMath.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="375">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-              <folding>
-                <element signature="e#45#65#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="394">
+              <caret line="294" column="54" lean-forward="true" selection-start-line="294" selection-start-column="54" selection-end-line="294" selection-end-column="54" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1140">
-              <caret line="76" selection-start-line="76" selection-end-line="76" />
-              <folding>
-                <element signature="e#0#24#0" expanded="true" />
-                <element signature="e#70#98#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="15">
+              <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -136,16 +123,16 @@
         <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="120">
-              <caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
+              <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="435">
-              <caret line="29" column="24" lean-forward="true" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
+            <state relative-caret-position="285">
+              <caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="33" />
               <folding>
                 <element signature="e#0#25#0" expanded="true" />
               </folding>
@@ -212,20 +199,17 @@
         <option value="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" />
         <option value="$PROJECT_DIR$/lib/include/IProcessor.h" />
         <option value="$PROJECT_DIR$/lib/include/ProcessorBase.h" />
-        <option value="$PROJECT_DIR$/lib/src/ModuleMath.cpp" />
-        <option value="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" />
         <option value="$PROJECT_DIR$/lib/include/ProcessorManual.h" />
         <option value="$PROJECT_DIR$/lib/test/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" />
         <option value="$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp" />
         <option value="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" />
+        <option value="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" />
+        <option value="$PROJECT_DIR$/lib/src/ModuleMath.cpp" />
       </list>
     </option>
   </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
-  <component name="OCResolveContextSettings">
-    <option name="configuration" value="0-auslegung_test" />
-  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="141" />
     <option name="width" value="1440" />
@@ -315,7 +299,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="CMake Application.auslegung_test">
+  <component name="RunManager" selected="Google Test.All in auslegung_test">
     <configuration name="All in auslegung_test" type="CMakeGoogleTestRunConfigurationType" factoryName="Google Test" nameIsGenerated="true" PASS_PARENT_ENVS_2="true" PROJECT_NAME="mdd" TARGET_NAME="auslegung_test" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="mdd" RUN_TARGET_NAME="auslegung_test" TEST_MODE="SUITE_TEST">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -408,20 +392,12 @@
       <workItem from="1589965045546" duration="13832000" />
       <workItem from="1589979027570" duration="3504000" />
       <workItem from="1589982545546" duration="300000" />
-      <workItem from="1589982859071" duration="2423000" />
+      <workItem from="1589982859071" duration="2825000" />
+      <workItem from="1590072044480" duration="1259000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_in_auslegung_test - 2020.05.13 at 19h 37m 15s.xml">
-      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_in_auslegung_test - 2020.05.13 at 19h 38m 56s.xml">
-      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_in_auslegung_test - 2020.05.13 at 19h 43m 46s.xml">
-      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_in_auslegung_test - 2020.05.13 at 19h 45m 12s.xml">
       <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
@@ -443,9 +419,18 @@
     <history-entry file="ModuleMath - 2020.05.13 at 19h 58m 50s.xml">
       <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_in_auslegung_test - 2020.05.21 at 16h 42m 17s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_in_auslegung_test - 2020.05.21 at 16h 48m 20s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_in_auslegung_test - 2020.05.21 at 16h 51m 43s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="104416000" />
+    <option name="totallyTimeSpent" value="106077000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -458,21 +443,20 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="-2" width="1920" height="1082" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.23105656" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.23372465" />
       <window_info id="Structure" order="1" sideWeight="0.5007825" side_tool="true" weight="0.22572039" />
       <window_info id="Favorites" order="2" sideWeight="0.5007825" side_tool="true" weight="0.22572039" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2980063" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.2980063" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39874083" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32948583" />
       <window_info anchor="bottom" id="Database Changes" order="7" />
       <window_info anchor="bottom" id="Messages" order="8" weight="0.32423925" />
-      <window_info anchor="bottom" id="Terminal" order="9" weight="0.25498426" />
+      <window_info anchor="bottom" id="Terminal" order="9" weight="0.25393495" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="11" weight="0.32948583" />
       <window_info anchor="bottom" id="CMake" order="12" weight="0.32948583" />
@@ -520,16 +504,6 @@
           <line>76</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp</url>
-          <line>19</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp</url>
-          <line>24</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
@@ -729,27 +703,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ModuleMath.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3600">
-          <caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="34" column="21" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/ProcessorManual.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -770,6 +723,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="705">
+          <caret line="47" column="44" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
+          <folding>
+            <element signature="e#0#24#0" expanded="true" />
+            <element signature="e#70#98#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#24#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
@@ -784,51 +758,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1140">
-          <caret line="76" selection-start-line="76" selection-end-line="76" />
-          <folding>
-            <element signature="e#0#24#0" expanded="true" />
-            <element signature="e#70#98#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="120">
+          <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="59" lean-forward="true" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" />
+        <state relative-caret-position="420">
+          <caret line="28" column="25" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="25" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
+        <state relative-caret-position="285">
+          <caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="33" />
           <folding>
-            <element signature="e#0#23#0" expanded="true" />
+            <element signature="e#0#25#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-733">
-          <caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="31" />
+        <state relative-caret-position="229">
+          <caret line="24" column="45" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="45" />
           <folding>
-            <element signature="e#0#24#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
+        <state relative-caret-position="512">
+          <caret line="78" column="74" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="74" />
           <folding>
             <element signature="e#0#24#0" expanded="true" />
             <element signature="e#70#98#0" expanded="true" />
@@ -836,20 +813,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
+    <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
+        <state relative-caret-position="330">
+          <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/src/ModuleMath.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="29" column="24" lean-forward="true" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#25#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="394">
+          <caret line="294" column="54" lean-forward="true" selection-start-line="294" selection-start-column="54" selection-end-line="294" selection-end-column="54" />
         </state>
       </provider>
     </entry>

+ 23 - 23
lib/src/ModuleMath.cpp

@@ -38,13 +38,13 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            ret = val1.get<float>() + val2.get<float>();
+                            ret = val1.get<double>() + val2.get<double>();
                         } else {
                             ret = val1.get<float>() + val2.get<int>();
                         }
                     } else {
                         if (val2.is_number_float()) {
-                            ret = val1.get<int>() + val2.get<float>();
+                            ret = val1.get<int>() + val2.get<double>();
                         } else {
                             ret = val1.get<int>() + val2.get<int>();
                         }
@@ -81,13 +81,13 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            ret = val1.get<float>() - val2.get<float>();
+                            ret = val1.get<double>() - val2.get<double>();
                         } else {
-                            ret = val1.get<float>() - val2.get<int>();
+                            ret = val1.get<double>() - val2.get<int>();
                         }
                     } else {
                         if (val2.is_number_float()) {
-                            ret = val1.get<int>() - val2.get<float>();
+                            ret = val1.get<int>() - val2.get<double>();
                         } else {
                             ret = val1.get<int>() - val2.get<int>();
                         }
@@ -124,9 +124,9 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            ret = val1.get<float>() * val2.get<float>();
+                            ret = val1.get<double>() * val2.get<double>();
                         } else {
-                            ret = val1.get<float>() * val2.get<int>();
+                            ret = val1.get<double>() * val2.get<int>();
                         }
                     } else {
                         if (val2.is_number_float()) {
@@ -167,13 +167,13 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            ret = val1.get<float>() / val2.get<float>();
+                            ret = val1.get<double>() / val2.get<double>();
                         } else {
-                            ret = val1.get<float>() / val2.get<int>();
+                            ret = val1.get<double>() / val2.get<int>();
                         }
                     } else {
                         if (val2.is_number_float()) {
-                            ret = val1.get<int>() / val2.get<float>();
+                            ret = val1.get<int>() / val2.get<double>();
                         } else {
                             ret = val1.get<int>()*1.0 / val2.get<int>();
                         }
@@ -218,24 +218,24 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            if(val1.get<float>()<= val2.get<float>()){
-                                ret = val1.get<float>();
+                            if(val1.get<double>()<= val2.get<double>()){
+                                ret = val1.get<double>();
                             } else{
-                                ret = val2.get<float>();
+                                ret = val2.get<double>();
                             }
                         } else {
-                            if(val1.get<float>()<= val2.get<int>()*1.0){
-                                ret = val1.get<float>();
+                            if(val1.get<double>()<= val2.get<int>()*1.0){
+                                ret = val1.get<double>();
                             } else{
                                 ret = val2.get<int>();
                             }
                         }
                     } else {
                         if (val2.is_number_float()) {
-                            if(val1.get<int>()*1.0 <= val2.get<float>()){
+                            if(val1.get<int>()*1.0 <= val2.get<double>()){
                                 ret = val1.get<int>();
                             } else{
-                                ret = val2.get<float>();
+                                ret = val2.get<double>();
                             }
                         } else {
                             if(val1.get<int>()<= val2.get<int>()){
@@ -277,24 +277,24 @@ namespace mdd {
                 if (val1.is_number() && val2.is_number()) {
                     if (val1.is_number_float()) {
                         if (val2.is_number_float()) {
-                            if(val1.get<float>()>= val2.get<float>()){
-                                ret = val1.get<float>();
+                            if(val1.get<double>()>= val2.get<double>()){
+                                ret = val1.get<double>();
                             } else{
-                                ret = val2.get<float>();
+                                ret = val2.get<double>();
                             }
                         } else {
                             if(val1.get<float>()>= val2.get<int>()*1.0){
-                                ret = val1.get<float>();
+                                ret = val1.get<double>();
                             } else{
                                 ret = val2.get<int>();
                             }
                         }
                     } else {
                         if (val2.is_number_float()) {
-                            if(val1.get<int>()*1.0 >= val2.get<float>()){
+                            if(val1.get<int>()*1.0 >= val2.get<double>()){
                                 ret = val1.get<int>();
                             } else{
-                                ret = val2.get<float>();
+                                ret = val2.get<double>();
                             }
                         } else {
                             if(val1.get<int>()>= val2.get<int>()){

+ 10 - 10
lib/test/test_ProcessorManual.cpp

@@ -59,22 +59,22 @@ TEST(ProcessorManual, CalculateAdvancedFormula){
 
 TEST(ProcessorManual, CalculateExtremeFormula){
     //x_0=8, x_i=x_{i-1}/2
-    ModuleSwitch switchModule = ModuleSwitch();
-    ModuleMath calcModule = ModuleMath(DIVIDE);
+    std::shared_ptr<ModuleSwitch> switchModule =  std::make_shared<ModuleSwitch>();
+    std::shared_ptr<ModuleMath> calcModule = std::make_shared<ModuleMath>(DIVIDE);
     ProcessorManual processor = ProcessorManual();
-    processor.addModule(std::make_shared<ModuleSwitch>(switchModule));
-    processor.addModule(std::make_shared<ModuleMath>(calcModule));
+    processor.addModule(switchModule);
+    processor.addModule(calcModule);
 
     bool connect;
-    connect =switchModule.connectInput(0,processor.getIteration());
-    switchModule.setInputDefaultValue(1)["value"] = 8.0;
-    connect = switchModule.connectInput(2,calcModule.getOutput(0));
+    connect =switchModule->connectInput(0,processor.getIteration());
+    switchModule->setInputDefaultValue(1)["value"] = 8.0;
+    connect = switchModule->connectInput(2,calcModule->getOutput(0));
 
-    calcModule.connectInput(0,switchModule.getOutput(0));
-    calcModule.setInputDefaultValue(1)["value"] = 2.0;
+    calcModule->connectInput(0,switchModule->getOutput(0));
+    calcModule->setInputDefaultValue(1)["value"] = 2.0;
 
     processor.addOutput(1,0);
     processor.update();
 
-    EXPECT_FLOAT_EQ(processor.getOutput(0)->getValue()["value"].get<float>(), 0.0);
+    EXPECT_FLOAT_EQ(processor.getOutput(0)->getValue()["value"].get<double>(), 0.0);
 }