common code for Win and Linux, merged py2 changes

12 files changed, 318 insertions, 322 deletions

diff --git a/Examples/FullAdder/FullAdder-cache.lib b/Examples/FullAdder/FullAdder-cache.lib
new file mode 100644
index 00000000..5669fdaf
--- /dev/null
+++ b/Examples/FullAdder/FullAdder-cache.lib
@@ -0,0 +1,116 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# DC
+#
+DEF DC v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "R" 50 50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# adc_bridge_3
+#
+DEF adc_bridge_3 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "adc_bridge_3" 0 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 200 350 -200 0 1 0 N
+X IN1 1 -600 50 200 R 50 50 1 1 I
+X IN2 2 -600 -50 200 R 50 50 1 1 I
+X IN3 3 -600 -150 200 R 50 50 1 1 I
+X OUT1 4 550 50 200 L 50 50 1 1 O
+X OUT2 5 550 -50 200 L 50 50 1 1 O
+X OUT3 6 550 -150 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# dac_bridge_2
+#
+DEF dac_bridge_2 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "dac_bridge_2" 50 150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -250 200 350 -100 0 1 0 N
+X IN1 1 -450 50 200 R 50 50 1 1 I
+X IN2 2 -450 -50 200 R 50 50 1 1 I
+X OUT1 3 550 50 200 L 50 50 1 1 O
+X OUT4 4 550 -50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# full_adder
+#
+DEF full_adder X 0 40 Y Y 1 F N
+F0 "X" 1400 700 60 H V C CNN
+F1 "full_adder" 1400 600 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 800 1150 1950 0 0 1 0 N
+X IN1 1 600 950 200 R 50 50 1 1 I
+X IN2 2 600 550 200 R 50 50 1 1 I
+X CIN 3 600 150 200 R 50 50 1 1 I
+X SUM 4 2150 950 200 L 50 50 1 1 O
+X COUT 5 2150 150 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# plot_v1
+#
+DEF plot_v1 U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_v1" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/FullAdder/FullAdder-rescue.lib b/Examples/FullAdder/FullAdder-rescue.lib
new file mode 100644
index 00000000..a724787d
--- /dev/null
+++ b/Examples/FullAdder/FullAdder-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# R-RESCUE-FullAdder
+#
+DEF R-RESCUE-FullAdder R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "R-RESCUE-FullAdder" 50 50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/FullAdder/FullAdder.pro b/Examples/FullAdder/FullAdder.pro
index afdcf2d3..3a4fb370 100644
--- a/Examples/FullAdder/FullAdder.pro
+++ b/Examples/FullAdder/FullAdder.pro
@@ -1,6 +1,6 @@
-update=22/05/2015 07:44:53
+update=Mon Mar 11 11:26:25 2019
 version=1
-last_client=kicad
+last_client=eeschema
 [general]
 version=1
 RootSch=
@@ -31,41 +31,42 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=eSim_Analog
-LibName2=eSim_Devices
-LibName3=eSim_Digital
-LibName4=eSim_Hybrid
-LibName5=eSim_Miscellaneous
-LibName6=eSim_Power
-LibName7=eSim_Sources
-LibName8=eSim_Subckt
-LibName9=eSim_User
-LibName10=eSim_Plot
-LibName11=adc-dac
-LibName12=memory
-LibName13=xilinx
-LibName14=microcontrollers
-LibName15=dsp
-LibName16=microchip
-LibName17=analog_switches
-LibName18=motorola
-LibName19=texas
-LibName20=intel
-LibName21=audio
-LibName22=interface
-LibName23=digital-audio
-LibName24=philips
-LibName25=display
-LibName26=cypress
-LibName27=siliconi
-LibName28=opto
-LibName29=atmel
-LibName30=contrib
-LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName1=FullAdder-rescue
+LibName2=eSim_Analog
+LibName3=eSim_Devices
+LibName4=eSim_Digital
+LibName5=eSim_Hybrid
+LibName6=eSim_Miscellaneous
+LibName7=eSim_Power
+LibName8=eSim_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
+LibName11=eSim_Plot
+LibName12=adc-dac
+LibName13=memory
+LibName14=xilinx
+LibName15=microcontrollers
+LibName16=dsp
+LibName17=microchip
+LibName18=analog_switches
+LibName19=motorola
+LibName20=texas
+LibName21=intel
+LibName22=audio
+LibName23=interface
+LibName24=digital-audio
+LibName25=philips
+LibName26=display
+LibName27=cypress
+LibName28=siliconi
+LibName29=opto
+LibName30=atmel
+LibName31=contrib
+LibName32=power
+LibName33=device
+LibName34=transistors
+LibName35=conn
+LibName36=linear
+LibName37=regul
+LibName38=74xx
+LibName39=cmos4000
diff --git a/Examples/FullAdder/FullAdder_Previous_Values.xml b/Examples/FullAdder/FullAdder_Previous_Values.xml
new file mode 100644
index 00000000..3265600d
--- /dev/null
+++ b/Examples/FullAdder/FullAdder_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1><v2 name="Source type">dc<field1 name="Value">0</field1></v2><v3 name="Source type">dc<field1 name="Value">5</field1></v3></source><model><u6 name="type">adc_bridge<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter value for in_high (default=2.0)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /><field4 name="Enter value for in_low (default=1.0)" /></u6><u7 name="type">dac_bridge<field5 name="Enter value for input load (default=1.0e-12)" /><field6 name="Enter value for out_low (default=0.0)" /><field7 name="Enter value for out_high (default=5.0)" /><field8 name="Enter the Rise Time (default=1.0e-9)" /><field9 name="Enter the Fall Time (default=1.0e-9)" /><field10 name="Enter value for out_undef (default=0.5)" /></u7></model><devicemodel /><subcircuit><x1><field>/home/fossee/esim-clones/eSim/src/SubcircuitLibrary/full_adder</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/FullAdder/full_adder-cache.lib b/Examples/FullAdder/full_adder-cache.lib
new file mode 100644
index 00000000..623a7f41
--- /dev/null
+++ b/Examples/FullAdder/full_adder-cache.lib
@@ -0,0 +1,61 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 8 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+ENDDRAW
+ENDDEF
+#
+# d_or
+#
+DEF d_or U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_or" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
+A -25 -124 325 574 323 0 1 0 N 150 150 250 50
+A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
+P 2 0 1 0  -250 -50  150 -50 N
+P 2 0 1 0  -250 150  150 150 N
+X IN1 1 -450 100 215 R 50 50 1 1 I
+X IN2 2 -450 0 215 R 50 50 1 1 I
+X OUT 3 450 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# half_adder
+#
+DEF half_adder X 0 40 Y Y 1 F N
+F0 "X" 900 500 60 H V C CNN
+F1 "half_adder" 900 400 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S 500 800 1250 0 0 1 0 N
+X IN1 1 300 700 200 R 50 50 1 1 I
+X IN2 2 300 100 200 R 50 50 1 1 I
+X SUM 3 1450 700 200 L 50 50 1 1 O
+X COUT 4 1450 100 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/FullAdder/full_adder.pro b/Examples/FullAdder/full_adder.pro
index 0bd0d5af..c0db0775 100644
--- a/Examples/FullAdder/full_adder.pro
+++ b/Examples/FullAdder/full_adder.pro
@@ -61,9 +61,9 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=valves
-LibName31=eSim_Analog
-LibName32=eSim_Devices
-LibName33=eSim_Digital
-LibName34=eSim_Hybrid
-LibName35=eSim_Sources
-LibName36=eSim_Subckt
+LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog
+LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices
+LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital
+LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid
+LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources
+LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt
diff --git a/Examples/FullAdder/full_adder_Previous_Values.xml b/Examples/FullAdder/full_adder_Previous_Values.xml
new file mode 100644
index 00000000..b63184d6
--- /dev/null
+++ b/Examples/FullAdder/full_adder_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u2 name="type">d_or<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2></model><devicemodel /></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/FullAdder/half_adder-cache.lib b/Examples/FullAdder/half_adder-cache.lib
new file mode 100644
index 00000000..68785220
--- /dev/null
+++ b/Examples/FullAdder/half_adder-cache.lib
@@ -0,0 +1,63 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 8 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+ENDDRAW
+ENDDEF
+#
+# d_and
+#
+DEF d_and U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_and" 50 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
+A 150 49 100 6 900 0 1 0 N 250 50 150 150
+P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+X IN1 1 -450 100 200 R 50 50 1 1 I
+X IN2 2 -450 0 200 R 50 50 1 1 I
+X OUT 3 450 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# d_xor
+#
+DEF d_xor U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_xor" 50 100 47 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
+A -350 50 180 -337 337 0 1 0 N -200 -50 -200 150
+A -25 -124 325 574 323 0 1 0 N 150 150 250 50
+A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
+P 2 0 1 0  150 -50  -200 -50 N
+P 2 0 1 0  150 150  -200 150 N
+X IN1 1 -450 100 215 R 50 43 1 1 I
+X IN2 2 -450 0 215 R 50 43 1 1 I
+X OUT 3 450 50 200 L 50 39 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/FullAdder/half_adder.pro b/Examples/FullAdder/half_adder.pro
index 30094fb9..695ae0f6 100644
--- a/Examples/FullAdder/half_adder.pro
+++ b/Examples/FullAdder/half_adder.pro
@@ -61,9 +61,9 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=valves
-LibName31=eSim_Analog
-LibName32=eSim_Devices
-LibName33=eSim_Digital
-LibName34=eSim_Hybrid
-LibName35=eSim_Sources
-LibName36=eSim_Subckt
+LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog
+LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices
+LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital
+LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid
+LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources
+LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt
diff --git a/Examples/FullAdder/half_adder_Previous_Values.xml b/Examples/FullAdder/half_adder_Previous_Values.xml
new file mode 100644
index 00000000..b915f0da
--- /dev/null
+++ b/Examples/FullAdder/half_adder_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u2 name="type">d_xor<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2><u3 name="type">d_and<field4 name="Enter Fall Delay (default=1.0e-9)" /><field5 name="Enter Input Load (default=1.0e-12)" /><field6 name="Enter Rise Delay (default=1.0e-9)" /></u3></model><devicemodel /></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/FullAdder/plot_data_i.txt b/Examples/FullAdder/plot_data_i.txt
deleted file mode 100644
index adaf12b0..00000000
--- a/Examples/FullAdder/plot_data_i.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-             * /home/fossee/esim-workspace/fulladder/fulladder.cir
-             Transient Analysis  Tue Aug 29 20:04:13  2017
---------------------------------------------------------------------------------
-Index   time            a2#branch_1_0   a2#branch_1_1   v1#branch       
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-1	1.000000e-02	0.000000e+00	-5.00000e-03	0.000000e+00	
-2	2.000000e-02	0.000000e+00	-5.00000e-03	0.000000e+00	
-3	4.000000e-02	0.000000e+00	-5.00000e-03	0.000000e+00	
-4	8.000000e-02	0.000000e+00	-5.00000e-03	0.000000e+00	
-5	1.600000e-01	0.000000e+00	-5.00000e-03	0.000000e+00	
-6	3.200000e-01	0.000000e+00	-5.00000e-03	0.000000e+00	
-7	6.400000e-01	0.000000e+00	-5.00000e-03	0.000000e+00	
-8	1.280000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-9	2.560000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-10	4.560000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-11	6.560000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-12	8.560000e+00	0.000000e+00	-5.00000e-03	0.000000e+00	
-13	1.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-14	1.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-15	1.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-16	1.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-17	1.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-18	2.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-19	2.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-20	2.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-21	2.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-22	2.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-23	3.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-24	3.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-25	3.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-26	3.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-27	3.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-28	4.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-29	4.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-30	4.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-31	4.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-32	4.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-33	5.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-34	5.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-35	5.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-36	5.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-37	5.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-38	6.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-39	6.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-40	6.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-41	6.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-42	6.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-43	7.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-44	7.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-45	7.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-46	7.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-47	7.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-48	8.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-49	8.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-50	8.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-51	8.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-52	8.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-53	9.056000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-54	9.256000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-
-Index   time            a2#branch_1_0   a2#branch_1_1   v1#branch       
---------------------------------------------------------------------------------
-55	9.456000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-56	9.656000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-57	9.856000e+01	0.000000e+00	-5.00000e-03	0.000000e+00	
-58	1.000000e+02	0.000000e+00	-5.00000e-03	0.000000e+00	
-
-             * /home/fossee/esim-workspace/fulladder/fulladder.cir
-             Transient Analysis  Tue Aug 29 20:04:13  2017
---------------------------------------------------------------------------------
-Index   time            v2#branch       v3#branch       
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	0.000000e+00	
-1	1.000000e-02	0.000000e+00	0.000000e+00	
-2	2.000000e-02	0.000000e+00	0.000000e+00	
-3	4.000000e-02	0.000000e+00	0.000000e+00	
-4	8.000000e-02	0.000000e+00	0.000000e+00	
-5	1.600000e-01	0.000000e+00	0.000000e+00	
-6	3.200000e-01	0.000000e+00	0.000000e+00	
-7	6.400000e-01	0.000000e+00	0.000000e+00	
-8	1.280000e+00	0.000000e+00	0.000000e+00	
-9	2.560000e+00	0.000000e+00	0.000000e+00	
-10	4.560000e+00	0.000000e+00	0.000000e+00	
-11	6.560000e+00	0.000000e+00	0.000000e+00	
-12	8.560000e+00	0.000000e+00	0.000000e+00	
-13	1.056000e+01	0.000000e+00	0.000000e+00	
-14	1.256000e+01	0.000000e+00	0.000000e+00	
-15	1.456000e+01	0.000000e+00	0.000000e+00	
-16	1.656000e+01	0.000000e+00	0.000000e+00	
-17	1.856000e+01	0.000000e+00	0.000000e+00	
-18	2.056000e+01	0.000000e+00	0.000000e+00	
-19	2.256000e+01	0.000000e+00	0.000000e+00	
-20	2.456000e+01	0.000000e+00	0.000000e+00	
-21	2.656000e+01	0.000000e+00	0.000000e+00	
-22	2.856000e+01	0.000000e+00	0.000000e+00	
-23	3.056000e+01	0.000000e+00	0.000000e+00	
-24	3.256000e+01	0.000000e+00	0.000000e+00	
-25	3.456000e+01	0.000000e+00	0.000000e+00	
-26	3.656000e+01	0.000000e+00	0.000000e+00	
-27	3.856000e+01	0.000000e+00	0.000000e+00	
-28	4.056000e+01	0.000000e+00	0.000000e+00	
-29	4.256000e+01	0.000000e+00	0.000000e+00	
-30	4.456000e+01	0.000000e+00	0.000000e+00	
-31	4.656000e+01	0.000000e+00	0.000000e+00	
-32	4.856000e+01	0.000000e+00	0.000000e+00	
-33	5.056000e+01	0.000000e+00	0.000000e+00	
-34	5.256000e+01	0.000000e+00	0.000000e+00	
-35	5.456000e+01	0.000000e+00	0.000000e+00	
-36	5.656000e+01	0.000000e+00	0.000000e+00	
-37	5.856000e+01	0.000000e+00	0.000000e+00	
-38	6.056000e+01	0.000000e+00	0.000000e+00	
-39	6.256000e+01	0.000000e+00	0.000000e+00	
-40	6.456000e+01	0.000000e+00	0.000000e+00	
-41	6.656000e+01	0.000000e+00	0.000000e+00	
-42	6.856000e+01	0.000000e+00	0.000000e+00	
-43	7.056000e+01	0.000000e+00	0.000000e+00	
-44	7.256000e+01	0.000000e+00	0.000000e+00	
-45	7.456000e+01	0.000000e+00	0.000000e+00	
-46	7.656000e+01	0.000000e+00	0.000000e+00	
-47	7.856000e+01	0.000000e+00	0.000000e+00	
-48	8.056000e+01	0.000000e+00	0.000000e+00	
-49	8.256000e+01	0.000000e+00	0.000000e+00	
-50	8.456000e+01	0.000000e+00	0.000000e+00	
-51	8.656000e+01	0.000000e+00	0.000000e+00	
-52	8.856000e+01	0.000000e+00	0.000000e+00	
-53	9.056000e+01	0.000000e+00	0.000000e+00	
-54	9.256000e+01	0.000000e+00	0.000000e+00	
-
-Index   time            v2#branch       v3#branch       
---------------------------------------------------------------------------------
-55	9.456000e+01	0.000000e+00	0.000000e+00	
-56	9.656000e+01	0.000000e+00	0.000000e+00	
-57	9.856000e+01	0.000000e+00	0.000000e+00	
-58	1.000000e+02	0.000000e+00	0.000000e+00	
diff --git a/Examples/FullAdder/plot_data_v.txt b/Examples/FullAdder/plot_data_v.txt
deleted file mode 100644
index 12798f95..00000000
--- a/Examples/FullAdder/plot_data_v.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-             * /home/fossee/esim-workspace/fulladder/fulladder.cir
-             Transient Analysis  Tue Aug 29 20:04:13  2017
---------------------------------------------------------------------------------
-Index   time            cin             cout            in1             
---------------------------------------------------------------------------------
-0	0.000000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-1	1.000000e-02	5.000000e+00	5.000000e+00	5.000000e+00	
-2	2.000000e-02	5.000000e+00	5.000000e+00	5.000000e+00	
-3	4.000000e-02	5.000000e+00	5.000000e+00	5.000000e+00	
-4	8.000000e-02	5.000000e+00	5.000000e+00	5.000000e+00	
-5	1.600000e-01	5.000000e+00	5.000000e+00	5.000000e+00	
-6	3.200000e-01	5.000000e+00	5.000000e+00	5.000000e+00	
-7	6.400000e-01	5.000000e+00	5.000000e+00	5.000000e+00	
-8	1.280000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-9	2.560000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-10	4.560000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-11	6.560000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-12	8.560000e+00	5.000000e+00	5.000000e+00	5.000000e+00	
-13	1.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-14	1.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-15	1.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-16	1.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-17	1.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-18	2.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-19	2.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-20	2.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-21	2.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-22	2.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-23	3.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-24	3.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-25	3.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-26	3.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-27	3.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-28	4.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-29	4.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-30	4.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-31	4.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-32	4.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-33	5.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-34	5.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-35	5.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-36	5.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-37	5.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-38	6.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-39	6.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-40	6.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-41	6.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-42	6.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-43	7.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-44	7.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-45	7.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-46	7.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-47	7.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-48	8.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-49	8.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-50	8.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-51	8.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-52	8.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-53	9.056000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-54	9.256000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-
-Index   time            cin             cout            in1             
---------------------------------------------------------------------------------
-55	9.456000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-56	9.656000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-57	9.856000e+01	5.000000e+00	5.000000e+00	5.000000e+00	
-58	1.000000e+02	5.000000e+00	5.000000e+00	5.000000e+00	
-
-             * /home/fossee/esim-workspace/fulladder/fulladder.cir
-             Transient Analysis  Tue Aug 29 20:04:13  2017
---------------------------------------------------------------------------------
-Index   time            in2             sum             
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	0.000000e+00	
-1	1.000000e-02	0.000000e+00	0.000000e+00	
-2	2.000000e-02	0.000000e+00	0.000000e+00	
-3	4.000000e-02	0.000000e+00	0.000000e+00	
-4	8.000000e-02	0.000000e+00	0.000000e+00	
-5	1.600000e-01	0.000000e+00	0.000000e+00	
-6	3.200000e-01	0.000000e+00	0.000000e+00	
-7	6.400000e-01	0.000000e+00	0.000000e+00	
-8	1.280000e+00	0.000000e+00	0.000000e+00	
-9	2.560000e+00	0.000000e+00	0.000000e+00	
-10	4.560000e+00	0.000000e+00	0.000000e+00	
-11	6.560000e+00	0.000000e+00	0.000000e+00	
-12	8.560000e+00	0.000000e+00	0.000000e+00	
-13	1.056000e+01	0.000000e+00	0.000000e+00	
-14	1.256000e+01	0.000000e+00	0.000000e+00	
-15	1.456000e+01	0.000000e+00	0.000000e+00	
-16	1.656000e+01	0.000000e+00	0.000000e+00	
-17	1.856000e+01	0.000000e+00	0.000000e+00	
-18	2.056000e+01	0.000000e+00	0.000000e+00	
-19	2.256000e+01	0.000000e+00	0.000000e+00	
-20	2.456000e+01	0.000000e+00	0.000000e+00	
-21	2.656000e+01	0.000000e+00	0.000000e+00	
-22	2.856000e+01	0.000000e+00	0.000000e+00	
-23	3.056000e+01	0.000000e+00	0.000000e+00	
-24	3.256000e+01	0.000000e+00	0.000000e+00	
-25	3.456000e+01	0.000000e+00	0.000000e+00	
-26	3.656000e+01	0.000000e+00	0.000000e+00	
-27	3.856000e+01	0.000000e+00	0.000000e+00	
-28	4.056000e+01	0.000000e+00	0.000000e+00	
-29	4.256000e+01	0.000000e+00	0.000000e+00	
-30	4.456000e+01	0.000000e+00	0.000000e+00	
-31	4.656000e+01	0.000000e+00	0.000000e+00	
-32	4.856000e+01	0.000000e+00	0.000000e+00	
-33	5.056000e+01	0.000000e+00	0.000000e+00	
-34	5.256000e+01	0.000000e+00	0.000000e+00	
-35	5.456000e+01	0.000000e+00	0.000000e+00	
-36	5.656000e+01	0.000000e+00	0.000000e+00	
-37	5.856000e+01	0.000000e+00	0.000000e+00	
-38	6.056000e+01	0.000000e+00	0.000000e+00	
-39	6.256000e+01	0.000000e+00	0.000000e+00	
-40	6.456000e+01	0.000000e+00	0.000000e+00	
-41	6.656000e+01	0.000000e+00	0.000000e+00	
-42	6.856000e+01	0.000000e+00	0.000000e+00	
-43	7.056000e+01	0.000000e+00	0.000000e+00	
-44	7.256000e+01	0.000000e+00	0.000000e+00	
-45	7.456000e+01	0.000000e+00	0.000000e+00	
-46	7.656000e+01	0.000000e+00	0.000000e+00	
-47	7.856000e+01	0.000000e+00	0.000000e+00	
-48	8.056000e+01	0.000000e+00	0.000000e+00	
-49	8.256000e+01	0.000000e+00	0.000000e+00	
-50	8.456000e+01	0.000000e+00	0.000000e+00	
-51	8.656000e+01	0.000000e+00	0.000000e+00	
-52	8.856000e+01	0.000000e+00	0.000000e+00	
-53	9.056000e+01	0.000000e+00	0.000000e+00	
-54	9.256000e+01	0.000000e+00	0.000000e+00	
-
-Index   time            in2             sum             
---------------------------------------------------------------------------------
-55	9.456000e+01	0.000000e+00	0.000000e+00	
-56	9.656000e+01	0.000000e+00	0.000000e+00	
-57	9.856000e+01	0.000000e+00	0.000000e+00	
-58	1.000000e+02	0.000000e+00	0.000000e+00