common code for Win and Linux, merged py2 changes

3 files changed, 1 insertions, 128 deletions

diff --git a/Examples/Series_Resonance/Series_Resonance_Previous_Values.xml b/Examples/Series_Resonance/Series_Resonance_Previous_Values.xml
new file mode 100644
index 00000000..6bd3fff8
--- /dev/null
+++ b/Examples/Series_Resonance/Series_Resonance_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">1</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">250</field5><field6 name="No. of points">20</field6><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" /><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></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/Series_Resonance/plot_data_i.txt b/Examples/Series_Resonance/plot_data_i.txt
deleted file mode 100644
index 7d60c633..00000000
--- a/Examples/Series_Resonance/plot_data_i.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-      * /home/fossee/updatedexamples/series_resonance/series_resonance.cir
-      AC Analysis  Fri Sep  1 14:52:43  2017
---------------------------------------------------------------------------------
-Index   frequency       l1#branch                       
---------------------------------------------------------------------------------
-0	1.000000e+00	3.948153e-09,	6.283433e-05	
-1	1.410526e+01	7.979416e-07,	8.932754e-04	
-2	2.721053e+01	3.101701e-06,	1.761162e-03	
-3	4.031579e+01	7.326726e-06,	2.706783e-03	
-4	5.342105e+01	1.430876e-05,	3.782665e-03	
-5	6.652632e+01	2.565279e-05,	5.064793e-03	
-6	7.963158e+01	4.454331e-05,	6.673929e-03	
-7	9.273684e+01	7.782339e-05,	8.821413e-03	
-8	1.058421e+02	1.421510e-04,	1.192186e-02	
-9	1.189474e+02	2.865501e-04,	1.692536e-02	
-10	1.320526e+02	7.086120e-04,	2.661033e-02	
-11	1.451579e+02	2.933137e-03,	5.407896e-02	
-12	1.582632e+02	4.419023e-01,	4.966132e-01	
-13	1.713684e+02	4.544027e-03,	-6.72561e-02	
-14	1.844737e+02	1.137501e-03,	-3.37077e-02	
-15	1.975789e+02	5.260162e-04,	-2.29290e-02	
-16	2.106842e+02	3.094825e-04,	-1.75894e-02	
-17	2.237895e+02	2.070279e-04,	-1.43870e-02	
-18	2.368947e+02	1.499339e-04,	-1.22438e-02	
-19	2.500000e+02	1.145756e-04,	-1.07034e-02	
-
-      * /home/fossee/updatedexamples/series_resonance/series_resonance.cir
-      AC Analysis  Fri Sep  1 14:52:43  2017
---------------------------------------------------------------------------------
-Index   frequency       v1#branch                       
---------------------------------------------------------------------------------
-0	1.000000e+00	-3.94815e-09,	-6.28343e-05	
-1	1.410526e+01	-7.97942e-07,	-8.93275e-04	
-2	2.721053e+01	-3.10170e-06,	-1.76116e-03	
-3	4.031579e+01	-7.32673e-06,	-2.70678e-03	
-4	5.342105e+01	-1.43088e-05,	-3.78267e-03	
-5	6.652632e+01	-2.56528e-05,	-5.06479e-03	
-6	7.963158e+01	-4.45433e-05,	-6.67393e-03	
-7	9.273684e+01	-7.78234e-05,	-8.82141e-03	
-8	1.058421e+02	-1.42151e-04,	-1.19219e-02	
-9	1.189474e+02	-2.86550e-04,	-1.69254e-02	
-10	1.320526e+02	-7.08612e-04,	-2.66103e-02	
-11	1.451579e+02	-2.93314e-03,	-5.40790e-02	
-12	1.582632e+02	-4.41902e-01,	-4.96613e-01	
-13	1.713684e+02	-4.54403e-03,	6.725607e-02	
-14	1.844737e+02	-1.13750e-03,	3.370768e-02	
-15	1.975789e+02	-5.26016e-04,	2.292901e-02	
-16	2.106842e+02	-3.09483e-04,	1.758939e-02	
-17	2.237895e+02	-2.07028e-04,	1.438698e-02	
-18	2.368947e+02	-1.49934e-04,	1.224383e-02	
-19	2.500000e+02	-1.14576e-04,	1.070339e-02	
diff --git a/Examples/Series_Resonance/plot_data_v.txt b/Examples/Series_Resonance/plot_data_v.txt
deleted file mode 100644
index 739eb377..00000000
--- a/Examples/Series_Resonance/plot_data_v.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-      * /home/fossee/updatedexamples/series_resonance/series_resonance.cir
-      AC Analysis  Fri Sep  1 14:52:43  2017
---------------------------------------------------------------------------------
-Index   frequency       in                              
---------------------------------------------------------------------------------
-0	1.000000e+00	1.000000e+00,	0.000000e+00	
-1	1.410526e+01	1.000000e+00,	0.000000e+00	
-2	2.721053e+01	1.000000e+00,	0.000000e+00	
-3	4.031579e+01	1.000000e+00,	0.000000e+00	
-4	5.342105e+01	1.000000e+00,	0.000000e+00	
-5	6.652632e+01	1.000000e+00,	0.000000e+00	
-6	7.963158e+01	1.000000e+00,	0.000000e+00	
-7	9.273684e+01	1.000000e+00,	0.000000e+00	
-8	1.058421e+02	1.000000e+00,	0.000000e+00	
-9	1.189474e+02	1.000000e+00,	0.000000e+00	
-10	1.320526e+02	1.000000e+00,	0.000000e+00	
-11	1.451579e+02	1.000000e+00,	0.000000e+00	
-12	1.582632e+02	1.000000e+00,	0.000000e+00	
-13	1.713684e+02	1.000000e+00,	0.000000e+00	
-14	1.844737e+02	1.000000e+00,	0.000000e+00	
-15	1.975789e+02	1.000000e+00,	0.000000e+00	
-16	2.106842e+02	1.000000e+00,	0.000000e+00	
-17	2.237895e+02	1.000000e+00,	0.000000e+00	
-18	2.368947e+02	1.000000e+00,	0.000000e+00	
-19	2.500000e+02	1.000000e+00,	0.000000e+00	
-
-      * /home/fossee/updatedexamples/series_resonance/series_resonance.cir
-      AC Analysis  Fri Sep  1 14:52:43  2017
---------------------------------------------------------------------------------
-Index   frequency       net-_c1-pad2_                   
---------------------------------------------------------------------------------
-0	1.000000e+00	1.000000e+00,	-6.28343e-05	
-1	1.410526e+01	9.999992e-01,	-8.93275e-04	
-2	2.721053e+01	9.999969e-01,	-1.76116e-03	
-3	4.031579e+01	9.999927e-01,	-2.70678e-03	
-4	5.342105e+01	9.999857e-01,	-3.78267e-03	
-5	6.652632e+01	9.999743e-01,	-5.06479e-03	
-6	7.963158e+01	9.999555e-01,	-6.67393e-03	
-7	9.273684e+01	9.999222e-01,	-8.82141e-03	
-8	1.058421e+02	9.998578e-01,	-1.19219e-02	
-9	1.189474e+02	9.997134e-01,	-1.69254e-02	
-10	1.320526e+02	9.992914e-01,	-2.66103e-02	
-11	1.451579e+02	9.970669e-01,	-5.40790e-02	
-12	1.582632e+02	5.580977e-01,	-4.96613e-01	
-13	1.713684e+02	9.954560e-01,	6.725607e-02	
-14	1.844737e+02	9.988625e-01,	3.370768e-02	
-15	1.975789e+02	9.994740e-01,	2.292901e-02	
-16	2.106842e+02	9.996905e-01,	1.758939e-02	
-17	2.237895e+02	9.997930e-01,	1.438698e-02	
-18	2.368947e+02	9.998501e-01,	1.224383e-02	
-19	2.500000e+02	9.998854e-01,	1.070339e-02	
-
-      * /home/fossee/updatedexamples/series_resonance/series_resonance.cir
-      AC Analysis  Fri Sep  1 14:52:43  2017
---------------------------------------------------------------------------------
-Index   frequency       out                             
---------------------------------------------------------------------------------
-0	1.000000e+00	-3.94800e-05,	2.480698e-09	
-1	1.410526e+01	-7.91674e-03,	7.071836e-06	
-2	2.721053e+01	-3.01104e-02,	5.302940e-05	
-3	4.031579e+01	-6.85659e-02,	1.855945e-04	
-4	5.342105e+01	-1.26967e-01,	4.802799e-04	
-5	6.652632e+01	-2.11707e-01,	1.072279e-03	
-6	7.963158e+01	-3.33923e-01,	2.228680e-03	
-7	9.273684e+01	-5.14009e-01,	4.534635e-03	
-8	1.058421e+02	-7.92834e-01,	9.453402e-03	
-9	1.189474e+02	-1.26495e+00,	2.141585e-02	
-10	1.320526e+02	-2.20789e+00,	5.879433e-02	
-11	1.451579e+02	-4.93229e+00,	2.675179e-01	
-12	1.582632e+02	-4.93831e+01,	4.394262e+01	
-13	1.713684e+02	7.241727e+00,	4.892733e-01	
-14	1.844737e+02	3.906997e+00,	1.318458e-01	
-15	1.975789e+02	2.846465e+00,	6.530097e-02	
-16	2.106842e+02	2.328427e+00,	4.096830e-02	
-17	2.237895e+02	2.022968e+00,	2.911042e-02	
-18	2.368947e+02	1.822438e+00,	2.231697e-02	
-19	2.500000e+02	1.681284e+00,	1.799750e-02