Sync tests

diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> R1.1
-	C2.1 <-> R2.2
+	C1.1 <-> C1.2 <-> R1.1
+	C2.1 <-> R2.1 <-> R2.2 <-> R3.2
 	C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2
 	C5.1 <-> R3.1
 	C5.2 <-> R4.1
-	R2.1 <-> R3.2
 

diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> R1.1
-	C2.1 <-> R2.2
+	C1.1 <-> C1.2 <-> R1.1
+	C2.1 <-> R2.1 <-> R2.2 <-> R3.2
 	C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2
 	C5.1 <-> R3.1
 	C5.2 <-> R4.1
-	R2.1 <-> R3.2
 

diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt

@@ -1,6 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1 <-> S1.4
@@ -10,7 +10,6 @@ Switch setup: [Default]
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
 	D1.2 <-> S1.8
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 <-> S1.7
 	P4.2 <-> P4.3 <-> R4.1

diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt

@@ -1,6 +1,6 @@
 Switch setup: [S1.ON1]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1
@@ -10,7 +10,6 @@ Switch setup: [S1.ON1]
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
 	D1.2 <-> P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.2 <-> P4.3 <-> R4.1
 	P5.1 <-> R6.1
@@ -19,7 +18,7 @@ Switch setup: [S1.ON1]
 
 Switch setup: [S1.ON2]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1
@@ -28,7 +27,6 @@ Switch setup: [S1.ON2]
 	C4.1 <-> R5.2
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2
 	P4.2 <-> P4.3 <-> R4.1

diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1
-	C2.2 <-> C3.1 <-> Q1.1
+	C1.1 <-> C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C4.2 <-> C5.2 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> R5.2
+	C2.2 <-> C3.1 <-> C3.2 <-> Q1.1
 	C4.1 <-> R4.1
-	C4.2 <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2
 	Q2.1 <-> R2.1 <-> R4.2
 

diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1
-	C2.2 <-> C3.1 <-> Q1.1
+	C1.1 <-> C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C4.2 <-> C5.2 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> R5.2
+	C2.2 <-> C3.1 <-> C3.2 <-> Q1.1
 	C4.1 <-> R4.1
-	C4.2 <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2
 	Q2.1 <-> R2.1 <-> R4.2
 

diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt

@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> C3.2 <-> Q1.1 <-> R2.1
 	C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
 	C2.2 <-> C5.2 <-> R4.2 <-> R5.2
-	C3.1 <-> Q1.1 <-> R2.1
 	C4.1 <-> D1.1 <-> R5.1
 	C5.1 <-> R1.2 <-> R3.1 <-> R4.1
 	R2.2 <-> R3.2

diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt

@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> C3.2 <-> Q1.1 <-> R2.1
 	C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
 	C2.2 <-> C5.2 <-> R4.2 <-> R5.2
-	C3.1 <-> Q1.1 <-> R2.1
 	C4.1 <-> D1.1 <-> R5.1
 	C5.1 <-> R1.2 <-> R3.1 <-> R4.1
 	R2.2 <-> R3.2

diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt

@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.1 <-> D1.2 <-> Q1.3 <-> R2.2 <-> R3.1
-	C1.2 <-> R1.2
-	C2.1 <-> VR1.2
-	C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3
+	C1.1 <-> C1.2 <-> D1.1 <-> D1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1
+	C2.1 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R4.1 <-> VR1.2 <-> VR1.3 <-> VR2.3
 	C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2
 	C3.2 <-> VR2.1
-	Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1
-	Q2.3 <-> R4.1
+	R6.1 <-> VR2.2
 

diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt

@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.1 <-> D1.2 <-> Q1.3 <-> R2.2 <-> R3.1
-	C1.2 <-> R1.2
-	C2.1 <-> VR1.2
-	C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3
+	C1.1 <-> C1.2 <-> D1.1 <-> D1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1
+	C2.1 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R4.1 <-> VR1.2 <-> VR1.3 <-> VR2.3
 	C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2
 	C3.2 <-> VR2.1
-	Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1
-	Q2.3 <-> R4.1
+	R6.1 <-> VR2.2
 

diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt

@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1
-	C1.2 <-> C2.1 <-> IC1.7 <-> P3.1 <-> R3.2
-	C2.2 <-> IC1.10 <-> IC1.9 <-> P2.3
-	C3.1 <-> IC1.13
-	C3.2 <-> R2.2
-	IC1.1 <-> P1.3 <-> R1.2
-	IC1.12 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P2.1 <-> P2.2
-	IC1.14 <-> IC1.5
-	P3.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> IC1.10 <-> IC1.13 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.9 <-> P2.3 <-> R1.1 <-> R2.2
+	C1.2 <-> C2.1 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P1.3 <-> P2.1 <-> P2.2 <-> P3.1 <-> P3.3 <-> R1.2 <-> R2.1 <-> R3.1 <-> R3.2
+	IC1.11 <-> IC1.4
 

diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt

@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1
-	C1.2 <-> C2.1 <-> IC1.7 <-> P3.1 <-> R3.2
-	C2.2 <-> IC1.10 <-> IC1.9 <-> P2.3
-	C3.1 <-> IC1.13
-	C3.2 <-> R2.2
-	IC1.1 <-> P1.3 <-> R1.2
-	IC1.12 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P2.1 <-> P2.2
-	IC1.14 <-> IC1.5
-	P3.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> IC1.10 <-> IC1.13 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.9 <-> P2.3 <-> R1.1 <-> R2.2
+	C1.2 <-> C2.1 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P1.3 <-> P2.1 <-> P2.2 <-> P3.1 <-> P3.3 <-> R1.2 <-> R2.1 <-> R3.1 <-> R3.2
+	IC1.11 <-> IC1.4
 

diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.3 <-> R2.1
-	C2.1 <-> C4.2 <-> D1.2 <-> R3.1 <-> R4.1
-	C2.2 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.2
-	C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2
-	C3.2 <-> Q2.1 <-> R3.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C6.1 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R3.2 <-> VR1.2
+	C1.2 <-> Q1.3 <-> R2.1 <-> R2.2
+	C2.1 <-> C4.2 <-> C5.2 <-> D1.2 <-> R3.1 <-> R4.1
 	C4.1 <-> C5.1 <-> R4.2 <-> VR1.3
+	R1.1 <-> VR1.1
 

diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.3 <-> R2.1
-	C2.1 <-> C4.2 <-> D1.2 <-> R3.1 <-> R4.1
-	C2.2 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.2
-	C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2
-	C3.2 <-> Q2.1 <-> R3.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C6.1 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R3.2 <-> VR1.2
+	C1.2 <-> Q1.3 <-> R2.1 <-> R2.2
+	C2.1 <-> C4.2 <-> C5.2 <-> D1.2 <-> R3.1 <-> R4.1
 	C4.1 <-> C5.1 <-> R4.2 <-> VR1.3
+	R1.1 <-> VR1.1
 

diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> D1.2 <-> Q1.3
-	C1.2 <-> R2.1
-	C2.1 <-> D1.1 <-> R1.2
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> D1.2 <-> Q1.3
-	C1.2 <-> R2.1
-	C2.1 <-> D1.1 <-> R1.2
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt

@@ -3,10 +3,9 @@ Switch setup: [Default]
 	C1.1 <-> C2.1 <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2
 	C1.2 <-> C6.2 <-> C7.2 <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2
 	C2.2 <-> Q1.1 <-> R1.2
-	C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2
-	C5.1 <-> D1.1 <-> R7.2
-	C6.1 <-> C9.1 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
-	C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
-	C8.1 <-> Q2.1 <-> R5.2
-	C8.2 <-> R8.1
+	C3.1 <-> C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
+	C3.2 <-> C8.1 <-> C8.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> R2.2 <-> R3.2 <-> R5.2 <-> R8.1
+	C4.1 <-> C5.1 <-> D1.1 <-> R7.2
+	C4.2 <-> C5.2
+	C6.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
 

diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt

@@ -3,10 +3,9 @@ Switch setup: [Default]
 	C1.1 <-> C2.1 <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2
 	C1.2 <-> C6.2 <-> C7.2 <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2
 	C2.2 <-> Q1.1 <-> R1.2
-	C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2
-	C5.1 <-> D1.1 <-> R7.2
-	C6.1 <-> C9.1 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
-	C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
-	C8.1 <-> Q2.1 <-> R5.2
-	C8.2 <-> R8.1
+	C3.1 <-> C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
+	C3.2 <-> C8.1 <-> C8.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> R2.2 <-> R3.2 <-> R5.2 <-> R8.1
+	C4.1 <-> C5.1 <-> D1.1 <-> R7.2
+	C4.2 <-> C5.2
+	C6.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
 

diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt

@@ -1,31 +1,15 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R7.1 <-> Volume.3
 	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
+	C11.1 <-> C12.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
 	C12.2 <-> R15.1 <-> Tone.1
-	C13.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C13.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C13.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C13.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
 	Tone.2 <-> Volume.1
 

diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt

@@ -1,31 +1,15 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R7.1 <-> Volume.3
 	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
+	C11.1 <-> C12.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
 	C12.2 <-> R15.1 <-> Tone.1
-	C13.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C13.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C13.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C13.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
 	Tone.2 <-> Volume.1
 

diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt

@@ -1,34 +1,16 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> S1.1 <-> Tone.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1 <-> S1.1
 	S1.2 <-> Volume.1
 	S1.3 <-> Tone.2
 

diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt

@@ -1,65 +1,29 @@
 Switch setup: [S1.ON1]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> Tone.1 <-> Volume.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1 <-> Volume.1
 
 Switch setup: [S1.ON2]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> Tone.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1
 	Tone.2 <-> Volume.1
 

diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt

@@ -1,18 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> Q5.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R15.1 <-> R15.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R18.2 <-> R19.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R8.2 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R4.2 <-> R7.2 <-> R9.2
-	C3.1 <-> R6.2
-	C4.2 <-> C5.1 <-> C7.2 <-> Q3.3 <-> R10.1 <-> R12.1 <-> R15.1 <-> R8.1
-	C5.2 <-> R8.2 <-> R9.1
-	C6.1 <-> C7.1 <-> Q4.1 <-> Q4.2 <-> R14.1
-	C8.1 <-> C9.1 <-> R19.2 <-> R20.2
-	Q1.1 <-> Q1.2 <-> R10.2 <-> R13.1 <-> R18.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1
-	Q2.3 <-> R5.2
-	Q4.3 <-> R12.2
-	Q5.1 <-> Q5.2 <-> R17.1
-	Q5.3 <-> R15.2 <-> R16.1 <-> R20.1
-	R18.1 <-> R19.1
+	C3.2 <-> C9.2
 

diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt

@@ -1,18 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> Q5.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R15.1 <-> R15.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R18.2 <-> R19.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R8.2 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R4.2 <-> R7.2 <-> R9.2
-	C3.1 <-> R6.2
-	C4.2 <-> C5.1 <-> C7.2 <-> Q3.3 <-> R10.1 <-> R12.1 <-> R15.1 <-> R8.1
-	C5.2 <-> R8.2 <-> R9.1
-	C6.1 <-> C7.1 <-> Q4.1 <-> Q4.2 <-> R14.1
-	C8.1 <-> C9.1 <-> R19.2 <-> R20.2
-	Q1.1 <-> Q1.2 <-> R10.2 <-> R13.1 <-> R18.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1
-	Q2.3 <-> R5.2
-	Q4.3 <-> R12.2
-	Q5.1 <-> Q5.2 <-> R17.1
-	Q5.3 <-> R15.2 <-> R16.1 <-> R20.1
-	R18.1 <-> R19.1
+	C3.2 <-> C9.2
 

diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt

@@ -1,16 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q3.2 <-> Q3.3 <-> R1.1
-	C1.2 <-> C4.2
-	C2.1 <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C5.1 <-> C8.1 <-> R6.1
-	C5.2 <-> R5.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1
-	C6.2 <-> Q3.1 <-> R2.1
-	C7.2 <-> R6.2
-	C8.2 <-> R7.1
-	Q1.1 <-> R5.2
+	C1.1 <-> C2.1 <-> C4.1 <-> C7.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R2.2 <-> R3.2
+	C1.2 <-> C4.2 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.1 <-> C5.2 <-> C7.2 <-> R1.2 <-> R5.1 <-> R6.2
+	C3.2 <-> C6.2 <-> Q3.1 <-> R2.1
+	C5.1 <-> C6.1 <-> C8.1 <-> Q2.2 <-> Q2.3 <-> R4.1 <-> R4.2 <-> R6.1
+	C8.2 <-> Q1.1 <-> R5.2 <-> R7.1
 	Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1
-	R7.2 <-> R8.1
 

diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt

@@ -1,16 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q3.2 <-> Q3.3 <-> R1.1
-	C1.2 <-> C4.2
-	C2.1 <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C5.1 <-> C8.1 <-> R6.1
-	C5.2 <-> R5.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1
-	C6.2 <-> Q3.1 <-> R2.1
-	C7.2 <-> R6.2
-	C8.2 <-> R7.1
-	Q1.1 <-> R5.2
+	C1.1 <-> C2.1 <-> C4.1 <-> C7.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R2.2 <-> R3.2
+	C1.2 <-> C4.2 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.1 <-> C5.2 <-> C7.2 <-> R1.2 <-> R5.1 <-> R6.2
+	C3.2 <-> C6.2 <-> Q3.1 <-> R2.1
+	C5.1 <-> C6.1 <-> C8.1 <-> Q2.2 <-> Q2.3 <-> R4.1 <-> R4.2 <-> R6.1
+	C8.2 <-> Q1.1 <-> R5.2 <-> R7.1
 	Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1
-	R7.2 <-> R8.1
 

diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt

@@ -1,20 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> IC1.3 <-> R2.2
-	C10.1 <-> C11.2 <-> R10.2
-	C10.2 <-> C9.1 <-> R9.1
-	C11.1 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1
-	C12.1 <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1
-	C2.1 <-> R3.1
-	C3.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R4.1
-	C3.2 <-> C4.1 <-> D1.1 <-> D3.2 <-> IC1.1 <-> R4.2
-	C4.2 <-> R5.2
-	C5.1 <-> R6.1
-	C6.1 <-> C7.1 <-> D4.1 <-> D5.2 <-> IC1.6 <-> R7.2
-	C6.2 <-> D4.2 <-> D5.1 <-> IC1.7 <-> R6.2 <-> R7.1
-	C7.2 <-> C8.1 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.5 <-> R11.1 <-> R12.1
-	IC1.8 <-> R5.1 <-> R8.2
+	C1.1 <-> C12.1 <-> C5.1 <-> R1.2 <-> R12.2 <-> R13.2 <-> R2.1 <-> R6.1 <-> R8.1
+	C1.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C6.2 <-> C7.2 <-> C8.1 <-> D1.1 <-> D3.2 <-> D4.2 <-> D5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R11.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C10.1 <-> C11.1 <-> C11.2 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.1 <-> R3.2 <-> R5.1 <-> R8.2
+	C10.2 <-> C3.1 <-> C6.1 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R7.2 <-> R9.1
+	C4.2 <-> C9.2 <-> R5.2
 

diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt

@@ -1,20 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> IC1.3 <-> R2.2
-	C10.1 <-> C11.2 <-> R10.2
-	C10.2 <-> C9.1 <-> R9.1
-	C11.1 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1
-	C12.1 <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1
-	C2.1 <-> R3.1
-	C3.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R4.1
-	C3.2 <-> C4.1 <-> D1.1 <-> D3.2 <-> IC1.1 <-> R4.2
-	C4.2 <-> R5.2
-	C5.1 <-> R6.1
-	C6.1 <-> C7.1 <-> D4.1 <-> D5.2 <-> IC1.6 <-> R7.2
-	C6.2 <-> D4.2 <-> D5.1 <-> IC1.7 <-> R6.2 <-> R7.1
-	C7.2 <-> C8.1 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.5 <-> R11.1 <-> R12.1
-	IC1.8 <-> R5.1 <-> R8.2
+	C1.1 <-> C12.1 <-> C5.1 <-> R1.2 <-> R12.2 <-> R13.2 <-> R2.1 <-> R6.1 <-> R8.1
+	C1.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C6.2 <-> C7.2 <-> C8.1 <-> D1.1 <-> D3.2 <-> D4.2 <-> D5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R11.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C10.1 <-> C11.1 <-> C11.2 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.1 <-> R3.2 <-> R5.1 <-> R8.2
+	C10.2 <-> C3.1 <-> C6.1 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R7.2 <-> R9.1
+	C4.2 <-> C9.2 <-> R5.2
 

diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt

@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> R2.1
-	C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1
-	C2.2 <-> C5.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R10.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C2.1 <-> C6.1 <-> C7.2 <-> Q1.1 <-> R10.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R9.2
 	C3.1 <-> R5.2 <-> R7.1
-	C3.2 <-> R6.1
+	C3.2 <-> R6.1 <-> R8.2
 	C4.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 <-> R5.1
 	C4.2 <-> C5.1 <-> R8.1
 	C6.2 <-> C7.1 <-> R9.1
-	C7.2 <-> R10.1 <-> R9.2
-	R1.1 <-> R10.2 <-> R6.2
 

diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt

@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> R2.1
-	C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1
-	C2.2 <-> C5.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R10.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C2.1 <-> C6.1 <-> C7.2 <-> Q1.1 <-> R10.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R9.2
 	C3.1 <-> R5.2 <-> R7.1
-	C3.2 <-> R6.1
+	C3.2 <-> R6.1 <-> R8.2
 	C4.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 <-> R5.1
 	C4.2 <-> C5.1 <-> R8.1
 	C6.2 <-> C7.1 <-> R9.1
-	C7.2 <-> R10.1 <-> R9.2
-	R1.1 <-> R10.2 <-> R6.2
 

diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 

diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 

diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.2
-	C1.2 <-> R4.1 <-> Vol.1
+	C1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Vol.1
 	C2.1 <-> R3.1
 	C2.2 <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.3
-	Q1.1 <-> Q1.2 <-> R1.1
 	Q1.3 <-> R2.1
 

diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt

@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.2
-	C1.2 <-> R4.1 <-> Vol.1
+	C1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Vol.1
 	C2.1 <-> R3.1
 	C2.2 <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.3
-	Q1.1 <-> Q1.2 <-> R1.1
 	Q1.3 <-> R2.1
 

diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt

@@ -1,14 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> IC1.2 <-> R2.1
-	C2.2 <-> C5.1 <-> IC1.7 <-> R2.2
-	C3.2 <-> R3.1
-	C4.2 <-> C6.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R7.1
-	C5.2 <-> R6.1
-	C6.1 <-> D1.1 <-> D2.2 <-> R6.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1
 	C7.1 <-> R4.2 <-> R5.2 <-> R7.2
-	IC1.3 <-> R1.1 <-> R4.1
-	IC1.6 <-> R5.1
+	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt

@@ -1,14 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> IC1.2 <-> R2.1
-	C2.2 <-> C5.1 <-> IC1.7 <-> R2.2
-	C3.2 <-> R3.1
-	C4.2 <-> C6.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R7.1
-	C5.2 <-> R6.1
-	C6.1 <-> D1.1 <-> D2.2 <-> R6.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1
 	C7.1 <-> R4.2 <-> R5.2 <-> R7.2
-	IC1.3 <-> R1.1 <-> R4.1
-	IC1.6 <-> R5.1
+	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt

@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.3 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 

diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt

@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.3 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 

diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt

@@ -1,26 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
-	C1.2 <-> C2.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> R1.1 <-> R14.2 <-> R16.2 <-> R19.2 <-> R3.1 <-> R7.2
-	C10.1 <-> R14.1
-	C11.2 <-> Q2.2 <-> Q2.3 <-> R18.1
-	C2.1 <-> D1.2 <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1
-	C3.1 <-> R17.1
-	C3.2 <-> R16.1
-	C4.1 <-> R2.2
-	C4.2 <-> R3.2
-	C5.1 <-> R1.2
-	C5.2 <-> IC1.3 <-> R8.2
-	C6.1 <-> R9.2
-	C6.2 <-> C7.1 <-> IC1.2 <-> R13.1
-	C7.2 <-> D2.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> R12.2
-	C8.1 <-> R10.1
-	C8.2 <-> IC1.6 <-> R11.1
-	C9.1 <-> IC1.8 <-> R12.1 <-> R15.1
-	D2.1 <-> D3.2
-	D3.1 <-> D4.2
-	D5.2 <-> D6.1
-	IC1.7 <-> R11.2
-	Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2
-	R17.2 <-> R19.1
+	C1.2 <-> C2.2 <-> C3.1 <-> C9.1 <-> C9.2 <-> D1.1 <-> D3.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R12.1 <-> R14.2 <-> R15.1 <-> R16.2 <-> R17.1 <-> R19.2 <-> R3.1 <-> R7.2
+	C10.1 <-> C10.2 <-> R13.2 <-> R14.1
+	C11.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C8.2 <-> D5.2 <-> D6.1 <-> IC1.2 <-> IC1.6 <-> R11.1 <-> R13.1 <-> R17.2 <-> R19.1 <-> R3.2
+	C11.2 <-> C2.1 <-> C3.2 <-> C5.1 <-> C6.1 <-> C7.2 <-> C8.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R10.1 <-> R10.2 <-> R12.2 <-> R16.1 <-> R18.1 <-> R2.1 <-> R5.1 <-> R6.2 <-> R9.2
+	C4.1 <-> C5.2 <-> IC1.3 <-> IC1.7 <-> R11.2 <-> R2.2 <-> R8.2
 

diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt

@@ -1,26 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
-	C1.2 <-> C2.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> R1.1 <-> R14.2 <-> R16.2 <-> R19.2 <-> R3.1 <-> R7.2
-	C10.1 <-> R14.1
-	C11.2 <-> Q2.2 <-> Q2.3 <-> R18.1
-	C2.1 <-> D1.2 <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1
-	C3.1 <-> R17.1
-	C3.2 <-> R16.1
-	C4.1 <-> R2.2
-	C4.2 <-> R3.2
-	C5.1 <-> R1.2
-	C5.2 <-> IC1.3 <-> R8.2
-	C6.1 <-> R9.2
-	C6.2 <-> C7.1 <-> IC1.2 <-> R13.1
-	C7.2 <-> D2.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> R12.2
-	C8.1 <-> R10.1
-	C8.2 <-> IC1.6 <-> R11.1
-	C9.1 <-> IC1.8 <-> R12.1 <-> R15.1
-	D2.1 <-> D3.2
-	D3.1 <-> D4.2
-	D5.2 <-> D6.1
-	IC1.7 <-> R11.2
-	Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2
-	R17.2 <-> R19.1
+	C1.2 <-> C2.2 <-> C3.1 <-> C9.1 <-> C9.2 <-> D1.1 <-> D3.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R12.1 <-> R14.2 <-> R15.1 <-> R16.2 <-> R17.1 <-> R19.2 <-> R3.1 <-> R7.2
+	C10.1 <-> C10.2 <-> R13.2 <-> R14.1
+	C11.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C8.2 <-> D5.2 <-> D6.1 <-> IC1.2 <-> IC1.6 <-> R11.1 <-> R13.1 <-> R17.2 <-> R19.1 <-> R3.2
+	C11.2 <-> C2.1 <-> C3.2 <-> C5.1 <-> C6.1 <-> C7.2 <-> C8.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R10.1 <-> R10.2 <-> R12.2 <-> R16.1 <-> R18.1 <-> R2.1 <-> R5.1 <-> R6.2 <-> R9.2
+	C4.1 <-> C5.2 <-> IC1.3 <-> IC1.7 <-> R11.2 <-> R2.2 <-> R8.2
 

diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt

@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 

diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt

@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 

diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt

@@ -1,17 +1,7 @@
 Switch setup: [Default]
 
+	C1.1 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C6.1 <-> C6.2 <-> C8.1 <-> C8.2 <-> D1.2 <-> D10.1 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> D7.2 <-> D8.1 <-> D9.2
 	C1.2 <-> Q1.1 <-> R1.2
-	C10.1 <-> C8.2 <-> D7.2 <-> D8.1
-	C10.2 <-> D10.1 <-> D9.2
-	C11.1 <-> C9.2 <-> D8.2 <-> D9.1
-	C11.2 <-> D10.2
-	C2.2 <-> C4.1 <-> D1.2 <-> D2.1
-	C3.1 <-> D1.1
-	C3.2 <-> C5.1 <-> D2.2 <-> D3.1
-	C4.2 <-> C6.1 <-> D3.2 <-> D4.1
-	C5.2 <-> C7.1 <-> D4.2 <-> D5.1
-	C6.2 <-> C8.1 <-> D5.2 <-> D6.1
-	C7.2 <-> C9.1 <-> D6.2 <-> D7.1
-	Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
+	C11.1 <-> C11.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D10.2 <-> D2.2 <-> D3.1 <-> D4.2 <-> D5.1 <-> D6.2 <-> D7.1 <-> D8.2 <-> D9.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
 	Q2.3 <-> R1.1 <-> S1.3
 

diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt

@@ -1,17 +1,7 @@
 Switch setup: [S1.ON1, S1.ON2]
 
+	C1.1 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C6.1 <-> C6.2 <-> C8.1 <-> C8.2 <-> D1.2 <-> D10.1 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> D7.2 <-> D8.1 <-> D9.2
 	C1.2 <-> Q1.1 <-> R1.2
-	C10.1 <-> C8.2 <-> D7.2 <-> D8.1
-	C10.2 <-> D10.1 <-> D9.2
-	C11.1 <-> C9.2 <-> D8.2 <-> D9.1
-	C11.2 <-> D10.2
-	C2.2 <-> C4.1 <-> D1.2 <-> D2.1
-	C3.1 <-> D1.1
-	C3.2 <-> C5.1 <-> D2.2 <-> D3.1
-	C4.2 <-> C6.1 <-> D3.2 <-> D4.1
-	C5.2 <-> C7.1 <-> D4.2 <-> D5.1
-	C6.2 <-> C8.1 <-> D5.2 <-> D6.1
-	C7.2 <-> C9.1 <-> D6.2 <-> D7.1
-	Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
+	C11.1 <-> C11.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D10.2 <-> D2.2 <-> D3.1 <-> D4.2 <-> D5.1 <-> D6.2 <-> D7.1 <-> D8.2 <-> D9.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
 	Q2.3 <-> R1.1
 

diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1 <-> R2.1
-	C1.2 <-> R5.1
-	C2.1 <-> D1.2 <-> VR1.1 <-> VR1.2
+	C1.1 <-> C1.2 <-> R1.1 <-> R2.1 <-> R5.1
+	C2.1 <-> C3.1 <-> D1.2 <-> R3.1 <-> VR1.1 <-> VR1.2
 	C2.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R3.2
-	C3.1 <-> R3.1
-	C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3
+	C3.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3
 	C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2
 	D2.2 <-> D3.1
 	Q1.2 <-> Q1.3

diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1 <-> R2.1
-	C1.2 <-> R5.1
-	C2.1 <-> D1.2 <-> VR1.1 <-> VR1.2
+	C1.1 <-> C1.2 <-> R1.1 <-> R2.1 <-> R5.1
+	C2.1 <-> C3.1 <-> D1.2 <-> R3.1 <-> VR1.1 <-> VR1.2
 	C2.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R3.2
-	C3.1 <-> R3.1
-	C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3
+	C3.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3
 	C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2
 	D2.2 <-> D3.1
 	Q1.2 <-> Q1.3

diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt

@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
+	C3.1 <-> R2.1 <-> R4.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	VR1.1 <-> VR2.1
 

diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt

@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
+	C3.1 <-> R2.1 <-> R4.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	VR1.1 <-> VR2.1
 

diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt

@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
+	C3.1 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	C4.1 <-> R6.1
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	C5.2 <-> R6.2 <-> R7.2
-	C6.2 <-> R7.1
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
-	VR1.1 <-> VR2.1
+	C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1
 

diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt

@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
+	C3.1 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	C4.1 <-> R6.1
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	C5.2 <-> R6.2 <-> R7.2
-	C6.2 <-> R7.1
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
-	VR1.1 <-> VR2.1
+	C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1
 

diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt

@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R5.1
-	C1.2 <-> Q1.3 <-> R3.1
-	C2.2 <-> C4.1 <-> R1.1 <-> R3.2
-	C3.1 <-> R2.1 <-> R4.2
-	C4.2 <-> Q2.3 <-> R4.1
-	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.2
+	C1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.1 <-> R5.2
+	C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2
 	R1.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt

@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R5.1
-	C1.2 <-> Q1.3 <-> R3.1
-	C2.2 <-> C4.1 <-> R1.1 <-> R3.2
-	C3.1 <-> R2.1 <-> R4.2
-	C4.2 <-> Q2.3 <-> R4.1
-	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.2
+	C1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.1 <-> R5.2
+	C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2
 	R1.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 

diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 

diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 

diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt

@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 

diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> C5.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R5.2
-	C1.2 <-> C2.1 <-> C4.2 <-> C7.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C3.2 <-> R2.2
-	C4.1 <-> R3.1 <-> R4.2 <-> R5.1
-	C5.1 <-> C6.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1
-	C6.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C1.2 <-> C2.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 <-> R7.2
+	C3.2 <-> IC1.1 <-> IC1.5 <-> R2.2 <-> R6.2
 	C8.2 <-> R8.1
-	D2.2 <-> D3.1 <-> R7.1
-	D3.2 <-> D4.1
-	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> C5.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R5.2
-	C1.2 <-> C2.1 <-> C4.2 <-> C7.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C3.2 <-> R2.2
-	C4.1 <-> R3.1 <-> R4.2 <-> R5.1
-	C5.1 <-> C6.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1
-	C6.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C1.2 <-> C2.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 <-> R7.2
+	C3.2 <-> IC1.1 <-> IC1.5 <-> R2.2 <-> R6.2
 	C8.2 <-> R8.1
-	D2.2 <-> D3.1 <-> R7.1
-	D3.2 <-> D4.1
-	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt

@@ -4,10 +4,9 @@ Switch setup: [Default]
 	C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1
 	C2.2 <-> R2.2 <-> R3.1
 	C3.1 <-> R6.2
-	C3.2 <-> R4.2
+	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R4.2 <-> R8.1
 	C4.1 <-> R7.2
 	C4.2 <-> R5.2
 	C5.1 <-> D1.2 <-> D2.2 <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2
 	D2.1 <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2
-	Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1
 

diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt

@@ -4,10 +4,9 @@ Switch setup: [Default]
 	C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1
 	C2.2 <-> R2.2 <-> R3.1
 	C3.1 <-> R6.2
-	C3.2 <-> R4.2
+	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R4.2 <-> R8.1
 	C4.1 <-> R7.2
 	C4.2 <-> R5.2
 	C5.1 <-> D1.2 <-> D2.2 <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2
 	D2.1 <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2
-	Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1
 

diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt

@@ -2,13 +2,11 @@ Switch setup: [Default]
 
 	.001.1 <-> 10k.2
 	.001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2
-	.1uf.2 <-> 4.7K.1
 	.1uf.2 <-> 4.7K.1 <-> Q1.3
 	.22uf.1 <-> 1K.2
 	100.1 <-> 1K.1 <-> 1K.2
 	10k.1 <-> 1uf.2
 	10K.1 <-> 22uf.1 <-> 4.7K.2 <-> 47K.1
 	1K.1 <-> 1K.1 <-> 22uf.2 <-> Q1.1 <-> Q1.2
-	1K.1 <-> 22uf.2
 	1uf.1 <-> 4.7k.1
 

diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt

@@ -2,13 +2,11 @@ Switch setup: [Default]
 
 	.001.1 <-> 10k.2
 	.001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2
-	.1uf.2 <-> 4.7K.1
 	.1uf.2 <-> 4.7K.1 <-> Q1.3
 	.22uf.1 <-> 1K.2
 	100.1 <-> 1K.1 <-> 1K.2
 	10k.1 <-> 1uf.2
 	10K.1 <-> 22uf.1 <-> 4.7K.2 <-> 47K.1
 	1K.1 <-> 1K.1 <-> 22uf.2 <-> Q1.1 <-> Q1.2
-	1K.1 <-> 22uf.2
 	1uf.1 <-> 4.7k.1
 

diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> R3.2
-	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R6.1
-	C2.2 <-> R5.1
-	C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> R6.2
+	C1.1 <-> C1.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.2
+	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R5.2 <-> R6.1 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R5.1 <-> R6.2
 	C4.1 <-> R7.1
-	IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1
-	IC1.4 <-> R2.2 <-> R8.2
-	IC1.5 <-> R1.1
-	IC1.6 <-> R4.1 <-> R5.2
-	IC1.7 <-> R3.1 <-> R4.2
-	R7.2 <-> R8.1
 

diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> R3.2
-	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R6.1
-	C2.2 <-> R5.1
-	C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> R6.2
+	C1.1 <-> C1.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.2
+	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R5.2 <-> R6.1 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R5.1 <-> R6.2
 	C4.1 <-> R7.1
-	IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1
-	IC1.4 <-> R2.2 <-> R8.2
-	IC1.5 <-> R1.1
-	IC1.6 <-> R4.1 <-> R5.2
-	IC1.7 <-> R3.1 <-> R4.2
-	R7.2 <-> R8.1
 

diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt

@@ -12,7 +12,6 @@ Switch setup: [Default]
 	C5.2 <-> Voice (R6).1
 	C7.1 <-> R10.1
 	D1.2 <-> Q1.1 <-> Q1.2
-	D2.2 <-> Q2.1
 	D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3
 	R10.2 <-> Volume (R11).1
 	R5.2 <-> Voice (R6).2

diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt

@@ -12,7 +12,6 @@ Switch setup: [Default]
 	C5.2 <-> Voice (R6).1
 	C7.1 <-> R10.1
 	D1.2 <-> Q1.1 <-> Q1.2
-	D2.2 <-> Q2.1
 	D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3
 	R10.2 <-> Volume (R11).1
 	R5.2 <-> Voice (R6).2

diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> IC1.3 <-> R1.1 <-> R2.2
-	C2.1 <-> IC1.2 <-> IC1.7
+	C1.1 <-> C2.2 <-> IC1.1 <-> IC1.5
+	C1.2 <-> C2.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 	IC1.4 <-> IC1.8 <-> R1.2
-	IC1.6 <-> R2.1 <-> R3.1
 

diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> IC1.3 <-> R1.1 <-> R2.2
-	C2.1 <-> IC1.2 <-> IC1.7
+	C1.1 <-> C2.2 <-> IC1.1 <-> IC1.5
+	C1.2 <-> C2.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 	IC1.4 <-> IC1.8 <-> R1.2
-	IC1.6 <-> R2.1 <-> R3.1
 

diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt

@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2
-	C2.1 <-> R2.1
-	C3.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C3.2 <-> R4.1
-	D3.2 <-> R3.1
-	Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C3.2 <-> D3.2 <-> R2.1 <-> R3.1 <-> R4.1
+	C3.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> Q1.2 <-> Q1.3 <-> R1.1
 

diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt

@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2
-	C2.1 <-> R2.1
-	C3.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C3.2 <-> R4.1
-	D3.2 <-> R3.1
-	Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C3.2 <-> D3.2 <-> R2.1 <-> R3.1 <-> R4.1
+	C3.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> Q1.2 <-> Q1.3 <-> R1.1
 

diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt

@@ -1,13 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C1.2 <-> R3.1
+	C1.1 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> IC.1 <-> IC.3 <-> IC.4 <-> IC.6 <-> Q1.1
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> VR1.3
 	C2.1 <-> VR1.2
-	C2.2 <-> C3.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
-	C3.1 <-> IC.1
-	D1.1 <-> IC.4
-	D2.1 <-> IC.6
-	D3.2 <-> R2.1
-	IC.3 <-> Q1.1
-	Q1.2 <-> Q1.3 <-> VR1.3
+	C2.2 <-> C3.2 <-> IC.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
+	D3.2 <-> R1.1 <-> R2.1
 

diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt

@@ -1,13 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C1.2 <-> R3.1
+	C1.1 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> IC.1 <-> IC.3 <-> IC.4 <-> IC.6 <-> Q1.1
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> VR1.3
 	C2.1 <-> VR1.2
-	C2.2 <-> C3.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
-	C3.1 <-> IC.1
-	D1.1 <-> IC.4
-	D2.1 <-> IC.6
-	D3.2 <-> R2.1
-	IC.3 <-> Q1.1
-	Q1.2 <-> Q1.3 <-> VR1.3
+	C2.2 <-> C3.2 <-> IC.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
+	D3.2 <-> R1.1 <-> R2.1
 

diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt

@@ -1,14 +1,12 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1
+	C1.1 <-> C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R10.1 <-> R2.1
 	C2.1 <-> R8.2
 	C2.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.2 <-> R7.2
-	C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
-	C3.2 <-> Q2.1 <-> R6.2
-	C4.1 <-> C5.2 <-> R11.1
+	C3.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2
 	C4.2 <-> R5.2
-	Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1
+	C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
 	Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1
 	R3.1 <-> R4.2
-	R7.1 <-> R8.1
 

diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt

@@ -1,14 +1,12 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1
+	C1.1 <-> C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R10.1 <-> R2.1
 	C2.1 <-> R8.2
 	C2.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.2 <-> R7.2
-	C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
-	C3.2 <-> Q2.1 <-> R6.2
-	C4.1 <-> C5.2 <-> R11.1
+	C3.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2
 	C4.2 <-> R5.2
-	Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1
+	C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
 	Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1
 	R3.1 <-> R4.2
-	R7.1 <-> R8.1
 

diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.2 <-> R3.1
-	C1.2 <-> IC1.4 <-> R2.2 <-> R3.2
-	IC1.2 <-> R2.1
-	IC1.6 <-> R1.1
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R1.2 <-> R3.1
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2
+	IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> R1.1 <-> R2.1
 

diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt

@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.2 <-> R3.1
-	C1.2 <-> IC1.4 <-> R2.2 <-> R3.2
-	IC1.2 <-> R2.1
-	IC1.6 <-> R1.1
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R1.2 <-> R3.1
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2
+	IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> R1.1 <-> R2.1
 

diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt

@@ -1,22 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> D1.2 <-> R2.1
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R11.1 <-> R13.1 <-> R14.1 <-> R16.1 <-> R2.1 <-> R3.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.2
-	C3.1 <-> Q1.1 <-> R5.1
-	C4.2 <-> C5.2 <-> R6.1
-	C5.1 <-> D2.2 <-> R6.2 <-> R7.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R8.1
-	C7.1 <-> Q2.1 <-> R9.1
-	C7.2 <-> R11.1
-	C8.1 <-> Q3.2 <-> Q3.3 <-> R14.1
-	C9.1 <-> Q3.1 <-> R13.1
-	C9.2 <-> R16.1
-	D1.1 <-> R4.1
-	D2.1 <-> R10.1
-	D3.1 <-> R15.1
-	D3.2 <-> R11.2 <-> R12.1
+	C3.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1
+	D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1
 	R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2
-	R16.2 <-> R17.1
 

diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt

@@ -1,22 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> D1.2 <-> R2.1
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R11.1 <-> R13.1 <-> R14.1 <-> R16.1 <-> R2.1 <-> R3.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.2
-	C3.1 <-> Q1.1 <-> R5.1
-	C4.2 <-> C5.2 <-> R6.1
-	C5.1 <-> D2.2 <-> R6.2 <-> R7.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R8.1
-	C7.1 <-> Q2.1 <-> R9.1
-	C7.2 <-> R11.1
-	C8.1 <-> Q3.2 <-> Q3.3 <-> R14.1
-	C9.1 <-> Q3.1 <-> R13.1
-	C9.2 <-> R16.1
-	D1.1 <-> R4.1
-	D2.1 <-> R10.1
-	D3.1 <-> R15.1
-	D3.2 <-> R11.2 <-> R12.1
+	C3.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1
+	D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1
 	R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2
-	R16.2 <-> R17.1
 

diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt

@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2
-	C1.2 <-> D1.2
 	C1.2 <-> D1.2 <-> D2.1
-	C2.1 <-> D1.1
 	C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2
 	C4.1 <-> R3.1 <-> R4.1
 	C4.2 <-> C5.2 <-> C6.2 <-> R1.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 

diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt

@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2
-	C1.2 <-> D1.2
 	C1.2 <-> D1.2 <-> D2.1
-	C2.1 <-> D1.1
 	C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2
 	C4.1 <-> R3.1 <-> R4.1
 	C4.2 <-> C5.2 <-> C6.2 <-> R1.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 

diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt

@@ -4,8 +4,6 @@ Switch setup: [Default]
 	C1.2 <-> C4.2 <-> C5.1 <-> R2.1 <-> R4.2
 	C2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> C6.2 <-> R1.2
-	C4.1 <-> D1.1
 	C4.1 <-> D1.1 <-> D2.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 

diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt

@@ -4,8 +4,6 @@ Switch setup: [Default]
 	C1.2 <-> C4.2 <-> C5.1 <-> R2.1 <-> R4.2
 	C2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> C6.2 <-> R1.2
-	C4.1 <-> D1.1
 	C4.1 <-> D1.1 <-> D2.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 

diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt

@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R2.1 <-> R4.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.3 <-> R4.1 <-> R5.2
+	C1.2 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.1
+	C2.1 <-> C4.2 <-> P1.1 <-> Q2.3 <-> R4.1 <-> R5.2
 	C2.2 <-> C3.2 <-> P1.3 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2
-	C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1
-	C4.2 <-> P1.1
-	R3.1 <-> R5.1
+	C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1
 

diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt

@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R2.1 <-> R4.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.3 <-> R4.1 <-> R5.2
+	C1.2 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.1
+	C2.1 <-> C4.2 <-> P1.1 <-> Q2.3 <-> R4.1 <-> R5.2
 	C2.2 <-> C3.2 <-> P1.3 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2
-	C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1
-	C4.2 <-> P1.1
-	R3.1 <-> R5.1
+	C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1
 

diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 

diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt

@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 

diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt

@@ -1,15 +1,9 @@
 Switch setup: [Default]
 
-	C1.2 <-> R4.1 <-> R5.1
-	C2.2 <-> R1.1
-	C3.1 <-> R7.1
-	C3.2 <-> C4.2 <-> D1.2 <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2
-	C4.1 <-> IC1.4 <-> R11.2
-	D1.1 <-> R9.2
-	IC1.1 <-> R1.2 <-> R2.1
-	IC1.2 <-> R2.2 <-> R3.1
-	IC1.5 <-> R10.2
-	IC1.6 <-> R8.1 <-> R9.1
-	IC1.7 <-> R7.2 <-> R8.2
-	R5.2 <-> R6.2
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R7.2 <-> R8.2
+	C1.2 <-> R4.1 <-> R5.1 <-> R6.1
+	C2.1 <-> C2.2 <-> C4.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R11.2
+	C3.1 <-> D1.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C3.2 <-> C4.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.1 <-> R9.1
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R10.2 <-> R2.1
 

diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt

@@ -1,15 +1,9 @@
 Switch setup: [Default]
 
-	C1.2 <-> R4.1 <-> R5.1
-	C2.2 <-> R1.1
-	C3.1 <-> R7.1
-	C3.2 <-> C4.2 <-> D1.2 <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2
-	C4.1 <-> IC1.4 <-> R11.2
-	D1.1 <-> R9.2
-	IC1.1 <-> R1.2 <-> R2.1
-	IC1.2 <-> R2.2 <-> R3.1
-	IC1.5 <-> R10.2
-	IC1.6 <-> R8.1 <-> R9.1
-	IC1.7 <-> R7.2 <-> R8.2
-	R5.2 <-> R6.2
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R7.2 <-> R8.2
+	C1.2 <-> R4.1 <-> R5.1 <-> R6.1
+	C2.1 <-> C2.2 <-> C4.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R11.2
+	C3.1 <-> D1.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C3.2 <-> C4.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.1 <-> R9.1
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R10.2 <-> R2.1
 

diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt

@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2

diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt

@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2

diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt

@@ -1,8 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R2.1
+	C1.2 <-> C3.1
 	C2.1 <-> Q1.1 <-> R1.2
-	C2.2 <-> R4.1
+	C2.2 <-> R1.1 <-> R4.1
 	C3.2 <-> R2.2 <-> R3.2 <-> R4.2
 	Q1.2 <-> Q1.3 <-> R3.1
 

diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt

@@ -1,8 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R2.1
+	C1.2 <-> C3.1
 	C2.1 <-> Q1.1 <-> R1.2
-	C2.2 <-> R4.1
+	C2.2 <-> R1.1 <-> R4.1
 	C3.2 <-> R2.2 <-> R3.2 <-> R4.2
 	Q1.2 <-> Q1.3 <-> R3.1
 

diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt

@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	D1.1 <-> Q1.3 <-> R2.1
-	D1.2 <-> R1.2
-	D2.1 <-> R1.1
+	D1.2 <-> D2.1 <-> R1.1 <-> R1.2
 	Q1.1 <-> Q1.2 <-> Q2.3
-	Q2.1 <-> Q2.2
+	Q2.1 <-> Q2.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt

@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	D1.1 <-> Q1.3 <-> R2.1
-	D1.2 <-> R1.2
-	D2.1 <-> R1.1
+	D1.2 <-> D2.1 <-> R1.1 <-> R1.2
 	Q1.1 <-> Q1.2 <-> Q2.3
-	Q2.1 <-> Q2.2
+	Q2.1 <-> Q2.2 <-> R2.2
 

diylc-regression-data/input/v1/netlist/morula_excl_switches.txt

@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C4.1 <-> IC1.5 <-> R3.2
-	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> C6.2 <-> D1.2 <-> IC1.3 <-> IC1.7 <-> IC1.8
-	C3.1 <-> C5.2 <-> IC1.4 <-> R2.2
+	C1.1 <-> C2.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> D1.2 <-> IC1.11 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R5.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C4.1 <-> IC1.13 <-> IC1.5 <-> R3.2 <-> R5.1
+	C2.1 <-> R2.1 <-> R3.1 <-> R7.1
+	C3.1 <-> C5.2 <-> IC1.12 <-> IC1.4 <-> R2.2 <-> R4.1
 	C3.2 <-> C4.2 <-> D1.1 <-> R4.2
-	C6.1 <-> IC1.16 <-> R5.2 <-> R6.2
-	C7.1 <-> IC1.11 <-> R7.2
-	C7.2 <-> IC1.10 <-> R6.1
-	IC1.13 <-> R5.1
-	IC1.14 <-> IC1.15
+	C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1
+	IC1.1 <-> IC1.9
 

diylc-regression-data/input/v1/netlist/morula_incl_switches.txt

@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C4.1 <-> IC1.5 <-> R3.2
-	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> C6.2 <-> D1.2 <-> IC1.3 <-> IC1.7 <-> IC1.8
-	C3.1 <-> C5.2 <-> IC1.4 <-> R2.2
+	C1.1 <-> C2.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> D1.2 <-> IC1.11 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R5.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C4.1 <-> IC1.13 <-> IC1.5 <-> R3.2 <-> R5.1
+	C2.1 <-> R2.1 <-> R3.1 <-> R7.1
+	C3.1 <-> C5.2 <-> IC1.12 <-> IC1.4 <-> R2.2 <-> R4.1
 	C3.2 <-> C4.2 <-> D1.1 <-> R4.2
-	C6.1 <-> IC1.16 <-> R5.2 <-> R6.2
-	C7.1 <-> IC1.11 <-> R7.2
-	C7.2 <-> IC1.10 <-> R6.1
-	IC1.13 <-> R5.1
-	IC1.14 <-> IC1.15
+	C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1
+	IC1.1 <-> IC1.9
 

diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt

@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> C2.2 <-> D1.1 <-> D2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2
-	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1
+	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> R5.1 <-> R6.1
 	C3.1 <-> C4.1 <-> C4.2 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.1
 	C5.1 <-> R7.2
-	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt

@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> C2.2 <-> D1.1 <-> D2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2
-	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1
+	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> R5.1 <-> R6.1
 	C3.1 <-> C4.1 <-> C4.2 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.1
 	C5.1 <-> R7.2
-	IC1.1 <-> IC1.5
 

diylc-regression-data/input/v1/netlist/octup_excl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1
-	C2.2 <-> R5.1
-	C3.1 <-> Q3.3 <-> Q4.3 <-> R4.1
+	C1.1 <-> C2.1 <-> C3.1 <-> C5.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> R2.2 <-> R3.1 <-> R4.1 <-> R8.2 <-> R9.1
+	C1.2 <-> C2.2 <-> C4.1 <-> C4.2 <-> R1.1 <-> R5.1 <-> R6.1 <-> R7.1
 	C3.2 <-> C6.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2
-	C4.1 <-> R7.1
-	C4.2 <-> R6.1
-	C5.1 <-> Q3.1 <-> Q3.2 <-> Q4.1 <-> Q4.2 <-> R8.2
-	C6.1 <-> D1.2 <-> R7.2 <-> R8.1 <-> R9.2
-	Q1.1 <-> Q1.2 <-> Q2.3
+	C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2
 

diylc-regression-data/input/v1/netlist/octup_incl_switches.txt

@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1
-	C2.2 <-> R5.1
-	C3.1 <-> Q3.3 <-> Q4.3 <-> R4.1
+	C1.1 <-> C2.1 <-> C3.1 <-> C5.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> R2.2 <-> R3.1 <-> R4.1 <-> R8.2 <-> R9.1
+	C1.2 <-> C2.2 <-> C4.1 <-> C4.2 <-> R1.1 <-> R5.1 <-> R6.1 <-> R7.1
 	C3.2 <-> C6.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2
-	C4.1 <-> R7.1
-	C4.2 <-> R6.1
-	C5.1 <-> Q3.1 <-> Q3.2 <-> Q4.1 <-> Q4.2 <-> R8.2
-	C6.1 <-> D1.2 <-> R7.2 <-> R8.1 <-> R9.2
-	Q1.1 <-> Q1.2 <-> Q2.3
+	C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2