Merge pull request #64 from FOSSEE/json

Json

4 files changed, 85 insertions, 86 deletions

diff --git a/Examples/Parallel_Resonance/Parallel_Resonance.cir.out b/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
index 3e249439..263900cb 100644
--- a/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
+++ b/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
@@ -3,7 +3,7 @@
 r1  out gnd 100
 l1  out gnd 100m
 c1  gnd out 10u
-v1 in gnd  ac 1 0
+v1 in gnd  ac 10 0
 r2  out in 1000
 * u1  in plot_v1
 * u3  out plot_v1
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml b/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
deleted file mode 100644
index 9a5ac67d..00000000
--- a/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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">700</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/Parallel_Resonance/plot_data_i.txt b/Examples/Parallel_Resonance/plot_data_i.txt
index 1107dd4c..5424279c 100644
--- a/Examples/Parallel_Resonance/plot_data_i.txt
+++ b/Examples/Parallel_Resonance/plot_data_i.txt
@@ -1,51 +1,51 @@
     * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Thu Mar  3 22:48:11  2016
+    AC Analysis  Fri Sep  1 14:47:46  2017
 --------------------------------------------------------------------------------
 Index   frequency       l1#branch                       
 --------------------------------------------------------------------------------
-0	1.000000e+00	9.999917e-04,	-6.91172e-06	
-1	3.778947e+01	9.843346e-04,	-2.72450e-04	
-2	7.457895e+01	8.921666e-04,	-5.89259e-04	
-3	1.113684e+02	5.983495e-04,	-9.02443e-04	
-4	1.481579e+02	1.251155e-04,	-9.60267e-04	
-5	1.849474e+02	-1.99451e-04,	-7.27640e-04	
-6	2.217368e+02	-2.90964e-04,	-4.73849e-04	
-7	2.585263e+02	-2.78783e-04,	-3.04003e-04	
-8	2.953158e+02	-2.41064e-04,	-2.01407e-04	
-9	3.321053e+02	-2.03047e-04,	-1.38948e-04	
-10	3.688947e+02	-1.70675e-04,	-9.95243e-05	
-11	4.056842e+02	-1.44353e-04,	-7.36265e-05	
-12	4.424737e+02	-1.23168e-04,	-5.59749e-05	
-13	4.792632e+02	-1.06068e-04,	-4.35482e-05	
-14	5.160526e+02	-9.21600e-05,	-3.45516e-05	
-15	5.528421e+02	-8.07408e-05,	-2.78790e-05	
-16	5.896316e+02	-7.12740e-05,	-2.28253e-05	
-17	6.264211e+02	-6.33514e-05,	-1.89271e-05	
-18	6.632105e+02	-5.66622e-05,	-1.58714e-05	
-19	7.000000e+02	-5.09674e-05,	-1.34418e-05	
+0	1.000000e+00	9.999917e-03,	-6.91172e-05	
+1	3.778947e+01	9.843346e-03,	-2.72450e-03	
+2	7.457895e+01	8.921666e-03,	-5.89259e-03	
+3	1.113684e+02	5.983495e-03,	-9.02443e-03	
+4	1.481579e+02	1.251155e-03,	-9.60267e-03	
+5	1.849474e+02	-1.99451e-03,	-7.27640e-03	
+6	2.217368e+02	-2.90964e-03,	-4.73849e-03	
+7	2.585263e+02	-2.78783e-03,	-3.04003e-03	
+8	2.953158e+02	-2.41064e-03,	-2.01407e-03	
+9	3.321053e+02	-2.03047e-03,	-1.38948e-03	
+10	3.688947e+02	-1.70675e-03,	-9.95243e-04	
+11	4.056842e+02	-1.44353e-03,	-7.36265e-04	
+12	4.424737e+02	-1.23168e-03,	-5.59749e-04	
+13	4.792632e+02	-1.06068e-03,	-4.35482e-04	
+14	5.160526e+02	-9.21600e-04,	-3.45516e-04	
+15	5.528421e+02	-8.07408e-04,	-2.78790e-04	
+16	5.896316e+02	-7.12740e-04,	-2.28253e-04	
+17	6.264211e+02	-6.33514e-04,	-1.89271e-04	
+18	6.632105e+02	-5.66622e-04,	-1.58714e-04	
+19	7.000000e+02	-5.09674e-04,	-1.34418e-04	
 
     * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Thu Mar  3 22:48:11  2016
+    AC Analysis  Fri Sep  1 14:47:46  2017
 --------------------------------------------------------------------------------
 Index   frequency       v1#branch                       
 --------------------------------------------------------------------------------
-0	1.000000e+00	-9.99996e-04,	6.283133e-07	
-1	3.778947e+01	-9.93531e-04,	2.337187e-05	
-2	7.457895e+01	-9.72388e-04,	4.180633e-05	
-3	1.113684e+02	-9.36852e-04,	4.186941e-05	
-4	1.481579e+02	-9.10608e-04,	1.164705e-05	
-5	1.849474e+02	-9.15444e-04,	-2.31773e-05	
-6	2.217368e+02	-9.33983e-04,	-4.05375e-05	
-7	2.585263e+02	-9.50619e-04,	-4.52846e-05	
-8	2.953158e+02	-9.62628e-04,	-4.47301e-05	
-9	3.321053e+02	-9.71006e-04,	-4.23694e-05	
-10	3.688947e+02	-9.76932e-04,	-3.95596e-05	
-11	4.056842e+02	-9.81233e-04,	-3.67955e-05	
-12	4.424737e+02	-9.84438e-04,	-3.42424e-05	
-13	4.792632e+02	-9.86886e-04,	-3.19403e-05	
-14	5.160526e+02	-9.88797e-04,	-2.98825e-05	
-15	5.528421e+02	-9.90316e-04,	-2.80462e-05	
-16	5.896316e+02	-9.91544e-04,	-2.64053e-05	
-17	6.264211e+02	-9.92550e-04,	-2.49346e-05	
-18	6.632105e+02	-9.93386e-04,	-2.36116e-05	
-19	7.000000e+02	-9.94088e-04,	-2.24166e-05	
+0	1.000000e+00	-9.99996e-03,	6.283133e-06	
+1	3.778947e+01	-9.93531e-03,	2.337187e-04	
+2	7.457895e+01	-9.72388e-03,	4.180633e-04	
+3	1.113684e+02	-9.36852e-03,	4.186941e-04	
+4	1.481579e+02	-9.10608e-03,	1.164705e-04	
+5	1.849474e+02	-9.15444e-03,	-2.31773e-04	
+6	2.217368e+02	-9.33983e-03,	-4.05375e-04	
+7	2.585263e+02	-9.50619e-03,	-4.52846e-04	
+8	2.953158e+02	-9.62628e-03,	-4.47301e-04	
+9	3.321053e+02	-9.71006e-03,	-4.23694e-04	
+10	3.688947e+02	-9.76932e-03,	-3.95596e-04	
+11	4.056842e+02	-9.81233e-03,	-3.67955e-04	
+12	4.424737e+02	-9.84438e-03,	-3.42424e-04	
+13	4.792632e+02	-9.86886e-03,	-3.19403e-04	
+14	5.160526e+02	-9.88797e-03,	-2.98825e-04	
+15	5.528421e+02	-9.90316e-03,	-2.80462e-04	
+16	5.896316e+02	-9.91544e-03,	-2.64053e-04	
+17	6.264211e+02	-9.92550e-03,	-2.49346e-04	
+18	6.632105e+02	-9.93386e-03,	-2.36116e-04	
+19	7.000000e+02	-9.94088e-03,	-2.24166e-04	
diff --git a/Examples/Parallel_Resonance/plot_data_v.txt b/Examples/Parallel_Resonance/plot_data_v.txt
index 16d59cda..56d03c04 100644
--- a/Examples/Parallel_Resonance/plot_data_v.txt
+++ b/Examples/Parallel_Resonance/plot_data_v.txt
@@ -1,51 +1,51 @@
     * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Thu Mar  3 22:48:11  2016
+    AC Analysis  Fri Sep  1 14:47:46  2017
 --------------------------------------------------------------------------------
 Index   frequency       in                              
 --------------------------------------------------------------------------------
-0	1.000000e+00	1.000000e+00,	0.000000e+00	
-1	3.778947e+01	1.000000e+00,	0.000000e+00	
-2	7.457895e+01	1.000000e+00,	0.000000e+00	
-3	1.113684e+02	1.000000e+00,	0.000000e+00	
-4	1.481579e+02	1.000000e+00,	0.000000e+00	
-5	1.849474e+02	1.000000e+00,	0.000000e+00	
-6	2.217368e+02	1.000000e+00,	0.000000e+00	
-7	2.585263e+02	1.000000e+00,	0.000000e+00	
-8	2.953158e+02	1.000000e+00,	0.000000e+00	
-9	3.321053e+02	1.000000e+00,	0.000000e+00	
-10	3.688947e+02	1.000000e+00,	0.000000e+00	
-11	4.056842e+02	1.000000e+00,	0.000000e+00	
-12	4.424737e+02	1.000000e+00,	0.000000e+00	
-13	4.792632e+02	1.000000e+00,	0.000000e+00	
-14	5.160526e+02	1.000000e+00,	0.000000e+00	
-15	5.528421e+02	1.000000e+00,	0.000000e+00	
-16	5.896316e+02	1.000000e+00,	0.000000e+00	
-17	6.264211e+02	1.000000e+00,	0.000000e+00	
-18	6.632105e+02	1.000000e+00,	0.000000e+00	
-19	7.000000e+02	1.000000e+00,	0.000000e+00	
+0	1.000000e+00	1.000000e+01,	0.000000e+00	
+1	3.778947e+01	1.000000e+01,	0.000000e+00	
+2	7.457895e+01	1.000000e+01,	0.000000e+00	
+3	1.113684e+02	1.000000e+01,	0.000000e+00	
+4	1.481579e+02	1.000000e+01,	0.000000e+00	
+5	1.849474e+02	1.000000e+01,	0.000000e+00	
+6	2.217368e+02	1.000000e+01,	0.000000e+00	
+7	2.585263e+02	1.000000e+01,	0.000000e+00	
+8	2.953158e+02	1.000000e+01,	0.000000e+00	
+9	3.321053e+02	1.000000e+01,	0.000000e+00	
+10	3.688947e+02	1.000000e+01,	0.000000e+00	
+11	4.056842e+02	1.000000e+01,	0.000000e+00	
+12	4.424737e+02	1.000000e+01,	0.000000e+00	
+13	4.792632e+02	1.000000e+01,	0.000000e+00	
+14	5.160526e+02	1.000000e+01,	0.000000e+00	
+15	5.528421e+02	1.000000e+01,	0.000000e+00	
+16	5.896316e+02	1.000000e+01,	0.000000e+00	
+17	6.264211e+02	1.000000e+01,	0.000000e+00	
+18	6.632105e+02	1.000000e+01,	0.000000e+00	
+19	7.000000e+02	1.000000e+01,	0.000000e+00	
 
     * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Thu Mar  3 22:48:11  2016
+    AC Analysis  Fri Sep  1 14:47:46  2017
 --------------------------------------------------------------------------------
 Index   frequency       out                             
 --------------------------------------------------------------------------------
-0	1.000000e+00	4.342761e-06,	6.283133e-04	
-1	3.778947e+01	6.469017e-03,	2.337187e-02	
-2	7.457895e+01	2.761228e-02,	4.180633e-02	
-3	1.113684e+02	6.314828e-02,	4.186941e-02	
-4	1.481579e+02	8.939157e-02,	1.164705e-02	
-5	1.849474e+02	8.455604e-02,	-2.31773e-02	
-6	2.217368e+02	6.601726e-02,	-4.05375e-02	
-7	2.585263e+02	4.938124e-02,	-4.52846e-02	
-8	2.953158e+02	3.737155e-02,	-4.47301e-02	
-9	3.321053e+02	2.899398e-02,	-4.23694e-02	
-10	3.688947e+02	2.306809e-02,	-3.95596e-02	
-11	4.056842e+02	1.876731e-02,	-3.67955e-02	
-12	4.424737e+02	1.556182e-02,	-3.42424e-02	
-13	4.792632e+02	1.311366e-02,	-3.19403e-02	
-14	5.160526e+02	1.120320e-02,	-2.98825e-02	
-15	5.528421e+02	9.684087e-03,	-2.80462e-02	
-16	5.896316e+02	8.456245e-03,	-2.64053e-02	
-17	6.264211e+02	7.449539e-03,	-2.49346e-02	
-18	6.632105e+02	6.613717e-03,	-2.36116e-02	
-19	7.000000e+02	5.912034e-03,	-2.24166e-02	
+0	1.000000e+00	4.342761e-05,	6.283133e-03	
+1	3.778947e+01	6.469017e-02,	2.337187e-01	
+2	7.457895e+01	2.761228e-01,	4.180633e-01	
+3	1.113684e+02	6.314828e-01,	4.186941e-01	
+4	1.481579e+02	8.939157e-01,	1.164705e-01	
+5	1.849474e+02	8.455604e-01,	-2.31773e-01	
+6	2.217368e+02	6.601726e-01,	-4.05375e-01	
+7	2.585263e+02	4.938124e-01,	-4.52846e-01	
+8	2.953158e+02	3.737155e-01,	-4.47301e-01	
+9	3.321053e+02	2.899398e-01,	-4.23694e-01	
+10	3.688947e+02	2.306809e-01,	-3.95596e-01	
+11	4.056842e+02	1.876731e-01,	-3.67955e-01	
+12	4.424737e+02	1.556182e-01,	-3.42424e-01	
+13	4.792632e+02	1.311366e-01,	-3.19403e-01	
+14	5.160526e+02	1.120320e-01,	-2.98825e-01	
+15	5.528421e+02	9.684087e-02,	-2.80462e-01	
+16	5.896316e+02	8.456245e-02,	-2.64053e-01	
+17	6.264211e+02	7.449539e-02,	-2.49346e-01	
+18	6.632105e+02	6.613717e-02,	-2.36116e-01	
+19	7.000000e+02	5.912034e-02,	-2.24166e-01