소스 검색

all test work

willi 5 년 전
부모
커밋
583929cbb4
8개의 변경된 파일214개의 추가작업 그리고 190개의 파일을 삭제
  1. 179 174
      .idea/workspace.xml
  2. 5 1
      lib/src/Input.cpp
  3. 1 0
      lib/src/ModuleMath.cpp
  4. 3 1
      lib/src/ModuleSwitch.cpp
  5. 3 2
      lib/src/ProcessorBase.cpp
  6. 3 4
      lib/src/ProcessorManual.cpp
  7. 1 1
      lib/test/test_ModuleMath.cpp
  8. 19 7
      lib/test/test_ProcessorManual.cpp

+ 179 - 174
.idea/workspace.xml

@@ -15,29 +15,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4ddbafad-b85e-492e-80ec-3c73ef45688f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/lib/include/IInput.h" 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/HandlerModule.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/HandlerModule.h" 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/IUnique.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IUnique.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/include/Input.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/Input.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/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/include/ProcessorManual.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ProcessorManual.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/Input.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/Input.cpp" 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/ModuleSwitch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleSwitch.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/src/ProcessorManual.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" 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$/lib/test/test_ModuleSwitch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test/test_ModuleSwitch.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>
@@ -68,11 +53,11 @@
                 </provider>
               </entry>
             </file>
-            <file pinned="false" current-in-tab="false">
+            <file pinned="false" current-in-tab="true">
               <entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
                 <provider selected="true" editor-type-id="text-editor">
-                  <state relative-caret-position="495">
-                    <caret line="33" column="23" lean-forward="true" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+                  <state relative-caret-position="374">
+                    <caret line="43" column="30" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
                     <folding>
                       <element signature="e#57#72#0" expanded="true" />
                     </folding>
@@ -80,7 +65,7 @@
                 </provider>
               </entry>
             </file>
-            <file pinned="false" current-in-tab="true">
+            <file pinned="false" current-in-tab="false">
               <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
                 <provider selected="true" editor-type-id="text-editor">
                   <state relative-caret-position="719">
@@ -104,110 +89,107 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/include/IInput.h">
           <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="165">
+              <caret line="11" column="26" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
               <folding>
-                <element signature="e#0#25#0" expanded="true" />
+                <element signature="e#43#63#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
+        <entry file="file://$PROJECT_DIR$/lib/src/Input.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="405">
-              <caret line="53" column="23" lean-forward="true" selection-start-line="53" selection-start-column="23" selection-end-line="53" selection-end-column="23" />
+            <state relative-caret-position="356">
+              <caret line="50" selection-start-line="50" selection-end-line="50" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/include/IUnique.h">
+        <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
+            <state relative-caret-position="173">
+              <caret line="176" selection-start-line="176" selection-end-line="176" />
             </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/ModuleMath.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="30" column="1" lean-forward="true" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+            <state relative-caret-position="60">
+              <caret line="19" column="62" lean-forward="true" selection-start-line="19" selection-start-column="62" selection-end-line="19" selection-end-column="62" />
               <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/ProcessorManual.h">
+        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="135">
-              <caret line="9" column="37" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="37" />
+              <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
               <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>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="47" column="10" selection-start-line="47" selection-start-column="10" selection-end-line="47" selection-end-column="10" />
+            <state relative-caret-position="443">
+              <caret line="103" column="89" lean-forward="true" selection-start-line="103" selection-start-column="89" selection-end-line="103" selection-end-column="89" />
               <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/include/ModuleMath.h">
+        <entry file="file:///usr/include/c++/7/bits/shared_ptr.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="35" column="14" lean-forward="true" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
+            <state relative-caret-position="257">
+              <caret line="707" selection-start-line="707" selection-end-line="707" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/ModuleMath.cpp">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="572">
-              <caret line="324" column="21" selection-start-line="324" selection-start-column="21" selection-end-line="324" selection-end-column="21" />
+            <state relative-caret-position="420">
+              <caret line="34" column="21" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
+        <entry file="file:///usr/src/gtest/src/gtest.cc">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="77">
-              <caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#24#0" expanded="true" />
-                <element signature="e#70#98#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="173">
+              <caret line="2481" selection-start-line="2481" selection-end-line="2481" />
             </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/ProcessorManual.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-238">
-              <caret line="43" column="47" selection-start-line="43" selection-start-column="47" selection-end-line="43" selection-end-column="47" />
+            <state relative-caret-position="135">
+              <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
               <folding>
-                <element signature="e#0#24#0" expanded="true" />
-                <element signature="e#70#98#0" expanded="true" />
+                <element signature="e#0#28#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -267,22 +249,22 @@
         <option value="$PROJECT_DIR$/lib/include/Output.h" />
         <option value="$PROJECT_DIR$/lib/include/IInput.h" />
         <option value="$PROJECT_DIR$/lib/include/Input.h" />
-        <option value="$PROJECT_DIR$/lib/src/Input.cpp" />
         <option value="$PROJECT_DIR$/lib/include/ModuleBase.h" />
         <option value="$PROJECT_DIR$/lib/include/HandlerModule.h" />
         <option value="$PROJECT_DIR$/lib/include/IOutput.h" />
         <option value="$PROJECT_DIR$/lib/include/IModule.h" />
         <option value="$PROJECT_DIR$/lib/include/IProcessor.h" />
-        <option value="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" />
+        <option value="$PROJECT_DIR$/lib/include/ProcessorBase.h" />
+        <option value="$PROJECT_DIR$/lib/include/ProcessorManual.h" />
+        <option value="$PROJECT_DIR$/lib/src/ModuleBase.cpp" />
         <option value="$PROJECT_DIR$/lib/test/test_ModuleMath.cpp" />
+        <option value="$PROJECT_DIR$/lib/src/Input.cpp" />
+        <option value="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" />
+        <option value="$PROJECT_DIR$/lib/src/ModuleMath.cpp" />
         <option value="$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp" />
-        <option value="$PROJECT_DIR$/lib/include/ProcessorBase.h" />
         <option value="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" />
-        <option value="$PROJECT_DIR$/lib/include/ProcessorManual.h" />
         <option value="$PROJECT_DIR$/lib/src/ProcessorManual.cpp" />
-        <option value="$PROJECT_DIR$/lib/src/ModuleBase.cpp" />
         <option value="$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp" />
-        <option value="$PROJECT_DIR$/lib/src/ModuleMath.cpp" />
       </list>
     </option>
   </component>
@@ -482,39 +464,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 45m 27s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 16m 47s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 45m 46s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 17m 49s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 47m 13s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 18m 17s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 51m 06s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 20m 38s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 52m 44s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 21m 22s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="ModuleMath - 2020.05.13 at 19h 58m 50s.xml">
-      <configuration name="ModuleMath" configurationId="CMakeGoogleTestRunConfigurationType" />
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 26m 53s.xml">
+      <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_in_auslegung_test - 2020.05.21 at 16h 42m 17s.xml">
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 26m 54s.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">
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 29m 21s.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">
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 30m 15s.xml">
       <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_in_auslegung_test - 2020.05.25 at 20h 54m 03s.xml">
+    <history-entry file="All_in_auslegung_test - 2020.05.25 at 23h 31m 15s.xml">
       <configuration name="All in auslegung_test" configurationId="CMakeGoogleTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="147730000" />
+    <option name="totallyTimeSpent" value="154690000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -534,8 +516,8 @@
       <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 active="true" 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="Run" order="2" weight="0.2980063" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" 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" />
@@ -577,6 +559,20 @@
     <option name="version" value="1" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp</url>
+          <line>91</line>
+          <option name="timeStamp" value="18" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/lib/test/test_ProcessorManual.cpp</url>
+          <line>102</line>
+          <option name="timeStamp" value="19" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="CMakeRunConfiguration">
         <watch expression="this-&gt;_inputs[0].output.get()" />
@@ -584,14 +580,6 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/BaseModule.cpp" />
-    <entry file="file:///usr/include/c++/7/bits/shared_ptr.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="92" column="10" selection-start-line="92" selection-start-column="10" selection-end-line="92" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/include/c++/7/bits/std_function.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="159">
@@ -696,23 +684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/Input.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
-          <folding>
-            <element signature="e#41#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/Input.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
-          <caret line="33" column="35" lean-forward="true" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -720,16 +691,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/IInput.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="46" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="46" />
-          <folding>
-            <element signature="e#43#63#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/HandlerModule.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -788,23 +749,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ModuleSwitch.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="15" lean-forward="true" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <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" />
-          <folding>
-            <element signature="e#0#25#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/ModuleBase.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="510">
@@ -822,23 +766,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
-          <caret line="33" column="23" lean-forward="true" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
-          <folding>
-            <element signature="e#57#72#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="53" column="23" lean-forward="true" selection-start-line="53" selection-start-column="23" selection-end-line="53" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/thirdparty/json/single_include/nlohmann/json.hpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="720">
@@ -866,59 +793,137 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleMath.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="30" column="1" lean-forward="true" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+        <state relative-caret-position="361">
+          <caret line="59" selection-start-line="59" selection-end-line="59" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#0#24#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test/test_ModuleSwitch.cpp">
+    <entry file="file://$PROJECT_DIR$/lib/include/Input.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
+        <state relative-caret-position="390">
+          <caret line="30" column="23" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
           <folding>
-            <element signature="e#0#24#0" expanded="true" />
-            <element signature="e#70#98#0" expanded="true" />
+            <element signature="e#41#58#0" expanded="true" />
           </folding>
         </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="-238">
-          <caret line="43" column="47" selection-start-line="43" selection-start-column="47" selection-end-line="43" selection-end-column="47" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
           <folding>
-            <element signature="e#0#24#0" expanded="true" />
-            <element signature="e#70#98#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/include/IInput.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="47" column="10" selection-start-line="47" selection-start-column="10" selection-end-line="47" selection-end-column="10" />
+        <state relative-caret-position="165">
+          <caret line="11" column="26" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+          <folding>
+            <element signature="e#43#63#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="135">
+          <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
           <folding>
             <element signature="e#0#24#0" expanded="true" />
+            <element signature="e#70#98#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/src/gtest/src/gtest.cc">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="2481" selection-start-line="2481" selection-end-line="2481" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/include/ModuleMath.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="35" column="14" lean-forward="true" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
+        <state relative-caret-position="420">
+          <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/src/ModuleMath.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="324" column="21" selection-start-line="324" selection-start-column="21" selection-end-line="324" selection-end-column="21" />
+        <state relative-caret-position="60">
+          <caret line="19" column="62" lean-forward="true" selection-start-line="19" selection-start-column="62" selection-end-line="19" selection-end-column="62" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="43" column="30" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
+          <folding>
+            <element signature="e#57#72#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorManual.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="176" selection-start-line="176" selection-end-line="176" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/include/c++/7/bits/shared_ptr.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="707" selection-start-line="707" selection-end-line="707" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/Input.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
+        </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="443">
+          <caret line="103" column="89" lean-forward="true" selection-start-line="103" selection-start-column="89" selection-end-line="103" selection-end-column="89" />
+          <folding>
+            <element signature="e#0#24#0" expanded="true" />
+            <element signature="e#70#98#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 5 - 1
lib/src/Input.cpp

@@ -32,7 +32,11 @@ namespace mdd{
     }
 
     const json& Input::getValue() {
-        return _value;
+        if(_output == nullptr){
+            return _value;
+        } else{
+            return _output->getValue();
+        }
     }
 
     json& Input::setDefaultValue(){

+ 1 - 0
lib/src/ModuleMath.cpp

@@ -1,4 +1,5 @@
 #include "ModuleMath.h"
+#include <iostream>
 
 namespace mdd {
     ModuleMath::ModuleMath(MathOperation operation) {

+ 3 - 1
lib/src/ModuleSwitch.cpp

@@ -11,7 +11,7 @@ namespace mdd{
             return true;
         };
         addInput("Switch",0, default_val, veri);
-        addInput("Value0",0, default_val, veri);
+        addInput("Value",0, default_val, veri);
         addInput("Default",0, default_val, veri);
         addOutput("Value",0, default_val);
         setType("Switch");
@@ -21,9 +21,11 @@ namespace mdd{
         if(index == 0){
             index = 1;
         }
+
         if(index > getInputs().size() - 1){
             index = getInputs().size() - 1;
         }
+
         json ret = getInput(index)->getValue()["value"];
         if (ret.dump() != getOutput(0)->getValue()["value"].dump()) {
             getOutput(0)->getValueInternal()["value"] = ret ;

+ 3 - 2
lib/src/ProcessorBase.cpp

@@ -72,8 +72,9 @@ namespace mdd{
 
     std::string ProcessorBase::addModule(std::shared_ptr<IModule> module){
         _modules.emplace_back(module);
-        _modules[_modules.size()-1]->setPrefix(getID());
-        return _modules[_modules.size()-1]->getID();
+        _modules.back()->setPrefix(getID());
+        _modules.back()->setAppendix(_modules.size()-1);
+        return _modules.back()->getID();
     }
 
     std::string ProcessorBase::addModuleInput(std::string module_ID, std::string input_ID){

+ 3 - 4
lib/src/ProcessorManual.cpp

@@ -4,15 +4,14 @@
 namespace mdd {
     ProcessorManual::ProcessorManual()
     {
-        addProcessorOutput("Value",0, "{ \"value\": 0 }"_json);
+        addProcessorOutput("Iterator",0, "{ \"value\": 0 }"_json);
     }
 
     bool ProcessorManual::update() {
         bool ret = false;
         bool group_state = true;
         while(group_state){
-            getOutput(0)->getValueInternal()["value"]= getOutput(0)->getValue()["value"].get<int>()+1;
-            std::cout << getOutput(0)->getValue().dump()<<"\n";
+            getProcessorOutput(0)->getValueInternal()["value"]= getProcessorOutput(0)->getValue()["value"].get<int>()+1;
             group_state = false;
             for (int i = 0; i < getModules().size(); ++i) {
                 bool module_state = getModule(i)->update();
@@ -26,6 +25,6 @@ namespace mdd {
     }
 
     std::shared_ptr<IOutput> ProcessorManual::getIteration(){
-        return getOutput(0);
+        return getProcessorOutput(0);
     }
 }

+ 1 - 1
lib/test/test_ModuleMath.cpp

@@ -48,7 +48,7 @@ TEST(ModuleMath, INT_PLUS_ARRAY){
     ModuleMath test = ModuleMath();
     test.getInput(test.getInputIDs()[0])->setDefaultValue()["value"] = 2.5;
     test.getInput(test.getInputIDs()[1])->setDefaultValue()["value"] = {10,31,23,23};
-
+    test.update();
 
     EXPECT_EQ(test.getOutput(test.getOutputIDs()[0])->getValue()["value"].dump(), "[12.5,33.5,25.5,25.5]");
 }

+ 19 - 7
lib/test/test_ProcessorManual.cpp

@@ -23,11 +23,11 @@ TEST(ProcessorManual, CalculateSimpleFormula){
     std::shared_ptr<ModuleMath> f3 = std::make_shared<ModuleMath>(SUBTRACT);
     inputs = f3->getInputIDs();
     f3->getInput(inputs[0])->connect(f1->getOutput(f1->getOutputIDs()[0]));
-    f3->getInput(inputs[1])->connect(f1->getOutput(f2->getOutputIDs()[0]));
+    f3->getInput(inputs[1])->connect(f2->getOutput(f2->getOutputIDs()[0]));
 
     std::shared_ptr<ModuleMath> f4 = std::make_shared<ModuleMath>(DIVIDE);
     inputs = f4->getInputIDs();
-    f4->getInput(inputs[0])->connect(f1->getOutput(f3->getOutputIDs()[0]));
+    f4->getInput(inputs[0])->connect(f3->getOutput(f3->getOutputIDs()[0]));
     f4->getInput(inputs[1])->setDefaultValue()["value"] = 2;
 
     std::shared_ptr<ProcessorManual> test = std::make_shared<ProcessorManual>();
@@ -35,9 +35,21 @@ TEST(ProcessorManual, CalculateSimpleFormula){
     test->addModule(f2);
     test->addModule(f3);
     test->addModule(f4);
-    test->addModuleOutput(f3, f3->getOutput(f3->getOutputIDs()[0]));
+    test->addModuleOutput(f4, f4->getOutput(f4->getOutputIDs()[0]));
     test->update();
 
+    EXPECT_EQ(f1->getOutput(f1->getOutputIDs()[0])->getValue()["value"].get<int>(), 15);
+
+    EXPECT_EQ(f2->getOutput(f2->getOutputIDs()[0])->getValue()["value"].get<int>(), 9);
+
+    EXPECT_EQ(f3->getOutput(f3->getOutputIDs()[0])->getValue()["value"].get<int>(), 6);
+
+    EXPECT_EQ(f4->getOutput(f4->getOutputIDs()[0])->getValue()["value"].get<int>(), 3);
+
+    for(auto& ids :test->getOutputIDs()){
+        std::cout << ids << std::endl;
+    }
+
     EXPECT_EQ(test->getOutput(test->getOutputIDs()[1])->getValue()["value"].get<int>(), 3);
 }
 
@@ -57,11 +69,11 @@ TEST(ProcessorManual, CalculateAdvancedFormula){
     std::shared_ptr<ModuleMath> f3 = std::make_shared<ModuleMath>(SUBTRACT);
     inputs = f3->getInputIDs();
     f3->getInput(inputs[0])->connect(f1->getOutput(f1->getOutputIDs()[0]));
-    f3->getInput(inputs[1])->connect(f1->getOutput(f2->getOutputIDs()[0]));
+    f3->getInput(inputs[1])->connect(f2->getOutput(f2->getOutputIDs()[0]));
 
     std::shared_ptr<ModuleMath> f4 = std::make_shared<ModuleMath>(DIVIDE);
     inputs = f4->getInputIDs();
-    f4->getInput(inputs[0])->connect(f1->getOutput(f3->getOutputIDs()[0]));
+    f4->getInput(inputs[0])->connect(f3->getOutput(f3->getOutputIDs()[0]));
     f4->getInput(inputs[1])->setDefaultValue()["value"] = 2;
 
     std::shared_ptr<ProcessorManual> test = std::make_shared<ProcessorManual>();
@@ -69,7 +81,7 @@ TEST(ProcessorManual, CalculateAdvancedFormula){
     test->addModule(f3);
     test->addModule(f2);
     test->addModule(f1);
-    test->addModuleOutput(f3, f3->getOutput(f3->getOutputIDs()[0]));
+    test->addModuleOutput(f4, f4->getOutput(f4->getOutputIDs()[0]));
     test->update();
 
     EXPECT_EQ(test->getOutput(test->getOutputIDs()[1])->getValue()["value"].get<int>(), 3);
@@ -88,7 +100,7 @@ TEST(ProcessorManual, CalculateExtremeFormula){
     switchModule->getInput(switchModule->getInputIDs()[1])->setDefaultValue()["value"] = 8.0;
     connect = switchModule->getInput(switchModule->getInputIDs()[2])->connect(calcModule->getOutput(calcModule->getOutputIDs()[0]));
 
-    calcModule->getInput(calcModule->getInputIDs()[0])->connect(switchModule->getOutput(switchModule->getInputIDs()[0]));
+    calcModule->getInput(calcModule->getInputIDs()[0])->connect(switchModule->getOutput(switchModule->getOutputIDs()[0]));
     calcModule->getInput(calcModule->getInputIDs()[1])->setDefaultValue()["value"] = 2.0;
 
     processor->addModuleOutput(calcModule,calcModule->getOutput(calcModule->getOutputIDs()[0]));