diff --git a/ELNGenerationCode/eln_in_tdf/Makefile b/ELNGenerationCode/eln_in_tdf/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..0ea5ee9598d3e507365578ad2d5a3943291cfd95
--- /dev/null
+++ b/ELNGenerationCode/eln_in_tdf/Makefile
@@ -0,0 +1,19 @@
+# Compiler and linker flags
+CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)
+LDFLAGS = $(SYSTEMC_LIBRARY_DIRS)
+
+# List of all ecutables to be compiled
+EXECUTABLES = cluster_tb
+
+# .PHONY targets don't generate files
+.PHONY: all clean
+
+# Default targets
+all: $(EXECUTABLES)
+
+cluster_tb: cluster_tb.cpp eln_in_tdf.h
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -lsystemc-ams -lsystemc | c++filt
+
+# Clean rule to delete temporary and generated files
+clean:
+ rm -rf *~ *.o *.dat *.vcd *.dSYM $(EXECUTABLES)
diff --git a/ELNGenerationCode/generated_CPP/cluster_tb.cpp b/ELNGenerationCode/eln_in_tdf/cluster_tb.cpp
similarity index 100%
rename from ELNGenerationCode/generated_CPP/cluster_tb.cpp
rename to ELNGenerationCode/eln_in_tdf/cluster_tb.cpp
index b8fe07258d3e6ff125725c35d7c5d281176c0a96..df69c76ed3d5b8bcabc33d0947421fdbcd6949db 100644
--- a/ELNGenerationCode/generated_CPP/cluster_tb.cpp
+++ b/ELNGenerationCode/eln_in_tdf/cluster_tb.cpp
@@ -7,8 +7,8 @@ int sc_main(int argc, char *argv[])
sca_eln::sca_node in;
eln_in_tdf i_eln_in_tdf("i_eln_in_tdf");
- i_eln_in_tdf.in(in);
i_eln_in_tdf.out(out);
+ i_eln_in_tdf.in(in);
sca_util::sca_trace_file* tfp = sca_util::sca_create_tabular_trace_file("cluster_tb");
sca_util::sca_trace(tfp, out, "out");
diff --git a/ELNGenerationCode/generated_H/eln_in_tdf.h b/ELNGenerationCode/eln_in_tdf/eln_in_tdf.h
similarity index 96%
rename from ELNGenerationCode/generated_H/eln_in_tdf.h
rename to ELNGenerationCode/eln_in_tdf/eln_in_tdf.h
index dc52c58c45956ee51ff68b71826408cf9c5bd6d1..2f75f2a513704f2604a83439900e0e4f3420b873 100644
--- a/ELNGenerationCode/generated_H/eln_in_tdf.h
+++ b/ELNGenerationCode/eln_in_tdf/eln_in_tdf.h
@@ -7,8 +7,8 @@
SC_MODULE(eln_in_tdf)
{
- sca_tdf::sca_in<double> in;
sca_tdf::sca_out<double> out;
+ sca_tdf::sca_in<double> in;
sca_eln::sca_c c;
sca_eln::sca_r r;
@@ -16,8 +16,8 @@ SC_MODULE(eln_in_tdf)
sca_eln::sca_tdf_vsource vin;
SC_CTOR(eln_in_tdf)
- : in("in")
- , out("out")
+ : out("out")
+ , in("in")
, c("c", 1.0, 0.0)
, r("r", 1.0)
, vout("vout", 1.0)
diff --git a/modeling/eln_in_tdf.xml b/modeling/eln_in_tdf.xml
index 64f133fdace379487a40759a032d74b663833e64..86bc9645d8c4c935698165cbe10e27e0909d8d5f 100644
--- a/modeling/eln_in_tdf.xml
+++ b/modeling/eln_in_tdf.xml
@@ -4,351 +4,371 @@
<Modeling type="ELN" nameTab="ELN" >
<ELNDiagramPanel name="ELN Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" zoom="1.0" >
-<CONNECTOR type="1610" id="1" >
+<CONNECTOR type="1610" id="3" >
<cdparam x="731" y="422" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<P1 x="731" y="422" id="121" />
-<P2 x="731" y="317" id="78" />
+<P1 x="706" y="416" id="125" />
+<P2 x="738" y="351" id="82" />
+<Point x="706" y="351" type="-1" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="1610" id="2" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="2" >
+<father id="3" num="0" />
+<cdparam x="706" y="351" />
+<sizeparam width="10" height="10" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+<TGConnectingPoint num="0" id="1" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="1610" id="6" >
<cdparam x="365" y="401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<P1 x="365" y="401" id="101" />
-<P2 x="349" y="350" id="90" />
+<P1 x="386" y="398" id="105" />
+<P2 x="346" y="351" id="94" />
+<Point x="386" y="351" type="-1" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="1610" id="3" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="5" >
+<father id="6" num="0" />
+<cdparam x="386" y="351" />
+<sizeparam width="10" height="10" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+<TGConnectingPoint num="0" id="4" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="1610" id="7" >
<cdparam x="603" y="427" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<P1 x="603" y="427" id="111" />
-<P2 x="569" y="381" id="56" />
+<P1 x="568" y="429" id="115" />
+<P2 x="568" y="391" id="60" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="4" >
+<CONNECTOR type="1610" id="8" >
<cdparam x="1050" y="298" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="out" />
-<P1 x="1050" y="298" id="33" />
-<P2 x="831" y="272" id="79" />
+<P1 x="933" y="306" id="37" />
+<P2 x="838" y="306" id="83" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="5" >
+<CONNECTOR type="1610" id="9" >
<cdparam x="1070" y="298" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="out" />
-<P1 x="1070" y="298" id="34" />
-<P2 x="1120" y="294" id="13" />
+<P1 x="953" y="306" id="38" />
+<P2 x="1018" y="306" id="17" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="6" >
+<CONNECTOR type="1610" id="10" >
<cdparam x="174" y="306" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="in" />
-<P1 x="174" y="306" id="44" />
-<P2 x="249" y="305" id="91" />
+<P1 x="174" y="306" id="48" />
+<P2 x="246" y="306" id="95" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="7" >
+<CONNECTOR type="1610" id="11" >
<cdparam x="100" y="307" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="in" />
-<P1 x="100" y="307" id="23" />
-<P2 x="154" y="306" id="45" />
+<P1 x="100" y="306" id="27" />
+<P2 x="154" y="306" id="49" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="8" >
+<CONNECTOR type="1610" id="12" >
<cdparam x="554" y="276" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="" />
-<P1 x="569" y="281" id="55" />
-<P2 x="559" y="259" id="9" />
+<infoparam name="connector" value="n2" />
+<P1 x="568" y="291" id="59" />
+<P2 x="568" y="261" id="13" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="1610" id="11" >
+<CONNECTOR type="1610" id="15" >
<cdparam x="828" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="n2" />
-<P1 x="731" y="227" id="77" />
-<P2 x="496" y="259" id="67" />
-<Point x="559" y="259" type="-1" />
+<P1 x="738" y="261" id="81" />
+<P2 x="496" y="261" id="71" />
+<Point x="568" y="261" type="-1" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="10" >
-<father id="11" num="0" />
-<cdparam x="559" y="259" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="14" >
+<father id="15" num="0" />
+<cdparam x="568" y="261" />
<sizeparam width="10" height="10" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
-<TGConnectingPoint num="0" id="9" />
+<TGConnectingPoint num="0" id="13" />
</SUBCOMPONENT>
-<CONNECTOR type="1610" id="12" >
+<CONNECTOR type="1610" id="16" >
<cdparam x="396" y="259" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="n1" />
-<P1 x="396" y="259" id="66" />
-<P2 x="349" y="260" id="89" />
+<P1 x="396" y="261" id="70" />
+<P2 x="346" y="261" id="93" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1627" id="148" >
+<COMPONENT type="1627" id="152" >
<cdparam x="90" y="72" />
-<sizeparam width="1040" height="529" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="938" height="529" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="cluster" />
-<TGConnectingPoint num="0" id="140" />
-<TGConnectingPoint num="1" id="141" />
-<TGConnectingPoint num="2" id="142" />
-<TGConnectingPoint num="3" id="143" />
-<TGConnectingPoint num="4" id="144" />
-<TGConnectingPoint num="5" id="145" />
-<TGConnectingPoint num="6" id="146" />
-<TGConnectingPoint num="7" id="147" />
+<TGConnectingPoint num="0" id="144" />
+<TGConnectingPoint num="1" id="145" />
+<TGConnectingPoint num="2" id="146" />
+<TGConnectingPoint num="3" id="147" />
+<TGConnectingPoint num="4" id="148" />
+<TGConnectingPoint num="5" id="149" />
+<TGConnectingPoint num="6" id="150" />
+<TGConnectingPoint num="7" id="151" />
</COMPONENT>
-<SUBCOMPONENT type="1632" id="22" >
-<father id="148" num="0" />
-<cdparam x="1120" y="284" />
+<SUBCOMPONENT type="1632" id="26" >
+<father id="152" num="0" />
+<cdparam x="1018" y="296" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="1030" minY="-10" maxY="519" />
+<cdrectangleparam minX="-10" maxX="928" minY="-10" maxY="519" />
<infoparam name="TGComponent" value="out" />
-<TGConnectingPoint num="0" id="13" />
-<TGConnectingPoint num="1" id="14" />
-<TGConnectingPoint num="2" id="15" />
-<TGConnectingPoint num="3" id="16" />
-<TGConnectingPoint num="4" id="17" />
-<TGConnectingPoint num="5" id="18" />
-<TGConnectingPoint num="6" id="19" />
-<TGConnectingPoint num="7" id="20" />
-<TGConnectingPoint num="8" id="21" />
+<TGConnectingPoint num="0" id="17" />
+<TGConnectingPoint num="1" id="18" />
+<TGConnectingPoint num="2" id="19" />
+<TGConnectingPoint num="3" id="20" />
+<TGConnectingPoint num="4" id="21" />
+<TGConnectingPoint num="5" id="22" />
+<TGConnectingPoint num="6" id="23" />
+<TGConnectingPoint num="7" id="24" />
+<TGConnectingPoint num="8" id="25" />
<extraparam>
<attributes name="out" type="double" origin="out"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1632" id="32" >
-<father id="148" num="1" />
-<cdparam x="80" y="297" />
+<SUBCOMPONENT type="1632" id="36" >
+<father id="152" num="1" />
+<cdparam x="80" y="296" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="1030" minY="-10" maxY="519" />
+<cdrectangleparam minX="-10" maxX="928" minY="-10" maxY="519" />
<infoparam name="TGComponent" value="in" />
-<TGConnectingPoint num="0" id="23" />
-<TGConnectingPoint num="1" id="24" />
-<TGConnectingPoint num="2" id="25" />
-<TGConnectingPoint num="3" id="26" />
-<TGConnectingPoint num="4" id="27" />
-<TGConnectingPoint num="5" id="28" />
-<TGConnectingPoint num="6" id="29" />
-<TGConnectingPoint num="7" id="30" />
-<TGConnectingPoint num="8" id="31" />
+<TGConnectingPoint num="0" id="27" />
+<TGConnectingPoint num="1" id="28" />
+<TGConnectingPoint num="2" id="29" />
+<TGConnectingPoint num="3" id="30" />
+<TGConnectingPoint num="4" id="31" />
+<TGConnectingPoint num="5" id="32" />
+<TGConnectingPoint num="6" id="33" />
+<TGConnectingPoint num="7" id="34" />
+<TGConnectingPoint num="8" id="35" />
<extraparam>
<attributes name="in" type="double" origin="in"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1623" id="139" >
-<father id="148" num="2" />
+<SUBCOMPONENT type="1623" id="143" >
+<father id="152" num="2" />
<cdparam x="164" y="136" />
-<sizeparam width="896" height="419" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="779" height="419" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="144" minY="0" maxY="110" />
+<cdrectangleparam minX="0" maxX="159" minY="0" maxY="110" />
<infoparam name="TGComponent" value="eln_in_tdf" />
-<TGConnectingPoint num="0" id="131" />
-<TGConnectingPoint num="1" id="132" />
-<TGConnectingPoint num="2" id="133" />
-<TGConnectingPoint num="3" id="134" />
-<TGConnectingPoint num="4" id="135" />
-<TGConnectingPoint num="5" id="136" />
-<TGConnectingPoint num="6" id="137" />
-<TGConnectingPoint num="7" id="138" />
+<TGConnectingPoint num="0" id="135" />
+<TGConnectingPoint num="1" id="136" />
+<TGConnectingPoint num="2" id="137" />
+<TGConnectingPoint num="3" id="138" />
+<TGConnectingPoint num="4" id="139" />
+<TGConnectingPoint num="5" id="140" />
+<TGConnectingPoint num="6" id="141" />
+<TGConnectingPoint num="7" id="142" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="1629" id="43" >
-<father id="139" num="0" />
-<cdparam x="1050" y="288" />
+<SUBCOMPONENT type="1629" id="47" >
+<father id="143" num="0" />
+<cdparam x="933" y="296" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="886" minY="-10" maxY="409" />
+<cdrectangleparam minX="-10" maxX="769" minY="-10" maxY="409" />
<infoparam name="TGComponent" value="out" />
-<TGConnectingPoint num="0" id="33" />
-<TGConnectingPoint num="1" id="34" />
-<TGConnectingPoint num="2" id="35" />
-<TGConnectingPoint num="3" id="36" />
-<TGConnectingPoint num="4" id="37" />
-<TGConnectingPoint num="5" id="38" />
-<TGConnectingPoint num="6" id="39" />
-<TGConnectingPoint num="7" id="40" />
-<TGConnectingPoint num="8" id="41" />
-<TGConnectingPoint num="9" id="42" />
+<TGConnectingPoint num="0" id="37" />
+<TGConnectingPoint num="1" id="38" />
+<TGConnectingPoint num="2" id="39" />
+<TGConnectingPoint num="3" id="40" />
+<TGConnectingPoint num="4" id="41" />
+<TGConnectingPoint num="5" id="42" />
+<TGConnectingPoint num="6" id="43" />
+<TGConnectingPoint num="7" id="44" />
+<TGConnectingPoint num="8" id="45" />
+<TGConnectingPoint num="9" id="46" />
<extraparam>
<attributes name="out" type="double" origin="out"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1629" id="54" >
-<father id="139" num="1" />
+<SUBCOMPONENT type="1629" id="58" >
+<father id="143" num="1" />
<cdparam x="154" y="296" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="886" minY="-10" maxY="409" />
+<cdrectangleparam minX="-10" maxX="769" minY="-10" maxY="409" />
<infoparam name="TGComponent" value="in" />
-<TGConnectingPoint num="0" id="44" />
-<TGConnectingPoint num="1" id="45" />
-<TGConnectingPoint num="2" id="46" />
-<TGConnectingPoint num="3" id="47" />
-<TGConnectingPoint num="4" id="48" />
-<TGConnectingPoint num="5" id="49" />
-<TGConnectingPoint num="6" id="50" />
-<TGConnectingPoint num="7" id="51" />
-<TGConnectingPoint num="8" id="52" />
-<TGConnectingPoint num="9" id="53" />
+<TGConnectingPoint num="0" id="48" />
+<TGConnectingPoint num="1" id="49" />
+<TGConnectingPoint num="2" id="50" />
+<TGConnectingPoint num="3" id="51" />
+<TGConnectingPoint num="4" id="52" />
+<TGConnectingPoint num="5" id="53" />
+<TGConnectingPoint num="6" id="54" />
+<TGConnectingPoint num="7" id="55" />
+<TGConnectingPoint num="8" id="56" />
+<TGConnectingPoint num="9" id="57" />
<extraparam>
<attributes name="in" type="double" origin="in"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1612" id="65" >
-<father id="139" num="2" />
-<cdparam x="549" y="281" />
+<SUBCOMPONENT type="1612" id="69" >
+<father id="143" num="2" />
+<cdparam x="548" y="291" />
<sizeparam width="40" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="856" minY="0" maxY="319" />
+<cdrectangleparam minX="0" maxX="739" minY="0" maxY="319" />
<infoparam name="TGComponent" value="c" />
-<TGConnectingPoint num="0" id="55" />
-<TGConnectingPoint num="1" id="56" />
-<TGConnectingPoint num="2" id="57" />
-<TGConnectingPoint num="3" id="58" />
-<TGConnectingPoint num="4" id="59" />
-<TGConnectingPoint num="5" id="60" />
-<TGConnectingPoint num="6" id="61" />
-<TGConnectingPoint num="7" id="62" />
-<TGConnectingPoint num="8" id="63" />
-<TGConnectingPoint num="9" id="64" />
+<TGConnectingPoint num="0" id="59" />
+<TGConnectingPoint num="1" id="60" />
+<TGConnectingPoint num="2" id="61" />
+<TGConnectingPoint num="3" id="62" />
+<TGConnectingPoint num="4" id="63" />
+<TGConnectingPoint num="5" id="64" />
+<TGConnectingPoint num="6" id="65" />
+<TGConnectingPoint num="7" id="66" />
+<TGConnectingPoint num="8" id="67" />
+<TGConnectingPoint num="9" id="68" />
<extraparam>
<attributes value="1.0" unit0="F" q0="0.0" unit1="C" position="1" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1611" id="76" >
-<father id="139" num="3" />
-<cdparam x="396" y="249" />
+<SUBCOMPONENT type="1611" id="80" >
+<father id="143" num="3" />
+<cdparam x="396" y="251" />
<sizeparam width="100" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="796" minY="0" maxY="399" />
+<cdrectangleparam minX="0" maxX="679" minY="0" maxY="399" />
<infoparam name="TGComponent" value="r" />
-<TGConnectingPoint num="0" id="66" />
-<TGConnectingPoint num="1" id="67" />
-<TGConnectingPoint num="2" id="68" />
-<TGConnectingPoint num="3" id="69" />
-<TGConnectingPoint num="4" id="70" />
-<TGConnectingPoint num="5" id="71" />
-<TGConnectingPoint num="6" id="72" />
-<TGConnectingPoint num="7" id="73" />
-<TGConnectingPoint num="8" id="74" />
-<TGConnectingPoint num="9" id="75" />
+<TGConnectingPoint num="0" id="70" />
+<TGConnectingPoint num="1" id="71" />
+<TGConnectingPoint num="2" id="72" />
+<TGConnectingPoint num="3" id="73" />
+<TGConnectingPoint num="4" id="74" />
+<TGConnectingPoint num="5" id="75" />
+<TGConnectingPoint num="6" id="76" />
+<TGConnectingPoint num="7" id="77" />
+<TGConnectingPoint num="8" id="78" />
+<TGConnectingPoint num="9" id="79" />
<extraparam>
<attributes value="1.0" unit="Ω" position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1621" id="88" >
-<father id="139" num="4" />
-<cdparam x="731" y="222" />
+<SUBCOMPONENT type="1621" id="92" >
+<father id="143" num="4" />
+<cdparam x="738" y="256" />
<sizeparam width="100" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="796" minY="0" maxY="319" />
+<cdrectangleparam minX="0" maxX="679" minY="0" maxY="319" />
<infoparam name="TGComponent" value="vout" />
-<TGConnectingPoint num="0" id="77" />
-<TGConnectingPoint num="1" id="78" />
-<TGConnectingPoint num="2" id="79" />
-<TGConnectingPoint num="3" id="80" />
-<TGConnectingPoint num="4" id="81" />
-<TGConnectingPoint num="5" id="82" />
-<TGConnectingPoint num="6" id="83" />
-<TGConnectingPoint num="7" id="84" />
-<TGConnectingPoint num="8" id="85" />
-<TGConnectingPoint num="9" id="86" />
-<TGConnectingPoint num="10" id="87" />
+<TGConnectingPoint num="0" id="81" />
+<TGConnectingPoint num="1" id="82" />
+<TGConnectingPoint num="2" id="83" />
+<TGConnectingPoint num="3" id="84" />
+<TGConnectingPoint num="4" id="85" />
+<TGConnectingPoint num="5" id="86" />
+<TGConnectingPoint num="6" id="87" />
+<TGConnectingPoint num="7" id="88" />
+<TGConnectingPoint num="8" id="89" />
+<TGConnectingPoint num="9" id="90" />
+<TGConnectingPoint num="10" id="91" />
<extraparam>
<attributes scale="1.0" position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1625" id="100" >
-<father id="139" num="5" />
-<cdparam x="249" y="255" />
+<SUBCOMPONENT type="1625" id="104" >
+<father id="143" num="5" />
+<cdparam x="246" y="256" />
<sizeparam width="100" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="796" minY="0" maxY="319" />
+<cdrectangleparam minX="0" maxX="679" minY="0" maxY="319" />
<infoparam name="TGComponent" value="vin" />
-<TGConnectingPoint num="0" id="89" />
-<TGConnectingPoint num="1" id="90" />
-<TGConnectingPoint num="2" id="91" />
-<TGConnectingPoint num="3" id="92" />
-<TGConnectingPoint num="4" id="93" />
-<TGConnectingPoint num="5" id="94" />
-<TGConnectingPoint num="6" id="95" />
-<TGConnectingPoint num="7" id="96" />
-<TGConnectingPoint num="8" id="97" />
-<TGConnectingPoint num="9" id="98" />
-<TGConnectingPoint num="10" id="99" />
+<TGConnectingPoint num="0" id="93" />
+<TGConnectingPoint num="1" id="94" />
+<TGConnectingPoint num="2" id="95" />
+<TGConnectingPoint num="3" id="96" />
+<TGConnectingPoint num="4" id="97" />
+<TGConnectingPoint num="5" id="98" />
+<TGConnectingPoint num="6" id="99" />
+<TGConnectingPoint num="7" id="100" />
+<TGConnectingPoint num="8" id="101" />
+<TGConnectingPoint num="9" id="102" />
+<TGConnectingPoint num="10" id="103" />
<extraparam>
<attributes scale="1.0" position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1620" id="110" >
-<father id="139" num="6" />
-<cdparam x="345" y="401" />
+<SUBCOMPONENT type="1620" id="114" >
+<father id="143" num="6" />
+<cdparam x="366" y="398" />
<sizeparam width="40" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="856" minY="0" maxY="379" />
+<cdrectangleparam minX="0" maxX="739" minY="0" maxY="379" />
<infoparam name="TGComponent" value="gnd" />
-<TGConnectingPoint num="0" id="101" />
-<TGConnectingPoint num="1" id="102" />
-<TGConnectingPoint num="2" id="103" />
-<TGConnectingPoint num="3" id="104" />
-<TGConnectingPoint num="4" id="105" />
-<TGConnectingPoint num="5" id="106" />
-<TGConnectingPoint num="6" id="107" />
-<TGConnectingPoint num="7" id="108" />
-<TGConnectingPoint num="8" id="109" />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
+<TGConnectingPoint num="2" id="107" />
+<TGConnectingPoint num="3" id="108" />
+<TGConnectingPoint num="4" id="109" />
+<TGConnectingPoint num="5" id="110" />
+<TGConnectingPoint num="6" id="111" />
+<TGConnectingPoint num="7" id="112" />
+<TGConnectingPoint num="8" id="113" />
<extraparam>
<attributes position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1620" id="120" >
-<father id="139" num="7" />
-<cdparam x="583" y="427" />
+<SUBCOMPONENT type="1620" id="124" >
+<father id="143" num="7" />
+<cdparam x="548" y="429" />
<sizeparam width="40" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="856" minY="0" maxY="379" />
+<cdrectangleparam minX="0" maxX="739" minY="0" maxY="379" />
<infoparam name="TGComponent" value="gnd" />
-<TGConnectingPoint num="0" id="111" />
-<TGConnectingPoint num="1" id="112" />
-<TGConnectingPoint num="2" id="113" />
-<TGConnectingPoint num="3" id="114" />
-<TGConnectingPoint num="4" id="115" />
-<TGConnectingPoint num="5" id="116" />
-<TGConnectingPoint num="6" id="117" />
-<TGConnectingPoint num="7" id="118" />
-<TGConnectingPoint num="8" id="119" />
+<TGConnectingPoint num="0" id="115" />
+<TGConnectingPoint num="1" id="116" />
+<TGConnectingPoint num="2" id="117" />
+<TGConnectingPoint num="3" id="118" />
+<TGConnectingPoint num="4" id="119" />
+<TGConnectingPoint num="5" id="120" />
+<TGConnectingPoint num="6" id="121" />
+<TGConnectingPoint num="7" id="122" />
+<TGConnectingPoint num="8" id="123" />
<extraparam>
<attributes position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1620" id="130" >
-<father id="139" num="8" />
-<cdparam x="711" y="422" />
+<SUBCOMPONENT type="1620" id="134" >
+<father id="143" num="8" />
+<cdparam x="686" y="416" />
<sizeparam width="40" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="856" minY="0" maxY="379" />
+<cdrectangleparam minX="0" maxX="739" minY="0" maxY="379" />
<infoparam name="TGComponent" value="gnd" />
-<TGConnectingPoint num="0" id="121" />
-<TGConnectingPoint num="1" id="122" />
-<TGConnectingPoint num="2" id="123" />
-<TGConnectingPoint num="3" id="124" />
-<TGConnectingPoint num="4" id="125" />
-<TGConnectingPoint num="5" id="126" />
-<TGConnectingPoint num="6" id="127" />
-<TGConnectingPoint num="7" id="128" />
-<TGConnectingPoint num="8" id="129" />
+<TGConnectingPoint num="0" id="125" />
+<TGConnectingPoint num="1" id="126" />
+<TGConnectingPoint num="2" id="127" />
+<TGConnectingPoint num="3" id="128" />
+<TGConnectingPoint num="4" id="129" />
+<TGConnectingPoint num="5" id="130" />
+<TGConnectingPoint num="6" id="131" />
+<TGConnectingPoint num="7" id="132" />
+<TGConnectingPoint num="8" id="133" />
<extraparam>
<attributes position="0" fv_0_2="false" fv_1_3="false" fh_0_2="false" fh_1_3="false" first="true"/>
</extraparam>