Browse Source

determine to processor error

willi 5 years ago
parent
commit
0c5dd8c222

+ 124 - 127
.idea/workspace.xml

@@ -2,9 +2,9 @@
 <project version="4">
   <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
     <generated>
-      <config projectName="mdd" targetName="gtest" />
-      <config projectName="mdd" targetName="gtest_main" />
       <config projectName="mdd" targetName="auslegung_test" />
+      <config projectName="mdd" targetName="gtest_main" />
+      <config projectName="mdd" targetName="gtest" />
       <config projectName="mdd" targetName="mdd_lib" />
     </generated>
   </component>
@@ -15,27 +15,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4ddbafad-b85e-492e-80ec-3c73ef45688f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/lib/include/ModuleSwitch.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/include/ProcessorManual.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" afterDir="false" />
+      <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/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/lib/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/IModule.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IModule.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/IOutput.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IOutput.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/IProcessor.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IProcessor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/ModuleBase.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ModuleBase.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/ModuleMath.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ModuleMath.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/Output.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/Output.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/ProcessorBase.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ProcessorBase.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/ModuleBase.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleBase.cpp" 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/src/Output.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/Output.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" 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/test/test_ModuleMath.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test/test_ModuleMath.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/" />
@@ -55,81 +41,79 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
+        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="36" column="64" selection-start-line="36" selection-start-column="64" selection-end-line="36" selection-end-column="64" />
+            <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" />
               <folding>
-                <element signature="e#57#72#0" expanded="true" />
+                <element signature="e#0#28#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/include/ModuleBase.h">
+        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+            <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" />
               <folding>
-                <element signature="e#51#69#0" expanded="true" />
+                <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/src/ModuleBase.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="236">
-              <caret line="65" selection-start-line="65" selection-end-line="65" />
+            <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#23#0" expanded="true" />
+                <element signature="e#0#24#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="16" column="59" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+            <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#28#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/include/IModule.h">
+        <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
           <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="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/include/ModuleSwitch.h">
+        <entry file="file://$PROJECT_DIR$/lib/test/CMakeLists.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
+            <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/include/ProcessorManual.h">
+        <entry file="file://$PROJECT_DIR$/lib/include/IModule.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+            <state relative-caret-position="375">
+              <caret line="25" selection-start-line="25" selection-end-line="25" />
               <folding>
-                <element signature="e#60#86#0" expanded="true" />
+                <element signature="e#45#65#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -138,7 +122,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="386">
+            <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" />
@@ -149,10 +133,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
           <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 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>
           </provider>
         </entry>
@@ -160,8 +144,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
+            <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>
@@ -214,7 +198,6 @@
         <option value="$PROJECT_DIR$/lib/include/IOutput.h" />
         <option value="$PROJECT_DIR$/lib/src/Output.cpp" />
         <option value="$PROJECT_DIR$/lib/include/Output.h" />
-        <option value="$PROJECT_DIR$/lib/test/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/lib/src/ModuleBase.cpp" />
         <option value="$PROJECT_DIR$/lib/include/ModulBase.h" />
         <option value="$PROJECT_DIR$/lib/include/IModule.h" />
@@ -231,15 +214,17 @@
         <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/src/ModuleSwitch.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" />
       </list>
     </option>
   </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="OCResolveContextSettings">
-    <option name="configuration" value="0-mdd_lib" />
+    <option name="configuration" value="0-auslegung_test" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="141" />
@@ -301,21 +286,22 @@
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/test" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="CMakeSettings" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/lib" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/lib/thirdparty" />
       <recent name="$PROJECT_DIR$/lib/includes" />
       <recent name="$PROJECT_DIR$/lib" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lib/test" />
+      <recent name="$PROJECT_DIR$/lib" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -422,6 +408,7 @@
       <workItem from="1589965045546" duration="13832000" />
       <workItem from="1589979027570" duration="3504000" />
       <workItem from="1589982545546" duration="300000" />
+      <workItem from="1589982859071" duration="2423000" />
     </task>
     <servers />
   </component>
@@ -458,7 +445,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="101993000" />
+    <option name="totallyTimeSpent" value="104416000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -473,12 +460,12 @@
     <frame x="0" y="-2" width="1920" height="1082" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.22838847" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.23105656" />
       <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" weight="0.2980063" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" 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" />
@@ -535,12 +522,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp</url>
-          <line>20</line>
+          <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>22</line>
+          <line>24</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
       </breakpoints>
@@ -552,7 +539,6 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/include/TestClass.h" />
     <entry file="file://$PROJECT_DIR$/lib/thirdparty/__init__.py" />
     <entry file="file://$PROJECT_DIR$/README.MD">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -686,20 +672,6 @@
     <entry file="file://$PROJECT_DIR$/lib/include/ModuleCompare.h" />
     <entry file="file://$PROJECT_DIR$/lib/include/ModulePass.h" />
     <entry file="file://$PROJECT_DIR$/lib/src/ModulePass.cpp" />
-    <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/Output.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -717,13 +689,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="34" column="58" selection-start-line="34" selection-start-column="58" selection-end-line="34" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/IProcessor.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -734,23 +699,6 @@
         </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="630">
-          <caret line="43" column="59" lean-forward="true" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="59" />
-          <folding>
-            <element signature="e#0#24#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ModuleMath.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="370" column="21" selection-start-line="370" selection-start-column="21" selection-end-line="370" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/IOutput.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -781,12 +729,33 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
+    <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="240">
-          <caret line="16" column="59" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+        <state relative-caret-position="105">
+          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#60#86#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -801,44 +770,65 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
+    <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/lib/include/ProcessorManual.h">
+    <entry file="file://$PROJECT_DIR$/lib/test/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        <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>
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.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#60#86#0" expanded="true" />
+            <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/src/ProcessorBase.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.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 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" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="65" selection-start-line="65" selection-end-line="65" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="76" selection-start-line="76" selection-end-line="76" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.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" />
           <folding>
             <element signature="e#0#24#0" expanded="true" />
             <element signature="e#70#98#0" expanded="true" />
@@ -846,10 +836,17 @@
         </state>
       </provider>
     </entry>
+    <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" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
+        <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>

+ 1 - 1
lib/include/ProcessorManual.h

@@ -5,7 +5,7 @@
 namespace mdd {
     class ProcessorManual : public ProcessorBase {
     private:
-        Output _iteration;
+        std::shared_ptr<Output> _iteration;
     public:
         ProcessorManual();
 

+ 6 - 6
lib/src/ModuleSwitch.cpp

@@ -17,14 +17,14 @@ namespace mdd{
         setType("Switch");
     }
     bool ModuleSwitch::update(){
-        std::cout << "SWITCH"<<"\n" << getInputValue(0).dump()<<"\n";
         int index = getInputValue(0)["value"].get<int>();
-        if(index > getInputs().size() - 2){
-            index = getInputs().size() - 2;
+        if(index == 0){
+            index = 1;
         }
-
-        json ret = getInputValue(index + 1)["value"];
-
+        if(index > getInputs().size() - 1){
+            index = getInputs().size() - 1;
+        }
+        json ret = getInputValue(index)["value"];
         if (ret.dump() != getOutput(0)->getValue()["value"].dump()) {
             setOutputValue(0)["value"] = ret ;
             return true;

+ 5 - 7
lib/src/ProcessorManual.cpp

@@ -2,16 +2,17 @@
 #include <iostream>
 
 namespace mdd {
-    ProcessorManual::ProcessorManual():
-            _iteration("Value", "{ \"value\": 0 }"_json)
+    ProcessorManual::ProcessorManual()
     {
-
+        _iteration = std::make_shared<Output>("Value", "{ \"value\": 0 }"_json);
     }
 
     bool ProcessorManual::update() {
         bool ret = false;
         bool group_state = true;
         while(group_state){
+            _iteration->getValueInternal()["value"]= _iteration->getValue()["value"].get<int>()+1;
+            std::cout << _iteration->getValue().dump()<<"\n";
             group_state = false;
             for (int i = 0; i < getModules().size(); ++i) {
                 bool module_state = getModule(i)->update();
@@ -20,14 +21,11 @@ namespace mdd {
                     ret = true;
                 }
             }
-            _iteration.getValueInternal()["value"]= _iteration.getValue()["value"].get<int>()+1;
-
-            std::cout << _iteration.getValue().dump()<<"\n";
         }
         return ret;
     }
 
     std::shared_ptr<IOutput> ProcessorManual::getIteration(){
-        return std::make_shared<Output>(_iteration);
+        return _iteration;
     }
 }

+ 1 - 0
lib/test/CMakeLists.txt

@@ -1,6 +1,7 @@
 if(EXISTS /usr/src/gtest)
     add_executable(auslegung_test
             test_ModuleMath.cpp
+            test_ModuleSwitch.cpp
             test_ProcessorManual.cpp
             )
     target_link_libraries(auslegung_test gtest gtest_main ${PROJECT_NAME})

+ 63 - 0
lib/test/test_ModuleSwitch.cpp

@@ -0,0 +1,63 @@
+#include <gtest/gtest.h>
+#include <json.hpp>
+//#define private public
+#include <ProcessorManual.h>
+#include <ModuleMath.h>
+#include <ModuleSwitch.h>
+
+
+using namespace mdd;
+TEST(ModuleSwitch, EasySwitch){
+    ModuleSwitch sModule = ModuleSwitch();
+
+    sModule.setInputDefaultValue(0)["value"] = 0;
+    sModule.setInputDefaultValue(1)["value"] = 1;
+    sModule.setInputDefaultValue(2)["value"] = 2;
+
+    sModule.update();
+
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 1);
+
+    sModule.setInputDefaultValue(0)["value"] = 1;
+    sModule.update();
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 1);
+
+    sModule.setInputDefaultValue(0)["value"] = 2;
+    sModule.update();
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 2);
+
+    sModule.setInputDefaultValue(0)["value"] = 3;
+    sModule.update();
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 2);
+    sModule.setInputDefaultValue(0)["value"] = 33;
+    sModule.update();
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 2);
+}
+
+TEST(ModuleSwitch, ConnectTest){
+    ModuleMath f0 = ModuleMath(MULTIPLY);
+    f0.setInputDefaultValue(0)["value"] = 1;
+    f0.setInputDefaultValue(1)["value"] = 1;
+
+    ModuleMath f1 = ModuleMath(MULTIPLY);
+    f1.setInputDefaultValue(0)["value"] = 2;
+    f1.setInputDefaultValue(1)["value"] = 3;
+
+    ModuleMath f2 = ModuleMath(MULTIPLY);
+    f2.setInputDefaultValue(0)["value"] = 5;
+    f2.setInputDefaultValue(1)["value"] = 7;
+
+    ModuleSwitch sModule = ModuleSwitch();
+
+    sModule.connectInput(0,f0.getOutput(0));
+    sModule.connectInput(1,f1.getOutput(0));
+    sModule.connectInput(2,f2.getOutput(0));
+
+    f0.update();
+    f1.update();
+    f2.update();
+    sModule.update();
+
+
+    EXPECT_EQ(sModule.getOutput(0)->getValue()["value"].get<int>(), 6);
+}