diff --git a/diylc-regression-data/input/cloud/netlist/100_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/100_excl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/cloud/netlist/100_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/100_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/100_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/100_incl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/cloud/netlist/100_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/100_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/101_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/101_excl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/cloud/netlist/101_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/101_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/101_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/101_incl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/cloud/netlist/101_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/101_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/102_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/102_excl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/cloud/netlist/102_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/102_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/102_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/102_incl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/cloud/netlist/102_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/102_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/103_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/103_excl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/cloud/netlist/103_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/103_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/103_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/103_incl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/cloud/netlist/103_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/103_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/104_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/104_excl_switches.txt index 964392363..228675c26 100644 --- a/diylc-regression-data/input/cloud/netlist/104_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/104_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.2 C2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/104_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/104_incl_switches.txt index 964392363..228675c26 100644 --- a/diylc-regression-data/input/cloud/netlist/104_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/104_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.2 C2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/105_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/105_excl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/cloud/netlist/105_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/105_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/105_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/105_incl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/cloud/netlist/105_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/105_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/106_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/106_excl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/cloud/netlist/106_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/106_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/106_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/106_incl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/cloud/netlist/106_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/106_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/107_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/107_excl_switches.txt index b1cad584e..00789a0e8 100644 --- a/diylc-regression-data/input/cloud/netlist/107_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/107_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 - C1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R5.1 + C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 C10.1 <-> R18.2 C10.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R21.2 <-> R22.2 <-> R3.1 <-> R4.2 <-> R7.2 C11.2 <-> Q4.3 <-> R19.2 <-> R21.1 @@ -9,14 +9,14 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 - Q1.1 <-> R4.1 + Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 Q3.1 <-> Q3.2 <-> R16.1 Q4.1 <-> Q4.2 <-> R22.1 diff --git a/diylc-regression-data/input/cloud/netlist/107_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/107_incl_switches.txt index b1cad584e..00789a0e8 100644 --- a/diylc-regression-data/input/cloud/netlist/107_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/107_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 - C1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R5.1 + C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 C10.1 <-> R18.2 C10.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R21.2 <-> R22.2 <-> R3.1 <-> R4.2 <-> R7.2 C11.2 <-> Q4.3 <-> R19.2 <-> R21.1 @@ -9,14 +9,14 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 - Q1.1 <-> R4.1 + Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 Q3.1 <-> Q3.2 <-> R16.1 Q4.1 <-> Q4.2 <-> R22.1 diff --git a/diylc-regression-data/input/cloud/netlist/108_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/108_excl_switches.txt index b1cad584e..00789a0e8 100644 --- a/diylc-regression-data/input/cloud/netlist/108_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/108_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 - C1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R5.1 + C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 C10.1 <-> R18.2 C10.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R21.2 <-> R22.2 <-> R3.1 <-> R4.2 <-> R7.2 C11.2 <-> Q4.3 <-> R19.2 <-> R21.1 @@ -9,14 +9,14 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 - Q1.1 <-> R4.1 + Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 Q3.1 <-> Q3.2 <-> R16.1 Q4.1 <-> Q4.2 <-> R22.1 diff --git a/diylc-regression-data/input/cloud/netlist/108_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/108_incl_switches.txt index b1cad584e..00789a0e8 100644 --- a/diylc-regression-data/input/cloud/netlist/108_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/108_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 - C1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R5.1 + C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 C10.1 <-> R18.2 C10.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R21.2 <-> R22.2 <-> R3.1 <-> R4.2 <-> R7.2 C11.2 <-> Q4.3 <-> R19.2 <-> R21.1 @@ -9,14 +9,14 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 - Q1.1 <-> R4.1 + Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 Q3.1 <-> Q3.2 <-> R16.1 Q4.1 <-> Q4.2 <-> R22.1 diff --git a/diylc-regression-data/input/cloud/netlist/109_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/109_excl_switches.txt index 5f6e27f84..02827d11a 100644 --- a/diylc-regression-data/input/cloud/netlist/109_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/109_excl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 - Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K + Q1.1 <-> Q1.2 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/cloud/netlist/109_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/109_incl_switches.txt index 5f6e27f84..02827d11a 100644 --- a/diylc-regression-data/input/cloud/netlist/109_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/109_incl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 - Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K + Q1.1 <-> Q1.2 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/cloud/netlist/110_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/110_excl_switches.txt index 5f6e27f84..02827d11a 100644 --- a/diylc-regression-data/input/cloud/netlist/110_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/110_excl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 - Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K + Q1.1 <-> Q1.2 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/cloud/netlist/110_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/110_incl_switches.txt index 5f6e27f84..02827d11a 100644 --- a/diylc-regression-data/input/cloud/netlist/110_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/110_incl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 - Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K + Q1.1 <-> Q1.2 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/cloud/netlist/111_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/111_excl_switches.txt index ef9cca21c..4a0e37e7f 100644 --- a/diylc-regression-data/input/cloud/netlist/111_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/111_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> D1.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> R1.1 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C9.2 <-> D1.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 - C10.1 <-> C8.1 <-> D4.1 <-> D7.2 <-> IC1.6 - C11.1 <-> IC2.1 <-> IC2.2 - C11.2 <-> R7.2 <-> R8.1 - C12.1 <-> R8.2 <-> R9.2 - C12.2 <-> R10.1 - C4.1 <-> IC2.8 <-> R1.2 <-> R2.2 + C1.+ <-> C2.1 <-> C3.1 <-> D1.K <-> D2.K <-> IC1.5 <-> IC2.5 <-> R1.1 + C1.- <-> C2.2 <-> C3.2 <-> C4.- <-> C9.- <-> D1.A <-> D3.A <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 + C10.+ <-> C8.1 <-> D4.A <-> D7.K <-> IC1.6 + C11.+ <-> IC2.1 <-> IC2.2 + C11.- <-> R7.2 <-> R8.1 + C12.+ <-> R8.2 <-> R9.2 + C12.- <-> R10.1 + C4.+ <-> IC2.8 <-> R1.2 <-> R2.2 C5.1 <-> R3.1 <-> R4.1 - C6.1 <-> D2.1 <-> D3.2 <-> IC1.3 <-> R4.2 + C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2 C6.2 <-> IC2.6 <-> IC2.7 <-> R3.2 <-> R5.2 <-> R7.1 <-> R9.1 C7.1 <-> IC1.1 <-> IC1.2 C7.2 <-> IC1.8 - C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1 - C9.1 <-> R6.2 - D4.2 <-> D5.1 - D6.2 <-> D7.1 + C8.2 <-> D5.K <-> D6.A <-> IC1.7 <-> R6.1 + C9.+ <-> R6.2 + D4.K <-> D5.A + D6.K <-> D7.A diff --git a/diylc-regression-data/input/cloud/netlist/111_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/111_incl_switches.txt index ef9cca21c..4a0e37e7f 100644 --- a/diylc-regression-data/input/cloud/netlist/111_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/111_incl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> D1.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> R1.1 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C9.2 <-> D1.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 - C10.1 <-> C8.1 <-> D4.1 <-> D7.2 <-> IC1.6 - C11.1 <-> IC2.1 <-> IC2.2 - C11.2 <-> R7.2 <-> R8.1 - C12.1 <-> R8.2 <-> R9.2 - C12.2 <-> R10.1 - C4.1 <-> IC2.8 <-> R1.2 <-> R2.2 + C1.+ <-> C2.1 <-> C3.1 <-> D1.K <-> D2.K <-> IC1.5 <-> IC2.5 <-> R1.1 + C1.- <-> C2.2 <-> C3.2 <-> C4.- <-> C9.- <-> D1.A <-> D3.A <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 + C10.+ <-> C8.1 <-> D4.A <-> D7.K <-> IC1.6 + C11.+ <-> IC2.1 <-> IC2.2 + C11.- <-> R7.2 <-> R8.1 + C12.+ <-> R8.2 <-> R9.2 + C12.- <-> R10.1 + C4.+ <-> IC2.8 <-> R1.2 <-> R2.2 C5.1 <-> R3.1 <-> R4.1 - C6.1 <-> D2.1 <-> D3.2 <-> IC1.3 <-> R4.2 + C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2 C6.2 <-> IC2.6 <-> IC2.7 <-> R3.2 <-> R5.2 <-> R7.1 <-> R9.1 C7.1 <-> IC1.1 <-> IC1.2 C7.2 <-> IC1.8 - C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1 - C9.1 <-> R6.2 - D4.2 <-> D5.1 - D6.2 <-> D7.1 + C8.2 <-> D5.K <-> D6.A <-> IC1.7 <-> R6.1 + C9.+ <-> R6.2 + D4.K <-> D5.A + D6.K <-> D7.A diff --git a/diylc-regression-data/input/cloud/netlist/112_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/112_excl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/112_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/112_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/cloud/netlist/112_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/112_incl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/112_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/112_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/cloud/netlist/113_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/113_excl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/113_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/113_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/cloud/netlist/113_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/113_incl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/113_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/113_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/cloud/netlist/114_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/114_excl_switches.txt index 2541af873..2b0294f3d 100644 --- a/diylc-regression-data/input/cloud/netlist/114_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/114_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> Q1.1 - C2.1 <-> IC1.1 - C2.2 <-> R2.2 + C2.+ <-> IC1.1 + C2.- <-> R2.2 C3.1 <-> IC1.8 - C4.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 - C4.2 <-> C5.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 - C5.1 <-> D2.2 <-> IC1.7 + C4.+ <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 + C4.- <-> C5.- <-> D2.A <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 + C5.+ <-> D2.K <-> IC1.7 IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/114_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/114_incl_switches.txt index 2541af873..2b0294f3d 100644 --- a/diylc-regression-data/input/cloud/netlist/114_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/114_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> Q1.1 - C2.1 <-> IC1.1 - C2.2 <-> R2.2 + C2.+ <-> IC1.1 + C2.- <-> R2.2 C3.1 <-> IC1.8 - C4.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 - C4.2 <-> C5.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 - C5.1 <-> D2.2 <-> IC1.7 + C4.+ <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 + C4.- <-> C5.- <-> D2.A <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 + C5.+ <-> D2.K <-> IC1.7 IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/115_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/115_excl_switches.txt index 08e994543..c40ff9036 100644 --- a/diylc-regression-data/input/cloud/netlist/115_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/115_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 - C1.2 <-> C2.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> C3.2 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 - C4.1 <-> D1.1 <-> R5.1 + C1.2 <-> C2.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.1 <-> C3.- <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 + C4.+ <-> D1.A <-> R5.1 C5.1 <-> Q1.1 <-> R4.1 R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/115_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/115_incl_switches.txt index 08e994543..c40ff9036 100644 --- a/diylc-regression-data/input/cloud/netlist/115_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/115_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 - C1.2 <-> C2.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> C3.2 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 - C4.1 <-> D1.1 <-> R5.1 + C1.2 <-> C2.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.1 <-> C3.- <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 + C4.+ <-> D1.A <-> R5.1 C5.1 <-> Q1.1 <-> R4.1 R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/116_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/116_excl_switches.txt index bd4e9c1fa..7b90e137f 100644 --- a/diylc-regression-data/input/cloud/netlist/116_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/116_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.2 <-> R1.1 - C2.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R4.2 - C3.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C4.1 <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 - C4.2 <-> R3.2 <-> R4.1 + C2.1 <-> C3.- <-> R1.2 <-> R2.2 <-> R4.2 + C3.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 + C4.- <-> R3.2 <-> R4.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/116_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/116_incl_switches.txt index bd4e9c1fa..7b90e137f 100644 --- a/diylc-regression-data/input/cloud/netlist/116_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/116_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.2 <-> R1.1 - C2.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R4.2 - C3.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C4.1 <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 - C4.2 <-> R3.2 <-> R4.1 + C2.1 <-> C3.- <-> R1.2 <-> R2.2 <-> R4.2 + C3.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 + C4.- <-> R3.2 <-> R4.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/117_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/117_excl_switches.txt index 60e165771..11cb0a816 100644 --- a/diylc-regression-data/input/cloud/netlist/117_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/117_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C6.1 C1.2 <-> R1.1 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 - C5.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 + C5.2 <-> C6.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 R2.1 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/117_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/117_incl_switches.txt index 60e165771..11cb0a816 100644 --- a/diylc-regression-data/input/cloud/netlist/117_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/117_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C6.1 C1.2 <-> R1.1 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 - C5.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 + C5.2 <-> C6.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 R2.1 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/118_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/118_excl_switches.txt index 00a7125f1..d6b8159e8 100644 --- a/diylc-regression-data/input/cloud/netlist/118_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/118_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 + C3.+ <-> R2.2 <-> R3.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/118_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/118_incl_switches.txt index 00a7125f1..d6b8159e8 100644 --- a/diylc-regression-data/input/cloud/netlist/118_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/118_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 + C3.+ <-> R2.2 <-> R3.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/119_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/119_excl_switches.txt index db132baec..1eb4e3ed3 100644 --- a/diylc-regression-data/input/cloud/netlist/119_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/119_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 <-> R8.1 + C3.+ <-> R2.2 <-> R3.1 <-> R8.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 <-> R8.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/119_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/119_incl_switches.txt index db132baec..1eb4e3ed3 100644 --- a/diylc-regression-data/input/cloud/netlist/119_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/119_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 <-> R8.1 + C3.+ <-> R2.2 <-> R3.1 <-> R8.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 <-> R8.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/120_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/120_excl_switches.txt index fc750ae68..5c9a1fb24 100644 --- a/diylc-regression-data/input/cloud/netlist/120_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/120_excl_switches.txt @@ -1,16 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> D1.1 <-> Gain.3 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.3 + C1.2 <-> C3.- <-> C4.- <-> C7.2 <-> D1.A <-> Gain.1 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.1 C2.1 <-> R3.1 C2.2 <-> R2.1 - C3.1 <-> D1.2 <-> R4.2 <-> R5.2 - C4.1 <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1 + C3.+ <-> D1.K <-> R4.2 <-> R5.2 + C4.+ <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1 C5.1 <-> IC1.1 <-> R1.1 - C5.2 <-> Gain.1 + C5.2 <-> Gain.3 C6.1 <-> Gain.2 C6.2 <-> R7.1 C7.1 <-> C8.2 <-> IC1.7 <-> R7.2 <-> R8.2 C8.1 <-> C9.1 <-> IC1.6 <-> R8.1 + C9.2 <-> Volume.2 IC1.5 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/120_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/120_incl_switches.txt index fc750ae68..5c9a1fb24 100644 --- a/diylc-regression-data/input/cloud/netlist/120_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/120_incl_switches.txt @@ -1,16 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> D1.1 <-> Gain.3 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.3 + C1.2 <-> C3.- <-> C4.- <-> C7.2 <-> D1.A <-> Gain.1 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.1 C2.1 <-> R3.1 C2.2 <-> R2.1 - C3.1 <-> D1.2 <-> R4.2 <-> R5.2 - C4.1 <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1 + C3.+ <-> D1.K <-> R4.2 <-> R5.2 + C4.+ <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1 C5.1 <-> IC1.1 <-> R1.1 - C5.2 <-> Gain.1 + C5.2 <-> Gain.3 C6.1 <-> Gain.2 C6.2 <-> R7.1 C7.1 <-> C8.2 <-> IC1.7 <-> R7.2 <-> R8.2 C8.1 <-> C9.1 <-> IC1.6 <-> R8.1 + C9.2 <-> Volume.2 IC1.5 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt index 8b0f00bc6..55f53412d 100644 --- a/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.2 <-> R6.1 C1.2 <-> R4.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R4.2 <-> R5.2 <-> R6.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R4.2 <-> R5.2 <-> R6.2 C3.1 <-> R3.2 - C3.2 <-> R1.1 <-> R2.1 + R1.1 <-> R2.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt index 8b0f00bc6..55f53412d 100644 --- a/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.2 <-> R6.1 C1.2 <-> R4.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R4.2 <-> R5.2 <-> R6.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R4.2 <-> R5.2 <-> R6.2 C3.1 <-> R3.2 - C3.2 <-> R1.1 <-> R2.1 + R1.1 <-> R2.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/122_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/122_excl_switches.txt index 1662343d5..8212392d0 100644 --- a/diylc-regression-data/input/cloud/netlist/122_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/122_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 + C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1 + C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 C2.1 <-> R5.1 C2.2 <-> R4.1 C3.1 <-> C4.1 <-> IC1.1 <-> R6.1 <-> R7.1 C3.2 <-> IC1.2 <-> R7.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2 - C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1 + C5.2 <-> D1.A <-> D2.K <-> R6.2 <-> R9.2 + C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1 C6.2 <-> IC1.7 <-> R10.2 - C7.2 <-> R11.2 - C8.1 <-> R12.2 + C7.- <-> R11.2 + C8.+ <-> R12.2 IC1.3 <-> R3.2 <-> R4.2 IC1.5 <-> R1.1 IC1.8 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/122_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/122_incl_switches.txt index 1662343d5..8212392d0 100644 --- a/diylc-regression-data/input/cloud/netlist/122_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/122_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 + C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1 + C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 C2.1 <-> R5.1 C2.2 <-> R4.1 C3.1 <-> C4.1 <-> IC1.1 <-> R6.1 <-> R7.1 C3.2 <-> IC1.2 <-> R7.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2 - C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1 + C5.2 <-> D1.A <-> D2.K <-> R6.2 <-> R9.2 + C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1 C6.2 <-> IC1.7 <-> R10.2 - C7.2 <-> R11.2 - C8.1 <-> R12.2 + C7.- <-> R11.2 + C8.+ <-> R12.2 IC1.3 <-> R3.2 <-> R4.2 IC1.5 <-> R1.1 IC1.8 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt index 738352e5a..89d73c25b 100644 --- a/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2 - C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1 - C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2 - C3.2 <-> C4.1 <-> D1.1 <-> D2.2 - C5.1 <-> R5.2 <-> R6.2 - Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1 - R1.1 <-> R2.1 <-> R5.1 + C1.1 <-> R2.2 + C1.2 <-> Q1.3 <-> R7.1 + C2.+ <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2 + C2.- <-> C5.- <-> D1.K <-> D2.A <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2 + C3.+ <-> Q2.1 <-> R4.1 <-> R6.1 + C3.- <-> C4.1 <-> D1.A <-> D2.K + C4.2 <-> R11.2 + C5.+ <-> R5.2 <-> R6.2 + Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 + R1.1 <-> R2.1 + R7.2 <-> R8.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt index 738352e5a..89d73c25b 100644 --- a/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2 - C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1 - C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2 - C3.2 <-> C4.1 <-> D1.1 <-> D2.2 - C5.1 <-> R5.2 <-> R6.2 - Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1 - R1.1 <-> R2.1 <-> R5.1 + C1.1 <-> R2.2 + C1.2 <-> Q1.3 <-> R7.1 + C2.+ <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2 + C2.- <-> C5.- <-> D1.K <-> D2.A <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2 + C3.+ <-> Q2.1 <-> R4.1 <-> R6.1 + C3.- <-> C4.1 <-> D1.A <-> D2.K + C4.2 <-> R11.2 + C5.+ <-> R5.2 <-> R6.2 + Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 + R1.1 <-> R2.1 + R7.2 <-> R8.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt index 7a53fe06c..3cd947c7f 100644 --- a/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 - C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2 + C2.- <-> C3.2 <-> Q2.3 <-> R3.2 + C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 C4.1 <-> R1.2 - C5.1 <-> Q2.1 <-> Q2.2 + C5.+ <-> Q2.1 <-> Q2.2 Q1.1 <-> Q1.2 <-> R3.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt index 7a53fe06c..3cd947c7f 100644 --- a/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 - C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2 + C2.- <-> C3.2 <-> Q2.3 <-> R3.2 + C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 C4.1 <-> R1.2 - C5.1 <-> Q2.1 <-> Q2.2 + C5.+ <-> Q2.1 <-> Q2.2 Q1.1 <-> Q1.2 <-> R3.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt index 173823256..4d31f8979 100644 --- a/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> R1.1 - C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1 - C2.1 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 R1.2 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt index 173823256..4d31f8979 100644 --- a/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> R1.1 - C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1 - C2.1 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 R1.2 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/126_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/126_excl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/cloud/netlist/126_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/126_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/126_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/126_incl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/cloud/netlist/126_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/126_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/127_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/127_excl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/cloud/netlist/127_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/127_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/127_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/127_incl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/cloud/netlist/127_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/127_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/128_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/128_excl_switches.txt index 9775528dd..a1256763e 100644 --- a/diylc-regression-data/input/cloud/netlist/128_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/128_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 @@ -6,6 +6,6 @@ Switch setup: [Default] C2.2 <-> Q1.3 <-> R5.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> C4.1 <-> R1.2 - C5.2 <-> Q1.1 <-> Q1.2 <-> R4.2 + C5.- <-> Q1.1 <-> Q1.2 <-> R4.2 Q2.1 <-> Q2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/128_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/128_incl_switches.txt index 9775528dd..a1256763e 100644 --- a/diylc-regression-data/input/cloud/netlist/128_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/128_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 @@ -6,6 +6,6 @@ Switch setup: [Default] C2.2 <-> Q1.3 <-> R5.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> C4.1 <-> R1.2 - C5.2 <-> Q1.1 <-> Q1.2 <-> R4.2 + C5.- <-> Q1.1 <-> Q1.2 <-> R4.2 Q2.1 <-> Q2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/129_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/129_excl_switches.txt index 7dafb8caf..7dc277007 100644 --- a/diylc-regression-data/input/cloud/netlist/129_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/129_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/129_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/129_incl_switches.txt index 7dafb8caf..7dc277007 100644 --- a/diylc-regression-data/input/cloud/netlist/129_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/129_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt index a3cda271f..b58b26f6d 100644 --- a/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt @@ -1,9 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.2 <-> R1.1 - C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R5.1 - C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1 - C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2 - C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1 - Q1.1 <-> Q2.1 <-> R1.2 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> R2.1 <-> R3.1 + C3.1 <-> R3.2 <-> R4.1 + C3.2 <-> R4.2 <-> R6.2 + C4.2 <-> Q2.3 <-> R5.1 + C5.2 <-> C6.1 <-> R5.2 <-> R6.1 + C7.1 <-> R7.1 + C7.2 <-> R8.1 + C8.1 <-> R7.2 <-> R8.2 + Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt index a3cda271f..b58b26f6d 100644 --- a/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt @@ -1,9 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.2 <-> R1.1 - C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R5.1 - C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1 - C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2 - C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1 - Q1.1 <-> Q2.1 <-> R1.2 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> R2.1 <-> R3.1 + C3.1 <-> R3.2 <-> R4.1 + C3.2 <-> R4.2 <-> R6.2 + C4.2 <-> Q2.3 <-> R5.1 + C5.2 <-> C6.1 <-> R5.2 <-> R6.1 + C7.1 <-> R7.1 + C7.2 <-> R8.1 + C8.1 <-> R7.2 <-> R8.2 + Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/131_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/131_excl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/cloud/netlist/131_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/131_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/131_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/131_incl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/cloud/netlist/131_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/131_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/132_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/132_excl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/cloud/netlist/132_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/132_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/132_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/132_incl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/cloud/netlist/132_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/132_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/133_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/133_excl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/cloud/netlist/133_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/133_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/133_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/133_incl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/cloud/netlist/133_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/133_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/134_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/134_excl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/cloud/netlist/134_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/134_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/134_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/134_incl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/cloud/netlist/134_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/134_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt index 1b9756ed4..d791c2732 100644 --- a/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 - C1.2 <-> C4.1 <-> Q1.3 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 - C3.1 <-> R2.2 - C4.2 <-> R1.1 <-> R5.1 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> C3.- <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 + C3.+ <-> R2.2 + C4.2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt index 1b9756ed4..d791c2732 100644 --- a/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 - C1.2 <-> C4.1 <-> Q1.3 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 - C3.1 <-> R2.2 - C4.2 <-> R1.1 <-> R5.1 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> C3.- <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 + C3.+ <-> R2.2 + C4.2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/136_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/136_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/136_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/136_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/136_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/136_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/136_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/136_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/137_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/137_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/137_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/137_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/137_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/137_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/137_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/137_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/138_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/138_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/138_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/138_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/138_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/138_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/cloud/netlist/138_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/138_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/139_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/139_excl_switches.txt index 5402fd357..ad0eab1ed 100644 --- a/diylc-regression-data/input/cloud/netlist/139_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/139_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> R1.1 <-> R2.1 - C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2 + C2.2 <-> Q1.3 <-> R2.2 C3.2 <-> R1.2 <-> R4.2 - Q1.1 <-> R3.1 + Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/139_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/139_incl_switches.txt index 5402fd357..ad0eab1ed 100644 --- a/diylc-regression-data/input/cloud/netlist/139_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/139_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> R1.1 <-> R2.1 - C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2 + C2.2 <-> Q1.3 <-> R2.2 C3.2 <-> R1.2 <-> R4.2 - Q1.1 <-> R3.1 + Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/140_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/140_excl_switches.txt index 252e1e5d8..353ba8a96 100644 --- a/diylc-regression-data/input/cloud/netlist/140_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/140_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 + C1.2 <-> Q1.3 <-> R2.2 C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> Q1.1 <-> R1.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/140_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/140_incl_switches.txt index 252e1e5d8..353ba8a96 100644 --- a/diylc-regression-data/input/cloud/netlist/140_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/140_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 + C1.2 <-> Q1.3 <-> R2.2 C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> Q1.1 <-> R1.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/141_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/141_excl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/cloud/netlist/141_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/141_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/141_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/141_incl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/cloud/netlist/141_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/141_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/142_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/142_excl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/cloud/netlist/142_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/142_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/142_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/142_incl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/cloud/netlist/142_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/142_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/143_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/143_excl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/cloud/netlist/143_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/143_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/143_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/143_incl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/cloud/netlist/143_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/143_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/144_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/144_excl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/cloud/netlist/144_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/144_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/144_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/144_incl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/cloud/netlist/144_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/144_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/145_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/145_excl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/cloud/netlist/145_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/145_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/145_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/145_incl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/cloud/netlist/145_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/145_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/146_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/146_excl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/cloud/netlist/146_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/146_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/146_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/146_incl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/cloud/netlist/146_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/146_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt index c035b989a..f0a492311 100644 --- a/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R3.1 <-> R4.1 - C1.2 <-> C2.2 <-> R5.1 + C1.2 <-> R5.1 C2.1 <-> R2.1 Q1.1 <-> Q1.2 <-> R1.1 R1.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt index c035b989a..f0a492311 100644 --- a/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R3.1 <-> R4.1 - C1.2 <-> C2.2 <-> R5.1 + C1.2 <-> R5.1 C2.1 <-> R2.1 Q1.1 <-> Q1.2 <-> R1.1 R1.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/148_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/148_excl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/cloud/netlist/148_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/148_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/148_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/148_incl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/cloud/netlist/148_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/148_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/149_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/149_excl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/cloud/netlist/149_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/149_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/149_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/149_incl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/cloud/netlist/149_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/149_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt index 2f6ac7fa9..b91089e4e 100644 --- a/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> R2.2 <-> R4.1 + C2.2 <-> C5.- <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1 - C5.1 <-> R5.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1 + C4.1 <-> D1.A <-> D2.K + C5.+ <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt index 2f6ac7fa9..b91089e4e 100644 --- a/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> R2.2 <-> R4.1 + C2.2 <-> C5.- <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1 - C5.1 <-> R5.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1 + C4.1 <-> D1.A <-> D2.K + C5.+ <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/151_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/151_excl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/cloud/netlist/151_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/151_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/151_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/151_incl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/cloud/netlist/151_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/151_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/152_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/152_excl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/cloud/netlist/152_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/152_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/152_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/152_incl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/cloud/netlist/152_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/152_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/153_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/153_excl_switches.txt index 14fd057e4..dc3ff18b9 100644 --- a/diylc-regression-data/input/cloud/netlist/153_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/153_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> R4.1 C2.1 <-> R1.2 <-> R2.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> R3.2 <-> R4.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> R3.2 <-> R4.2 Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/153_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/153_incl_switches.txt index 14fd057e4..dc3ff18b9 100644 --- a/diylc-regression-data/input/cloud/netlist/153_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/153_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> R4.1 C2.1 <-> R1.2 <-> R2.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> R3.2 <-> R4.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> R3.2 <-> R4.2 Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/154_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/154_excl_switches.txt index 3be4f4452..68ac7e98b 100644 --- a/diylc-regression-data/input/cloud/netlist/154_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/154_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,19 +7,19 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.2 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 Q2.3 <-> R10.1 <-> R23.1 <-> R8.2 - Q3.1 <-> R15.2 + Q3.1 <-> Q3.2 <-> R15.2 Q4.1 <-> Q4.2 <-> R21.1 R1.1 <-> R13.1 <-> R19.1 <-> R20.1 <-> R9.1 R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/154_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/154_incl_switches.txt index 3be4f4452..68ac7e98b 100644 --- a/diylc-regression-data/input/cloud/netlist/154_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/154_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,19 +7,19 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.2 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 Q2.3 <-> R10.1 <-> R23.1 <-> R8.2 - Q3.1 <-> R15.2 + Q3.1 <-> Q3.2 <-> R15.2 Q4.1 <-> Q4.2 <-> R21.1 R1.1 <-> R13.1 <-> R19.1 <-> R20.1 <-> R9.1 R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/155_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/155_excl_switches.txt index 3be4f4452..68ac7e98b 100644 --- a/diylc-regression-data/input/cloud/netlist/155_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/155_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,19 +7,19 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.2 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 Q2.3 <-> R10.1 <-> R23.1 <-> R8.2 - Q3.1 <-> R15.2 + Q3.1 <-> Q3.2 <-> R15.2 Q4.1 <-> Q4.2 <-> R21.1 R1.1 <-> R13.1 <-> R19.1 <-> R20.1 <-> R9.1 R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/155_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/155_incl_switches.txt index 3be4f4452..68ac7e98b 100644 --- a/diylc-regression-data/input/cloud/netlist/155_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/155_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,19 +7,19 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.2 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 Q2.3 <-> R10.1 <-> R23.1 <-> R8.2 - Q3.1 <-> R15.2 + Q3.1 <-> Q3.2 <-> R15.2 Q4.1 <-> Q4.2 <-> R21.1 R1.1 <-> R13.1 <-> R19.1 <-> R20.1 <-> R9.1 R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt index a679c8189..2cc0cbd52 100644 --- a/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt @@ -1,9 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> VR1.1 - C1.2 <-> VR1.2 <-> VR1.3 - C2.1 <-> Q1.1 <-> R4.1 - C2.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2 - C3.2 <-> Q2.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2 + C3.1 <-> R1.2 <-> VR1.1 + Q1.3 <-> R3.1 + Q2.3 <-> R2.1 R1.1 <-> R2.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt index a679c8189..2cc0cbd52 100644 --- a/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt @@ -1,9 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> VR1.1 - C1.2 <-> VR1.2 <-> VR1.3 - C2.1 <-> Q1.1 <-> R4.1 - C2.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2 - C3.2 <-> Q2.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2 + C3.1 <-> R1.2 <-> VR1.1 + Q1.3 <-> R3.1 + Q2.3 <-> R2.1 R1.1 <-> R2.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/157_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/157_excl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/cloud/netlist/157_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/157_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/157_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/157_incl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/cloud/netlist/157_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/157_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/158_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/158_excl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/cloud/netlist/158_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/158_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/158_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/158_incl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/cloud/netlist/158_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/158_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt index 1d71d28a9..69fd2eccf 100644 --- a/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C5.+ <-> IC1.7 <-> R1.2 C2.2 <-> R2.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 + C3.1 <-> R3.2 + C3.2 <-> R8.1 + C4.+ <-> R4.2 <-> R5.1 + C4.- <-> C6.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2 + C5.- <-> R9.1 + C6.1 <-> D1.A <-> D3.K <-> R9.2 + D2.K <-> D3.A + IC1.3 <-> R3.1 <-> R4.1 + R6.2 <-> R7.2 diff --git a/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt index 1d71d28a9..69fd2eccf 100644 --- a/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C5.+ <-> IC1.7 <-> R1.2 C2.2 <-> R2.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 + C3.1 <-> R3.2 + C3.2 <-> R8.1 + C4.+ <-> R4.2 <-> R5.1 + C4.- <-> C6.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2 + C5.- <-> R9.1 + C6.1 <-> D1.A <-> D3.K <-> R9.2 + D2.K <-> D3.A + IC1.3 <-> R3.1 <-> R4.1 + R6.2 <-> R7.2 diff --git a/diylc-regression-data/input/cloud/netlist/160_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/160_excl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/cloud/netlist/160_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/160_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/160_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/160_incl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/cloud/netlist/160_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/160_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/161_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/161_excl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/cloud/netlist/161_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/161_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/161_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/161_incl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/cloud/netlist/161_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/161_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/162_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/162_excl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/cloud/netlist/162_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/162_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/162_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/162_incl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/cloud/netlist/162_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/162_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/163_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/163_excl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/cloud/netlist/163_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/163_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/163_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/163_incl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/cloud/netlist/163_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/163_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt index a95751eb0..2d487adc0 100644 --- a/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 C2.1 <-> Q2.3 <-> R3.2 - C3.1 <-> R3.1 <-> R5.1 - C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1 + C3.+ <-> R3.1 <-> R5.1 + C3.- <-> C4.- <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1 + C5.1 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt index a95751eb0..2d487adc0 100644 --- a/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 C2.1 <-> Q2.3 <-> R3.2 - C3.1 <-> R3.1 <-> R5.1 - C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1 + C3.+ <-> R3.1 <-> R5.1 + C3.- <-> C4.- <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1 + C5.1 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/165_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/165_excl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/cloud/netlist/165_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/165_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/165_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/165_incl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/cloud/netlist/165_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/165_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/166_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/166_excl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/cloud/netlist/166_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/166_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/166_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/166_incl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/cloud/netlist/166_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/166_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/167_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/167_excl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/cloud/netlist/167_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/167_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/167_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/167_incl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/cloud/netlist/167_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/167_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/168_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/168_excl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/cloud/netlist/168_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/168_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/168_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/168_incl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/cloud/netlist/168_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/168_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/169_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/169_excl_switches.txt index b92750424..c2295b8d1 100644 --- a/diylc-regression-data/input/cloud/netlist/169_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/169_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C4.1 <-> D1.1 <-> R5.1 - C5.1 <-> R1.2 <-> R3.1 <-> R4.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.2 <-> C5.- <-> R4.2 <-> R5.2 + C3.1 <-> Q1.1 <-> R2.1 + C4.+ <-> D1.A <-> R5.1 + C5.+ <-> R1.2 <-> R3.1 <-> R4.1 R2.2 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/169_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/169_incl_switches.txt index b92750424..c2295b8d1 100644 --- a/diylc-regression-data/input/cloud/netlist/169_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/169_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C4.1 <-> D1.1 <-> R5.1 - C5.1 <-> R1.2 <-> R3.1 <-> R4.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.2 <-> C5.- <-> R4.2 <-> R5.2 + C3.1 <-> Q1.1 <-> R2.1 + C4.+ <-> D1.A <-> R5.1 + C5.+ <-> R1.2 <-> R3.1 <-> R4.1 R2.2 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/170_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/170_excl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/cloud/netlist/170_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/170_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/170_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/170_incl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/cloud/netlist/170_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/170_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/171_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/171_excl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/cloud/netlist/171_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/171_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/171_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/171_incl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/cloud/netlist/171_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/171_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/172_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/172_excl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/cloud/netlist/172_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/172_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/172_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/172_incl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/cloud/netlist/172_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/172_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/173_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/173_excl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/cloud/netlist/173_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/173_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/173_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/173_incl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/cloud/netlist/173_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/173_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt index a7fa11c1c..8e1b42b9e 100644 --- a/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.- <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.1 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.+ <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt index a7fa11c1c..8e1b42b9e 100644 --- a/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.- <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.1 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.+ <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/175_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/175_excl_switches.txt index 4e42fc736..5012c9c48 100644 --- a/diylc-regression-data/input/cloud/netlist/175_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/175_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C3.1 - .3 <-> .6 - .4 <-> 500K Linear.2 - .7 <-> R2.2 <-> R4.2 - .8 <-> R5.1 - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 3PDT.1 <-> C3.1 + 3PDT.3 <-> 3PDT.6 + 3PDT.4 <-> 500K Linear.2 + 3PDT.7 <-> R2.2 <-> R4.2 + 3PDT.8 <-> R5.1 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/175_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/175_incl_switches.txt index 3aa5617e7..c4358003e 100644 --- a/diylc-regression-data/input/cloud/netlist/175_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/175_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 <-> R5.1 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/176_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/176_excl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/cloud/netlist/176_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/176_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/176_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/176_incl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/cloud/netlist/176_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/176_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/177_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/177_excl_switches.txt index a69638003..ce21b5e1b 100644 --- a/diylc-regression-data/input/cloud/netlist/177_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/177_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/177_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/177_incl_switches.txt index a69638003..ce21b5e1b 100644 --- a/diylc-regression-data/input/cloud/netlist/177_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/177_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/178_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/178_excl_switches.txt index b32282310..9feeee76e 100644 --- a/diylc-regression-data/input/cloud/netlist/178_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/178_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .3 <-> R1.2 C1.1 <-> IC1.4 <-> IC1.5 C1.2 <-> R2.2 <-> R4.2 C2.1 <-> IC2.7 C2.2 <-> IC2.6 - C3.1 <-> IC2.2 - C3.2 <-> Volume.3 - C4.1 <-> IC1.11 <-> IC1.12 <-> IC1.8 <-> IC1.9 <-> IC2.10 <-> IC2.16 <-> IC2.9 <-> R1.1 - C4.2 <-> IC1.7 <-> IC2.5 <-> IC2.8 <-> Trimpot.2 <-> Trimpot.3 <-> Volume.1 + C3.+ <-> IC2.2 + C3.- <-> Volume.1 + C4.+ <-> IC1.11 <-> IC1.12 <-> IC1.8 <-> IC1.9 <-> IC2.10 <-> IC2.16 <-> IC2.9 <-> R1.1 + C4.- <-> IC1.7 <-> IC2.5 <-> IC2.8 <-> Trimpot.2 <-> Trimpot.3 <-> Volume.3 IC1.1 <-> R4.1 IC1.2 <-> IC1.3 <-> R2.1 IC1.6 <-> IC2.11 IC2.14 <-> R3.1 IC2.3 <-> IC2.4 + R1.2 <-> S1.3 R3.2 <-> Trimpot.1 diff --git a/diylc-regression-data/input/cloud/netlist/178_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/178_incl_switches.txt index a0d167b02..055263eda 100644 --- a/diylc-regression-data/input/cloud/netlist/178_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/178_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] C1.1 <-> IC1.4 <-> IC1.5 C1.2 <-> R2.2 <-> R4.2 C2.1 <-> IC2.7 C2.2 <-> IC2.6 - C3.1 <-> IC2.2 - C3.2 <-> Volume.3 - C4.1 <-> IC1.11 <-> IC1.12 <-> IC1.8 <-> IC1.9 <-> IC2.10 <-> IC2.16 <-> IC2.9 <-> R1.1 - C4.2 <-> IC1.7 <-> IC2.5 <-> IC2.8 <-> Trimpot.2 <-> Trimpot.3 <-> Volume.1 + C3.+ <-> IC2.2 + C3.- <-> Volume.1 + C4.+ <-> IC1.11 <-> IC1.12 <-> IC1.8 <-> IC1.9 <-> IC2.10 <-> IC2.16 <-> IC2.9 <-> R1.1 + C4.- <-> IC1.7 <-> IC2.5 <-> IC2.8 <-> Trimpot.2 <-> Trimpot.3 <-> Volume.3 IC1.1 <-> R4.1 IC1.2 <-> IC1.3 <-> R2.1 IC1.6 <-> IC2.11 diff --git a/diylc-regression-data/input/cloud/netlist/179_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/179_excl_switches.txt index 23dfe3b06..44e453e38 100644 --- a/diylc-regression-data/input/cloud/netlist/179_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/179_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.1 - .3 <-> .6 - .4 <-> C1.2 <-> R3.1 - .7 <-> IC.6 <-> R2.2 - .8 <-> R4.1 + 3PDT.1 <-> C2.+ + 3PDT.3 <-> 3PDT.6 + 3PDT.4 <-> C1.2 <-> R3.1 + 3PDT.7 <-> IC.6 <-> R2.2 + 3PDT.8 <-> R4.1 C1.1 <-> IC.3 <-> R1.2 <-> R2.1 - C2.2 <-> IC.2 <-> IC.7 + C2.- <-> IC.2 <-> IC.7 IC.4 <-> R1.1 <-> R3.2 - Led.1 <-> R4.2 + Led.A <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/179_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/179_incl_switches.txt index 06020161e..e9a6649f5 100644 --- a/diylc-regression-data/input/cloud/netlist/179_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/179_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] C1.1 <-> IC.3 <-> R1.2 <-> R2.1 C1.2 <-> R3.1 - C2.2 <-> IC.2 <-> IC.7 + C2.- <-> IC.2 <-> IC.7 IC.4 <-> R1.1 <-> R3.2 IC.6 <-> R2.2 <-> R4.1 - Led.1 <-> R4.2 + Led.A <-> R4.2 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] C1.1 <-> IC.3 <-> R1.2 <-> R2.1 C1.2 <-> R3.1 - C2.2 <-> IC.2 <-> IC.7 + C2.- <-> IC.2 <-> IC.7 IC.4 <-> R1.1 <-> R3.2 IC.6 <-> R2.2 - Led.1 <-> R4.2 + Led.A <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/180_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/180_excl_switches.txt index f99f18961..a8a37b2a7 100644 --- a/diylc-regression-data/input/cloud/netlist/180_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/180_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .3 <-> R13.2 - .6 <-> .9 <-> Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.2 <-> C14.2 <-> C15.2 <-> C16.2 <-> C7.2 <-> Gain.3 <-> Middle.1 <-> Middle.3 <-> Presence.3 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.2 <-> Treble.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 - .8 <-> Led.2 + 3PDT.1 <-> 3PDT.4 + 3PDT.3 <-> R13.2 + 3PDT.6 <-> 3PDT.9 <-> Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.- <-> C14.- <-> C15.- <-> C16.- <-> C7.2 <-> Gain.1 <-> Middle.1 <-> Middle.3 <-> Presence.1 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.1 <-> Treble.2 <-> Volume.1 <-> Volume.2 <-> Volume.3 + 3PDT.8 <-> Led.K C1.2 <-> R10.2 C10.1 <-> R8.2 <-> R9.2 C10.2 <-> C3.1 <-> Q3.1 <-> Q3.2 <-> Trimpot 3.1 C11.1 <-> C12.1 <-> R7.2 C12.2 <-> Middle.2 - C13.1 <-> Q1.2 <-> Q1.3 <-> R1.2 - C14.1 <-> Q2.2 <-> Q2.3 <-> R2.1 - C15.1 <-> Q4.3 <-> R3.1 - C16.1 <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 + C13.+ <-> Q1.2 <-> Q1.3 <-> R1.2 + C14.+ <-> Q2.2 <-> Q2.3 <-> R2.1 + C15.+ <-> Q4.3 <-> R3.1 + C16.+ <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 C2.1 <-> Q5.3 <-> R5.1 <-> R7.1 - C2.2 <-> Treble.1 - C4.1 <-> C5.1 <-> Gain.1 <-> R12.1 + C2.2 <-> Treble.3 + C4.1 <-> C5.1 <-> Gain.3 <-> R12.1 C4.2 <-> Gain.2 <-> R10.1 C5.2 <-> C8.1 <-> R12.2 <-> R15.1 - C6.1 <-> Presence.1 <-> Presence.2 + C6.1 <-> Presence.2 <-> Presence.3 C6.2 <-> R6.1 C8.2 <-> Q1.1 <-> Trimpot 1.1 C9.1 <-> R11.1 C9.2 <-> Q2.1 <-> Trimpot 2.1 - Led.1 <-> R16.2 + Led.A <-> R16.2 Q3.3 <-> R4.1 Q4.1 <-> Q4.2 <-> Trimpot 4.1 R11.2 <-> R14.2 diff --git a/diylc-regression-data/input/cloud/netlist/180_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/180_incl_switches.txt index e9bebfbe1..e83a18730 100644 --- a/diylc-regression-data/input/cloud/netlist/180_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/180_incl_switches.txt @@ -1,53 +1,53 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.2 <-> C14.2 <-> C15.2 <-> C16.2 <-> C7.2 <-> Gain.3 <-> Middle.1 <-> Middle.3 <-> Presence.3 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.2 <-> Treble.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.- <-> C14.- <-> C15.- <-> C16.- <-> C7.2 <-> Gain.1 <-> Middle.1 <-> Middle.3 <-> Presence.1 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.1 <-> Treble.2 <-> Volume.1 <-> Volume.2 <-> Volume.3 C1.2 <-> R10.2 C10.1 <-> R8.2 <-> R9.2 C10.2 <-> C3.1 <-> Q3.1 <-> Q3.2 <-> Trimpot 3.1 C11.1 <-> C12.1 <-> R7.2 C12.2 <-> Middle.2 - C13.1 <-> Q1.2 <-> Q1.3 <-> R1.2 - C14.1 <-> Q2.2 <-> Q2.3 <-> R2.1 - C15.1 <-> Q4.3 <-> R3.1 - C16.1 <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 + C13.+ <-> Q1.2 <-> Q1.3 <-> R1.2 + C14.+ <-> Q2.2 <-> Q2.3 <-> R2.1 + C15.+ <-> Q4.3 <-> R3.1 + C16.+ <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 C2.1 <-> Q5.3 <-> R5.1 <-> R7.1 - C2.2 <-> Treble.1 - C4.1 <-> C5.1 <-> Gain.1 <-> R12.1 + C2.2 <-> Treble.3 + C4.1 <-> C5.1 <-> Gain.3 <-> R12.1 C4.2 <-> Gain.2 <-> R10.1 C5.2 <-> C8.1 <-> R12.2 <-> R15.1 - C6.1 <-> Presence.1 <-> Presence.2 + C6.1 <-> Presence.2 <-> Presence.3 C6.2 <-> R6.1 C8.2 <-> Q1.1 <-> Trimpot 1.1 C9.1 <-> R11.1 C9.2 <-> Q2.1 <-> Trimpot 2.1 - Led.1 <-> R16.2 + Led.A <-> R16.2 Q3.3 <-> R4.1 Q4.1 <-> Q4.2 <-> Trimpot 4.1 R11.2 <-> R14.2 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.2 <-> C14.2 <-> C15.2 <-> C16.2 <-> C7.2 <-> Gain.3 <-> Led.2 <-> Middle.1 <-> Middle.3 <-> Presence.3 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.2 <-> Treble.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + Bass.1 <-> Bass.2 <-> Bass.3 <-> C1.1 <-> C11.2 <-> C13.- <-> C14.- <-> C15.- <-> C16.- <-> C7.2 <-> Gain.1 <-> Led.K <-> Middle.1 <-> Middle.3 <-> Presence.1 <-> R1.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R9.1 <-> Treble.1 <-> Treble.2 <-> Volume.1 <-> Volume.2 <-> Volume.3 C1.2 <-> R10.2 C10.1 <-> R8.2 <-> R9.2 C10.2 <-> C3.1 <-> Q3.1 <-> Q3.2 <-> Trimpot 3.1 C11.1 <-> C12.1 <-> R7.2 C12.2 <-> Middle.2 - C13.1 <-> Q1.2 <-> Q1.3 <-> R1.2 - C14.1 <-> Q2.2 <-> Q2.3 <-> R2.1 - C15.1 <-> Q4.3 <-> R3.1 - C16.1 <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 + C13.+ <-> Q1.2 <-> Q1.3 <-> R1.2 + C14.+ <-> Q2.2 <-> Q2.3 <-> R2.1 + C15.+ <-> Q4.3 <-> R3.1 + C16.+ <-> C3.2 <-> C7.1 <-> Q5.1 <-> Q5.2 <-> R16.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 C2.1 <-> Q5.3 <-> R5.1 <-> R7.1 - C2.2 <-> Treble.1 - C4.1 <-> C5.1 <-> Gain.1 <-> R12.1 + C2.2 <-> Treble.3 + C4.1 <-> C5.1 <-> Gain.3 <-> R12.1 C4.2 <-> Gain.2 <-> R10.1 C5.2 <-> C8.1 <-> R12.2 <-> R15.1 - C6.1 <-> Presence.1 <-> Presence.2 + C6.1 <-> Presence.2 <-> Presence.3 C6.2 <-> R6.1 C8.2 <-> Q1.1 <-> Trimpot 1.1 C9.1 <-> R11.1 C9.2 <-> Q2.1 <-> Trimpot 2.1 - Led.1 <-> R16.2 + Led.A <-> R16.2 Q3.3 <-> R4.1 Q4.1 <-> Q4.2 <-> Trimpot 4.1 R11.2 <-> R14.2 diff --git a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt index 55a6528f5..7ffb1c6ab 100644 --- a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C4.2 <-> R5.1 - .3 <-> .6 - .4 <-> C2.2 - .7 <-> Led.2 - .8 <-> Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3 - C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 - C1.2 <-> Drive.2 - C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 + 3PDT.1 <-> C4.- <-> R5.1 + 3PDT.3 <-> 3PDT.6 + 3PDT.4 <-> C2.- + 3PDT.7 <-> Led.K + 3PDT.8 <-> Gate.3 <-> Q3.1 <-> Q3.2 <-> R5.2 <-> Volume.1 + C1.+ <-> Compress.1 <-> Compress.2 <-> Drive.1 <-> R3.2 <-> Stability.2 + C1.- <-> Drive.2 + C2.+ <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 - C4.1 <-> Volume.2 - Compress.1 <-> Drive.1 <-> R4.1 - Gate.2 <-> Gate.3 <-> R1.2 - Led.1 <-> R7.2 + C4.+ <-> Volume.2 + Compress.3 <-> Drive.3 <-> R4.1 + Gate.1 <-> Gate.2 <-> R1.2 + Led.A <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 - R2.1 <-> Volume.1 - R7.1 <-> Stability.1 + R2.1 <-> Volume.3 + R7.1 <-> Stability.3 diff --git a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt index 59e6999b1..a96775657 100644 --- a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt @@ -1,36 +1,36 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 - C1.2 <-> Drive.2 - C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 + C1.+ <-> Compress.1 <-> Compress.2 <-> Drive.1 <-> R3.2 <-> Stability.2 + C1.- <-> Drive.2 + C2.+ <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 - C4.1 <-> Volume.2 - C4.2 <-> R5.1 - Compress.1 <-> Drive.1 <-> R4.1 - Gate.1 <-> Led.2 <-> Q3.1 <-> R5.2 <-> Volume.3 - Gate.2 <-> Gate.3 <-> R1.2 - Led.1 <-> R7.2 + C4.+ <-> Volume.2 + C4.- <-> R5.1 + Compress.3 <-> Drive.3 <-> R4.1 + Gate.1 <-> Gate.2 <-> R1.2 + Gate.3 <-> Led.K <-> Q3.1 <-> Q3.2 <-> R5.2 <-> Volume.1 + Led.A <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 - R2.1 <-> Volume.1 - R7.1 <-> Stability.1 + R2.1 <-> Volume.3 + R7.1 <-> Stability.3 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 - C1.2 <-> Drive.2 - C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 + C1.+ <-> Compress.1 <-> Compress.2 <-> Drive.1 <-> R3.2 <-> Stability.2 + C1.- <-> Drive.2 + C2.+ <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 - C4.1 <-> Volume.2 - C4.2 <-> R5.1 - Compress.1 <-> Drive.1 <-> R4.1 - Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3 - Gate.2 <-> Gate.3 <-> R1.2 - Led.1 <-> R7.2 + C4.+ <-> Volume.2 + C4.- <-> R5.1 + Compress.3 <-> Drive.3 <-> R4.1 + Gate.1 <-> Gate.2 <-> R1.2 + Gate.3 <-> Q3.1 <-> Q3.2 <-> R5.2 <-> Volume.1 + Led.A <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 - R2.1 <-> Volume.1 - R7.1 <-> Stability.1 + R2.1 <-> Volume.3 + R7.1 <-> Stability.3 diff --git a/diylc-regression-data/input/cloud/netlist/182_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/182_excl_switches.txt index 8648bbe74..eeb42ef3b 100644 --- a/diylc-regression-data/input/cloud/netlist/182_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/182_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> Led.2 - .2 <-> .8 <-> C1.1 <-> C6.2 <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.2 <-> Volume.1 - .3 <-> .6 - .4 <-> .9 - .5 <-> C1.2 <-> C4.2 <-> R7.1 - .7 <-> C2.2 <-> Volume.2 <-> Volume.3 + C1.1 <-> C6.- <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.2 <-> S1.2 <-> S1.8 <-> Volume.3 + C1.2 <-> C4.- <-> R7.1 <-> S1.5 C2.1 <-> R1.2 <-> R2.2 + C2.2 <-> S1.7 <-> Volume.1 <-> Volume.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 C3.2 <-> Q1.1 <-> R3.1 - C4.1 <-> Q1.2 <-> Q1.3 <-> R5.2 - C5.1 <-> C6.1 <-> Fuzz.1 <-> R5.1 <-> R8.1 - C5.2 <-> Fuzz.2 - Fuzz.3 <-> R6.2 - Led.1 <-> R8.2 + C4.+ <-> Q1.2 <-> Q1.3 <-> R5.2 + C5.+ <-> C6.+ <-> Fuzz.3 <-> R5.1 <-> R8.1 + C5.- <-> Fuzz.2 + Fuzz.1 <-> R6.2 + Led.A <-> R8.2 + Led.K <-> S1.1 Q2.1 <-> Q3.2 <-> Q3.3 <-> R4.1 Q3.1 <-> R2.1 + S1.3 <-> S1.6 + S1.4 <-> S1.9 diff --git a/diylc-regression-data/input/cloud/netlist/182_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/182_incl_switches.txt index 82fef0cb2..b6fa1b858 100644 --- a/diylc-regression-data/input/cloud/netlist/182_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/182_incl_switches.txt @@ -1,30 +1,30 @@ -Switch setup: [.ON1] +Switch setup: [ S1.ON1 ] - C1.1 <-> C2.2 <-> C6.2 <-> Led.2 <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.2 <-> Volume.1 <-> Volume.2 <-> Volume.3 - C1.2 <-> C4.2 <-> R7.1 + C1.1 <-> C2.2 <-> C6.- <-> Led.K <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.2 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> C4.- <-> R7.1 C2.1 <-> R1.2 <-> R2.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 C3.2 <-> Q1.1 <-> R3.1 - C4.1 <-> Q1.2 <-> Q1.3 <-> R5.2 - C5.1 <-> C6.1 <-> Fuzz.1 <-> R5.1 <-> R8.1 - C5.2 <-> Fuzz.2 - Fuzz.3 <-> R6.2 - Led.1 <-> R8.2 + C4.+ <-> Q1.2 <-> Q1.3 <-> R5.2 + C5.+ <-> C6.+ <-> Fuzz.3 <-> R5.1 <-> R8.1 + C5.- <-> Fuzz.2 + Fuzz.1 <-> R6.2 + Led.A <-> R8.2 Q2.1 <-> Q3.2 <-> Q3.3 <-> R4.1 Q3.1 <-> R2.1 -Switch setup: [.ON2] +Switch setup: [ S1.ON2 ] - C1.1 <-> C1.2 <-> C4.2 <-> C6.2 <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.1 <-> R7.2 <-> Volume.1 + C1.1 <-> C1.2 <-> C4.- <-> C6.- <-> R1.1 <-> R3.2 <-> R4.2 <-> R7.1 <-> R7.2 <-> Volume.3 C2.1 <-> R1.2 <-> R2.2 - C2.2 <-> Volume.2 <-> Volume.3 + C2.2 <-> Volume.1 <-> Volume.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 C3.2 <-> Q1.1 <-> R3.1 - C4.1 <-> Q1.2 <-> Q1.3 <-> R5.2 - C5.1 <-> C6.1 <-> Fuzz.1 <-> R5.1 <-> R8.1 - C5.2 <-> Fuzz.2 - Fuzz.3 <-> R6.2 - Led.1 <-> R8.2 + C4.+ <-> Q1.2 <-> Q1.3 <-> R5.2 + C5.+ <-> C6.+ <-> Fuzz.3 <-> R5.1 <-> R8.1 + C5.- <-> Fuzz.2 + Fuzz.1 <-> R6.2 + Led.A <-> R8.2 Q2.1 <-> Q3.2 <-> Q3.3 <-> R4.1 Q3.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/183_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/183_excl_switches.txt index b28163b6b..6c9cb7094 100644 --- a/diylc-regression-data/input/cloud/netlist/183_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/183_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> Led.2 - .2 <-> C3.2 <-> Fuzz.1 <-> Volume.1 - .3 <-> .6 - .4 <-> .9 - .5 <-> C2.2 - .7 <-> Volume.2 - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C3.1 <-> Fuzz.2 - Fuzz.3 <-> R4.2 - Led.1 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> S1.5 + C3.+ <-> Fuzz.2 + C3.- <-> Fuzz.3 <-> S1.2 <-> Volume.3 + Fuzz.1 <-> R4.2 + Led.A <-> R5.2 + Led.K <-> S1.1 Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 <-> R3.2 Q2.1 <-> R2.2 R1.1 <-> R3.1 <-> R5.1 + S1.3 <-> S1.6 + S1.4 <-> S1.9 + S1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/183_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/183_incl_switches.txt index cf4f1de37..357523781 100644 --- a/diylc-regression-data/input/cloud/netlist/183_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/183_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [.ON1] +Switch setup: [ S1.ON1 ] - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C3.1 <-> Fuzz.2 - C3.2 <-> Fuzz.1 <-> Led.2 <-> Volume.1 - Fuzz.3 <-> R4.2 - Led.1 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C3.+ <-> Fuzz.2 + C3.- <-> Fuzz.3 <-> Led.K <-> Volume.3 + Fuzz.1 <-> R4.2 + Led.A <-> R5.2 Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 <-> R3.2 Q2.1 <-> R2.2 R1.1 <-> R3.1 <-> R5.1 -Switch setup: [.ON2] +Switch setup: [ S1.ON2 ] - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> C3.2 <-> Fuzz.1 <-> Volume.1 - C3.1 <-> Fuzz.2 - Fuzz.3 <-> R4.2 - Led.1 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> C3.- <-> Fuzz.3 <-> Volume.3 + C3.+ <-> Fuzz.2 + Fuzz.1 <-> R4.2 + Led.A <-> R5.2 Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 <-> R3.2 Q2.1 <-> R2.2 R1.1 <-> R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/184_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/184_excl_switches.txt index 0a7b0c509..597ff20ac 100644 --- a/diylc-regression-data/input/cloud/netlist/184_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/184_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> LED.2 - .2 <-> R1.1 <-> R3.1 <-> Volume.1 - .3 <-> .6 - .4 <-> .9 - .5 <-> C2.2 - .7 <-> Volume.2 - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C3.1 <-> Fuzz.1 <-> Q1.1 <-> Q1.2 <-> R5.2 - C3.2 <-> Fuzz.2 - Fuzz.3 <-> Q2.1 <-> Q2.2 <-> R4.2 - LED.1 <-> R5.1 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> S1.5 + C3.+ <-> Fuzz.3 <-> Q1.1 <-> Q1.2 <-> R5.2 + C3.- <-> Fuzz.2 + Fuzz.1 <-> Q2.1 <-> Q2.2 <-> R4.2 + LED.A <-> R5.1 + LED.K <-> S1.1 Q2.3 <-> R3.2 + R1.1 <-> R3.1 <-> S1.2 <-> Volume.3 + S1.3 <-> S1.6 + S1.4 <-> S1.9 + S1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/184_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/184_incl_switches.txt index ead55e275..14dfa4b7d 100644 --- a/diylc-regression-data/input/cloud/netlist/184_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/184_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [.ON1] +Switch setup: [ S1.ON1 ] - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C3.1 <-> Fuzz.1 <-> Q1.1 <-> Q1.2 <-> R5.2 - C3.2 <-> Fuzz.2 - Fuzz.3 <-> Q2.1 <-> Q2.2 <-> R4.2 - LED.1 <-> R5.1 - LED.2 <-> R1.1 <-> R3.1 <-> Volume.1 + C2.+ <-> Q1.3 <-> R4.1 + C3.+ <-> Fuzz.3 <-> Q1.1 <-> Q1.2 <-> R5.2 + C3.- <-> Fuzz.2 + Fuzz.1 <-> Q2.1 <-> Q2.2 <-> R4.2 + LED.A <-> R5.1 + LED.K <-> R1.1 <-> R3.1 <-> Volume.3 Q2.3 <-> R3.2 -Switch setup: [.ON2] +Switch setup: [ S1.ON2 ] - C1.1 <-> Volume.3 + C1.1 <-> Volume.1 C1.2 <-> R1.2 <-> R2.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R1.1 <-> R3.1 <-> Volume.1 - C3.1 <-> Fuzz.1 <-> Q1.1 <-> Q1.2 <-> R5.2 - C3.2 <-> Fuzz.2 - Fuzz.3 <-> Q2.1 <-> Q2.2 <-> R4.2 - LED.1 <-> R5.1 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R1.1 <-> R3.1 <-> Volume.3 + C3.+ <-> Fuzz.3 <-> Q1.1 <-> Q1.2 <-> R5.2 + C3.- <-> Fuzz.2 + Fuzz.1 <-> Q2.1 <-> Q2.2 <-> R4.2 + LED.A <-> R5.1 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/185_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/185_excl_switches.txt index 8d0e2ffec..e72fbe165 100644 --- a/diylc-regression-data/input/cloud/netlist/185_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/185_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .3 <-> R10.2 <-> R16.2 - .6 <-> Volume.2 - .8 <-> Led.2 - Bass.1 <-> Bass.2 <-> Bass.3 <-> C10.2 <-> Middle.1 <-> Treble.3 - C1.1 <-> Preamp Volume.1 <-> R13.1 + 3PDT.1 <-> 3PDT.4 + 3PDT.3 <-> R10.2 <-> R16.2 + 3PDT.6 <-> Volume.2 + 3PDT.8 <-> Led.K + Bass.1 <-> Bass.2 <-> Bass.3 <-> C10.2 <-> Middle.3 <-> Treble.1 + C1.1 <-> Preamp Volume.3 <-> R13.1 C1.2 <-> C5.1 <-> R13.2 C10.1 <-> C9.1 <-> R9.1 - C11.1 <-> C12.1 <-> C13.2 <-> Master Volume.1 <-> Master Volume.3 <-> Preamp Volume.3 <-> R12.2 <-> R15.2 <-> R16.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R6.1 <-> R7.1 <-> R8.2 <-> Treble.2 <-> Volume.3 + C11.1 <-> C12.1 <-> C13.- <-> Master Volume.1 <-> Master Volume.3 <-> Preamp Volume.1 <-> R12.2 <-> R15.2 <-> R16.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R6.1 <-> R7.1 <-> R8.2 <-> Treble.2 <-> Volume.1 C11.2 <-> R11.1 <-> R5.2 <-> R6.2 C12.2 <-> Q1.2 <-> Q1.3 <-> R4.2 - C13.1 <-> Q4.1 <-> Q4.2 <-> R18.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 <-> Trimpot 5.2 <-> Trimpot 5.3 + C13.+ <-> Q4.1 <-> Q4.2 <-> R18.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 <-> Trimpot 5.2 <-> Trimpot 5.3 C2.1 <-> R14.1 <-> R15.1 C2.2 <-> C6.1 <-> R14.2 C3.1 <-> Q4.3 <-> R8.1 <-> R9.2 - C3.2 <-> Treble.1 + C3.2 <-> Treble.3 C4.1 <-> R11.2 - C4.2 <-> Q6.1 <-> Trimpot 5.1 <-> Volume.1 + C4.2 <-> Q6.1 <-> Trimpot 5.1 <-> Volume.3 C5.2 <-> Q1.1 <-> Trimpot 1.1 C6.2 <-> Q2.1 <-> Trimpot 2.1 C7.1 <-> R17.2 @@ -25,7 +25,7 @@ Switch setup: [Default] C8.1 <-> R12.1 C8.2 <-> Q5.1 <-> Trimpot 4.1 C9.2 <-> Middle.2 - Led.1 <-> R18.2 + Led.A <-> R18.2 Q2.2 <-> Q2.3 <-> R7.2 Q3.1 <-> Trimpot 3.1 Q3.2 <-> Q3.3 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/185_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/185_incl_switches.txt index 9f8b90677..d9f2fcc67 100644 --- a/diylc-regression-data/input/cloud/netlist/185_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/185_incl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> C10.2 <-> Middle.1 <-> Treble.3 - C1.1 <-> Preamp Volume.1 <-> R13.1 + Bass.1 <-> Bass.2 <-> Bass.3 <-> C10.2 <-> Middle.3 <-> Treble.1 + C1.1 <-> Preamp Volume.3 <-> R13.1 C1.2 <-> C5.1 <-> R13.2 C10.1 <-> C9.1 <-> R9.1 - C11.1 <-> C12.1 <-> C13.2 <-> Master Volume.1 <-> Master Volume.3 <-> Preamp Volume.3 <-> R12.2 <-> R15.2 <-> R16.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R6.1 <-> R7.1 <-> R8.2 <-> Treble.2 <-> Volume.3 + C11.1 <-> C12.1 <-> C13.- <-> Master Volume.1 <-> Master Volume.3 <-> Preamp Volume.1 <-> R12.2 <-> R15.2 <-> R16.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R6.1 <-> R7.1 <-> R8.2 <-> Treble.2 <-> Volume.1 C11.2 <-> R11.1 <-> R5.2 <-> R6.2 C12.2 <-> Q1.2 <-> Q1.3 <-> R4.2 - C13.1 <-> Q4.1 <-> Q4.2 <-> R18.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 <-> Trimpot 5.2 <-> Trimpot 5.3 + C13.+ <-> Q4.1 <-> Q4.2 <-> R18.1 <-> Trimpot 1.2 <-> Trimpot 1.3 <-> Trimpot 2.2 <-> Trimpot 2.3 <-> Trimpot 3.2 <-> Trimpot 3.3 <-> Trimpot 4.2 <-> Trimpot 4.3 <-> Trimpot 5.2 <-> Trimpot 5.3 C2.1 <-> R14.1 <-> R15.1 C2.2 <-> C6.1 <-> R14.2 C3.1 <-> Q4.3 <-> R8.1 <-> R9.2 - C3.2 <-> Treble.1 + C3.2 <-> Treble.3 C4.1 <-> R11.2 - C4.2 <-> Q6.1 <-> Trimpot 5.1 <-> Volume.1 + C4.2 <-> Q6.1 <-> Trimpot 5.1 <-> Volume.3 C5.2 <-> Q1.1 <-> Trimpot 1.1 C6.2 <-> Q2.1 <-> Trimpot 2.1 C7.1 <-> R17.2 @@ -21,7 +21,7 @@ Switch setup: [.ON1, .ON2] C8.1 <-> R12.1 C8.2 <-> Q5.1 <-> Trimpot 4.1 C9.2 <-> Middle.2 - Led.1 <-> R18.2 + Led.A <-> R18.2 Q2.2 <-> Q2.3 <-> R7.2 Q3.1 <-> Trimpot 3.1 Q3.2 <-> Q3.3 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/186_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/186_excl_switches.txt index ff1313018..5aa0d3c03 100644 --- a/diylc-regression-data/input/cloud/netlist/186_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/186_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C3.1 - .3 <-> .6 - .4 <-> 500K Linear.2 - .7 <-> R2.2 <-> R4.2 - .8 <-> R5.1 - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 3PDT.1 <-> C3.1 + 3PDT.3 <-> 3PDT.6 + 3PDT.4 <-> 500K Linear.2 + 3PDT.7 <-> R2.2 <-> R4.2 + 3PDT.8 <-> R5.1 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.1 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.+ <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.2 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.- <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/186_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/186_incl_switches.txt index fe0d66be8..27cc7f672 100644 --- a/diylc-regression-data/input/cloud/netlist/186_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/186_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.1 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.+ <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.2 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.- <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 <-> R5.1 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.1 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.+ <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.2 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.- <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt index 56ed2d637..0a0615148 100644 --- a/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 100K Log.2 - .3 <-> .6 - .4 <-> C1.2 <-> R6.1 - .7 <-> R2.2 - .8 <-> LED.1 - 100K Log.1 <-> LED.2 <-> R1.2 <-> R4.2 <-> R6.2 - 100K Log.3 <-> C2.2 + 100K Log.1 <-> C2.2 + 100K Log.2 <-> 3PDT.1 + 100K Log.3 <-> LED.K <-> R1.2 <-> R4.2 <-> R6.2 + 3PDT.3 <-> 3PDT.6 + 3PDT.4 <-> C1.2 <-> R6.1 + 3PDT.7 <-> R2.2 + 3PDT.8 <-> LED.A C1.1 <-> Q1.3 <-> R4.1 <-> R5.2 C2.1 <-> R3.2 Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt index 84edb265e..96e621e04 100644 --- a/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - 100K Log.1 <-> LED.2 <-> R1.2 <-> R4.2 <-> R6.2 - 100K Log.3 <-> C2.2 + 100K Log.1 <-> C2.2 + 100K Log.3 <-> LED.K <-> R1.2 <-> R4.2 <-> R6.2 C1.1 <-> Q1.3 <-> R4.1 <-> R5.2 C1.2 <-> R6.1 C2.1 <-> R3.2 - LED.1 <-> R2.2 + LED.A <-> R2.2 Q1.1 <-> Q1.2 <-> R1.1 R2.1 <-> R3.1 <-> R5.1 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - 100K Log.1 <-> LED.2 <-> R1.2 <-> R4.2 <-> R6.2 - 100K Log.3 <-> C2.2 + 100K Log.1 <-> C2.2 + 100K Log.3 <-> LED.K <-> R1.2 <-> R4.2 <-> R6.2 C1.1 <-> Q1.3 <-> R4.1 <-> R5.2 C1.2 <-> R6.1 C2.1 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/188_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/188_excl_switches.txt index b5cbdd99e..9f7ce8bf4 100644 --- a/diylc-regression-data/input/cloud/netlist/188_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/188_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C3.2 - .3 <-> .4 - .5 <-> C2.2 <-> R6.2 - .6 <-> .9 - .7 <-> LED.2 - .8 <-> C4.2 <-> C5.2 <-> R3.2 <-> R4.1 <-> R6.1 - 10K Lin.1 <-> C4.1 <-> R1.1 <-> R5.2 - 10K Lin.2 <-> 10K Lin.3 <-> C3.1 <-> Q1.1 <-> Q1.2 - C1.1 <-> C5.1 <-> R3.1 + 10K Lin.1 <-> 10K Lin.2 <-> C3.1 <-> Q1.1 <-> Q1.2 + 10K Lin.3 <-> C4.+ <-> R1.1 <-> R5.2 + 3PDT.1 <-> C3.2 + 3PDT.3 <-> 3PDT.4 + 3PDT.5 <-> C2.2 <-> R6.2 + 3PDT.6 <-> 3PDT.9 + 3PDT.7 <-> LED.K + 3PDT.8 <-> C4.- <-> C5.- <-> R3.2 <-> R4.1 <-> R6.1 + C1.1 <-> C5.+ <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 <-> R4.2 C2.1 <-> R2.2 <-> R5.1 - LED.1 <-> R7.2 + LED.A <-> R7.2 R1.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/188_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/188_incl_switches.txt index ecd4c51f2..644337767 100644 --- a/diylc-regression-data/input/cloud/netlist/188_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/188_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - 10K Lin.1 <-> C4.1 <-> R1.1 <-> R5.2 - 10K Lin.2 <-> 10K Lin.3 <-> C3.1 <-> Q1.1 <-> Q1.2 - C1.1 <-> C5.1 <-> R3.1 + 10K Lin.1 <-> 10K Lin.2 <-> C3.1 <-> Q1.1 <-> Q1.2 + 10K Lin.3 <-> C4.+ <-> R1.1 <-> R5.2 + C1.1 <-> C5.+ <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 <-> R4.2 C2.1 <-> R2.2 <-> R5.1 C2.2 <-> R6.2 - C4.2 <-> C5.2 <-> LED.2 <-> R3.2 <-> R4.1 <-> R6.1 - LED.1 <-> R7.2 + C4.- <-> C5.- <-> LED.K <-> R3.2 <-> R4.1 <-> R6.1 + LED.A <-> R7.2 R1.2 <-> R7.1 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - 10K Lin.1 <-> C4.1 <-> R1.1 <-> R5.2 - 10K Lin.2 <-> 10K Lin.3 <-> C3.1 <-> Q1.1 <-> Q1.2 - C1.1 <-> C5.1 <-> R3.1 + 10K Lin.1 <-> 10K Lin.2 <-> C3.1 <-> Q1.1 <-> Q1.2 + 10K Lin.3 <-> C4.+ <-> R1.1 <-> R5.2 + C1.1 <-> C5.+ <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 <-> R4.2 C2.1 <-> R2.2 <-> R5.1 - C2.2 <-> C4.2 <-> C5.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R6.2 - LED.1 <-> R7.2 + C2.2 <-> C4.- <-> C5.- <-> R3.2 <-> R4.1 <-> R6.1 <-> R6.2 + LED.A <-> R7.2 R1.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt index 5cb716295..955581a52 100644 --- a/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.1 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.+ <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.2 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.- <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt index 5cb716295..955581a52 100644 --- a/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.1 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.+ <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.2 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.- <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/190_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/190_excl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/cloud/netlist/190_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/190_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/190_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/190_incl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/cloud/netlist/190_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/190_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/191_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/191_excl_switches.txt index 9cd100f73..06f9dd923 100644 --- a/diylc-regression-data/input/cloud/netlist/191_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/191_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .3 <-> C1.1 - .6 <-> C2.2 <-> R2.2 - .8 <-> LED.2 - .9 <-> Crackle.1 <-> Crackle.2 <-> R2.1 <-> R4.1 - C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 - C2.1 <-> Q1.1 <-> R1.2 <-> R3.2 - Crackle.3 <-> D1.1 - LED.1 <-> R5.2 + 3PDT.1 <-> 3PDT.4 + 3PDT.3 <-> C1.1 + 3PDT.6 <-> C2.- <-> R2.2 + 3PDT.8 <-> LED.K + 3PDT.9 <-> Crackle.2 <-> Crackle.3 <-> R2.1 <-> R4.1 + C1.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 + C2.+ <-> Q1.1 <-> R1.2 <-> R3.2 + Crackle.1 <-> D1.A + LED.A <-> R5.2 R1.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/191_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/191_incl_switches.txt index afdd17c30..4afea85a0 100644 --- a/diylc-regression-data/input/cloud/netlist/191_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/191_incl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [.ON1] +Switch setup: [ 3PDT.ON1 ] - C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 - C2.1 <-> Q1.1 <-> R1.2 <-> R3.2 - C2.2 <-> R2.2 - Crackle.1 <-> Crackle.2 <-> R2.1 <-> R4.1 - Crackle.3 <-> D1.1 - LED.1 <-> R5.2 + C1.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 + C2.+ <-> Q1.1 <-> R1.2 <-> R3.2 + C2.- <-> R2.2 + Crackle.1 <-> D1.A + Crackle.2 <-> Crackle.3 <-> R2.1 <-> R4.1 + LED.A <-> R5.2 R1.1 <-> R5.1 -Switch setup: [.ON2] +Switch setup: [ 3PDT.ON2 ] - C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 - C2.1 <-> Q1.1 <-> R1.2 <-> R3.2 - C2.2 <-> R2.2 - Crackle.1 <-> Crackle.2 <-> LED.2 <-> R2.1 <-> R4.1 - Crackle.3 <-> D1.1 - LED.1 <-> R5.2 + C1.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 <-> R4.2 + C2.+ <-> Q1.1 <-> R1.2 <-> R3.2 + C2.- <-> R2.2 + Crackle.1 <-> D1.A + Crackle.2 <-> Crackle.3 <-> LED.K <-> R2.1 <-> R4.1 + LED.A <-> R5.2 R1.1 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/192_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/192_excl_switches.txt index d13340cc9..503b34587 100644 --- a/diylc-regression-data/input/cloud/netlist/192_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/192_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC3.3 <-> R2.2 C1.1 <-> IC3.3 <-> R2.2 @@ -14,14 +14,14 @@ Switch setup: [Default] C3.2 <-> R3.1 C4.1 <-> IC3.13 <-> R8.1 C4.1 <-> IC3.13 <-> R8.1 - C4.2 <-> IC3.14 <-> R7.2 <-> VR1.1 - C4.2 <-> IC3.14 <-> R7.2 <-> VR1.1 - D1.1 <-> D2.2 <-> IC3.7 <-> R1.2 <-> R5.2 - D1.1 <-> D2.2 <-> IC3.7 <-> R1.2 <-> R5.2 - D1.2 <-> R8.2 - D1.2 <-> R8.2 - D2.1 <-> VR1.2 <-> VR1.3 - D2.1 <-> VR1.2 <-> VR1.3 + C4.2 <-> IC3.14 <-> R7.2 <-> VR1.3 + C4.2 <-> IC3.14 <-> R7.2 <-> VR1.3 + D1.A <-> D2.K <-> IC3.7 <-> R1.2 <-> R5.2 + D1.A <-> D2.K <-> IC3.7 <-> R1.2 <-> R5.2 + D1.K <-> R8.2 + D1.K <-> R8.2 + D2.A <-> VR1.1 <-> VR1.2 + D2.A <-> VR1.1 <-> VR1.2 IC3.1 <-> IC3.2 <-> Q3.1 IC3.1 <-> IC3.2 <-> Q3.1 IC3.11 <-> R1.1 <-> R11.1 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/192_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/192_incl_switches.txt index d13340cc9..503b34587 100644 --- a/diylc-regression-data/input/cloud/netlist/192_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/192_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC3.3 <-> R2.2 C1.1 <-> IC3.3 <-> R2.2 @@ -14,14 +14,14 @@ Switch setup: [Default] C3.2 <-> R3.1 C4.1 <-> IC3.13 <-> R8.1 C4.1 <-> IC3.13 <-> R8.1 - C4.2 <-> IC3.14 <-> R7.2 <-> VR1.1 - C4.2 <-> IC3.14 <-> R7.2 <-> VR1.1 - D1.1 <-> D2.2 <-> IC3.7 <-> R1.2 <-> R5.2 - D1.1 <-> D2.2 <-> IC3.7 <-> R1.2 <-> R5.2 - D1.2 <-> R8.2 - D1.2 <-> R8.2 - D2.1 <-> VR1.2 <-> VR1.3 - D2.1 <-> VR1.2 <-> VR1.3 + C4.2 <-> IC3.14 <-> R7.2 <-> VR1.3 + C4.2 <-> IC3.14 <-> R7.2 <-> VR1.3 + D1.A <-> D2.K <-> IC3.7 <-> R1.2 <-> R5.2 + D1.A <-> D2.K <-> IC3.7 <-> R1.2 <-> R5.2 + D1.K <-> R8.2 + D1.K <-> R8.2 + D2.A <-> VR1.1 <-> VR1.2 + D2.A <-> VR1.1 <-> VR1.2 IC3.1 <-> IC3.2 <-> Q3.1 IC3.1 <-> IC3.2 <-> Q3.1 IC3.11 <-> R1.1 <-> R11.1 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/193_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/193_excl_switches.txt index 3ceaab61c..05d318777 100644 --- a/diylc-regression-data/input/cloud/netlist/193_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/193_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.1 <-> R1.1 - C1.1 <-> Q1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.2 - C1.1 <-> R1.2 - C1.2 <-> D1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.2 <-> VR1.3 - C1.2 <-> D1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.2 <-> VR1.3 - C1.2 <-> R1.1 - C1.2 <-> R1.1 - C2.1 <-> D1.2 <-> Q1.2 <-> R1.2 <-> R1.2 - C2.1 <-> D1.2 <-> Q1.2 <-> R1.2 <-> R1.2 + C1.+ <-> Q1.1 <-> R1.1 <-> R1.1 + C1.+ <-> Q1.1 <-> R1.1 <-> R1.1 + C1.+ <-> R1.2 + C1.+ <-> R1.2 + C1.- <-> D1.A <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.1 <-> VR1.2 + C1.- <-> D1.A <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.1 <-> VR1.2 + C1.- <-> R1.1 + C1.- <-> R1.1 + C2.1 <-> D1.K <-> Q1.2 <-> R1.2 <-> R1.2 + C2.1 <-> D1.K <-> Q1.2 <-> R1.2 <-> R1.2 C2.2 <-> R1.2 C2.2 <-> R1.2 - Q1.3 <-> VR1.1 - Q1.3 <-> VR1.1 + Q1.3 <-> VR1.3 + Q1.3 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/193_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/193_incl_switches.txt index 3ceaab61c..05d318777 100644 --- a/diylc-regression-data/input/cloud/netlist/193_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/193_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.1 <-> R1.1 - C1.1 <-> Q1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.2 - C1.1 <-> R1.2 - C1.2 <-> D1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.2 <-> VR1.3 - C1.2 <-> D1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.2 <-> VR1.3 - C1.2 <-> R1.1 - C1.2 <-> R1.1 - C2.1 <-> D1.2 <-> Q1.2 <-> R1.2 <-> R1.2 - C2.1 <-> D1.2 <-> Q1.2 <-> R1.2 <-> R1.2 + C1.+ <-> Q1.1 <-> R1.1 <-> R1.1 + C1.+ <-> Q1.1 <-> R1.1 <-> R1.1 + C1.+ <-> R1.2 + C1.+ <-> R1.2 + C1.- <-> D1.A <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.1 <-> VR1.2 + C1.- <-> D1.A <-> R1.1 <-> R1.1 <-> R1.2 <-> VR1.1 <-> VR1.2 + C1.- <-> R1.1 + C1.- <-> R1.1 + C2.1 <-> D1.K <-> Q1.2 <-> R1.2 <-> R1.2 + C2.1 <-> D1.K <-> Q1.2 <-> R1.2 <-> R1.2 C2.2 <-> R1.2 C2.2 <-> R1.2 - Q1.3 <-> VR1.1 - Q1.3 <-> VR1.1 + Q1.3 <-> VR1.3 + Q1.3 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/194_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/194_excl_switches.txt index fea7afe23..ed167483a 100644 --- a/diylc-regression-data/input/cloud/netlist/194_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/194_excl_switches.txt @@ -1,28 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 40106n.1 <-> C1.1 <-> R2.2 40106n.1 <-> C1.1 <-> R2.2 - 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.2 <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 - 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.2 <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 + 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.- <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 + 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.- <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 40106n.2 <-> C2.1 - 40106n.2 <-> C2.1 <-> VR1.3 + 40106n.2 <-> C2.1 <-> VR1.1 40106n.3 <-> C2.2 <-> R3.1 40106n.3 <-> C2.2 <-> R3.1 40106n.4 <-> 40106n.5 40106n.4 <-> 40106n.5 40106n.6 <-> ad781.6 40106n.6 <-> ad781.6 - 40106n.8 <-> C5.2 <-> C8.1 <-> Q1.1 - 40106n.8 <-> C5.2 <-> C8.1 <-> Q1.1 - ad781.1 <-> C2.1 <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 - ad781.1 <-> C2.1 <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 + 40106n.8 <-> C5.2 <-> C8.+ <-> Q1.1 + 40106n.8 <-> C5.2 <-> C8.+ <-> Q1.1 + ad781.1 <-> C2.+ <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 + ad781.1 <-> C2.+ <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 ad781.2 <-> R1.2 ad781.2 <-> R1.2 - ad781.8 <-> C2.2 <-> C3.1 <-> IC1.8 - ad781.8 <-> C2.2 <-> C3.1 <-> IC1.8 - C1.1 <-> IC1.2 - C1.1 <-> IC1.2 - C1.2 <-> IC1.4 - C1.2 <-> IC1.4 - R2.1 <-> VR1.1 <-> VR1.2 + ad781.8 <-> C2.- <-> C3.1 <-> IC1.8 + ad781.8 <-> C2.- <-> C3.1 <-> IC1.8 + C1.+ <-> IC1.2 + C1.+ <-> IC1.2 + C1.- <-> IC1.4 + C1.- <-> IC1.4 + R2.1 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/194_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/194_incl_switches.txt index fea7afe23..ed167483a 100644 --- a/diylc-regression-data/input/cloud/netlist/194_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/194_incl_switches.txt @@ -1,28 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 40106n.1 <-> C1.1 <-> R2.2 40106n.1 <-> C1.1 <-> R2.2 - 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.2 <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 - 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.2 <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 + 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.- <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 + 40106n.11 <-> 40106n.13 <-> 40106n.7 <-> 40106n.9 <-> ad781.3 <-> C1.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C5.1 <-> C8.- <-> IC1.3 <-> Q1.2 <-> R1.1 <-> R3.2 40106n.2 <-> C2.1 - 40106n.2 <-> C2.1 <-> VR1.3 + 40106n.2 <-> C2.1 <-> VR1.1 40106n.3 <-> C2.2 <-> R3.1 40106n.3 <-> C2.2 <-> R3.1 40106n.4 <-> 40106n.5 40106n.4 <-> 40106n.5 40106n.6 <-> ad781.6 40106n.6 <-> ad781.6 - 40106n.8 <-> C5.2 <-> C8.1 <-> Q1.1 - 40106n.8 <-> C5.2 <-> C8.1 <-> Q1.1 - ad781.1 <-> C2.1 <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 - ad781.1 <-> C2.1 <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 + 40106n.8 <-> C5.2 <-> C8.+ <-> Q1.1 + 40106n.8 <-> C5.2 <-> C8.+ <-> Q1.1 + ad781.1 <-> C2.+ <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 + ad781.1 <-> C2.+ <-> C4.2 <-> IC1.1 <-> IC1.5 <-> Q1.3 ad781.2 <-> R1.2 ad781.2 <-> R1.2 - ad781.8 <-> C2.2 <-> C3.1 <-> IC1.8 - ad781.8 <-> C2.2 <-> C3.1 <-> IC1.8 - C1.1 <-> IC1.2 - C1.1 <-> IC1.2 - C1.2 <-> IC1.4 - C1.2 <-> IC1.4 - R2.1 <-> VR1.1 <-> VR1.2 + ad781.8 <-> C2.- <-> C3.1 <-> IC1.8 + ad781.8 <-> C2.- <-> C3.1 <-> IC1.8 + C1.+ <-> IC1.2 + C1.+ <-> IC1.2 + C1.- <-> IC1.4 + C1.- <-> IC1.4 + R2.1 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/195_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/195_excl_switches.txt index 3ba795f87..a7c01144d 100644 --- a/diylc-regression-data/input/cloud/netlist/195_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/195_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 - C1.1 <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 - C1.1 <-> C2.2 <-> Q1.3 <-> R1.1 - C1.1 <-> C2.2 <-> Q1.3 <-> R1.1 - C1.2 <-> Volume.3 - C1.2 <-> Volume.3 + C1.+ <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 + C1.+ <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 + C1.+ <-> C2.2 <-> Q1.3 <-> R1.1 + C1.+ <-> C2.2 <-> Q1.3 <-> R1.1 + C1.- <-> Volume.1 + C1.- <-> Volume.1 C2.1 <-> R1.2 <-> R1.2 C2.1 <-> R1.2 <-> R1.2 - C2.2 <-> R1.2 <-> R1.2 <-> Volume.1 - C2.2 <-> R1.2 <-> R1.2 <-> Volume.1 + C2.2 <-> R1.2 <-> R1.2 <-> Volume.3 + C2.2 <-> R1.2 <-> R1.2 <-> Volume.3 Q1.1 <-> R1.1 Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/195_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/195_incl_switches.txt index 3ba795f87..a7c01144d 100644 --- a/diylc-regression-data/input/cloud/netlist/195_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/195_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 - C1.1 <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 - C1.1 <-> C2.2 <-> Q1.3 <-> R1.1 - C1.1 <-> C2.2 <-> Q1.3 <-> R1.1 - C1.2 <-> Volume.3 - C1.2 <-> Volume.3 + C1.+ <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 + C1.+ <-> C2.1 <-> Q1.2 <-> R1.1 <-> R1.1 + C1.+ <-> C2.2 <-> Q1.3 <-> R1.1 + C1.+ <-> C2.2 <-> Q1.3 <-> R1.1 + C1.- <-> Volume.1 + C1.- <-> Volume.1 C2.1 <-> R1.2 <-> R1.2 C2.1 <-> R1.2 <-> R1.2 - C2.2 <-> R1.2 <-> R1.2 <-> Volume.1 - C2.2 <-> R1.2 <-> R1.2 <-> Volume.1 + C2.2 <-> R1.2 <-> R1.2 <-> Volume.3 + C2.2 <-> R1.2 <-> R1.2 <-> Volume.3 Q1.1 <-> R1.1 Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt index 52db58d32..d0e601d1c 100644 --- a/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt @@ -1,49 +1,49 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C15.1 - .1 <-> C15.1 - .2 <-> C9.2 <-> R2.1 - .2 <-> C9.2 <-> R2.1 <-> Tone.1 - .3 <-> C16.1 - .3 <-> C16.1 - .4 <-> C15.2 - .4 <-> C15.2 - .5 <-> C10.1 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - .5 <-> C10.1 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - .6 <-> C16.2 - .6 <-> C16.2 - C1.1 <-> Q1.3 <-> R3.1 - C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> Volume.1 - C10.2 <-> D2.2 <-> D3.1 - C10.2 <-> D2.2 <-> D3.1 - C11.1 <-> D2.1 <-> D3.2 - C11.1 <-> D2.1 <-> D3.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 - C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.- <-> Volume.3 + C10.1 <-> C8.2 <-> C9.1 <-> on/off/on.5 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 + C10.1 <-> C8.2 <-> C9.1 <-> on/off/on.5 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 + C10.2 <-> D2.K <-> D3.A + C10.2 <-> D2.K <-> D3.A + C11.1 <-> D2.A <-> D3.K + C11.1 <-> D2.A <-> D3.K + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.- <-> C4.- <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 + C12.1 <-> C17.2 <-> C4.- <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 - C12.2 <-> R11.1 <-> Tone.3 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C2.2 <-> R9.1 - C2.2 <-> R9.1 - C5.2 <-> R21.2 - C5.2 <-> R21.2 - C6.2 <-> R12.1 - C6.2 <-> R12.1 + C12.2 <-> R11.1 <-> Tone.1 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C15.1 <-> on/off/on.1 + C15.1 <-> on/off/on.1 + C15.2 <-> on/off/on.4 + C15.2 <-> on/off/on.4 + C16.1 <-> on/off/on.3 + C16.1 <-> on/off/on.3 + C16.2 <-> on/off/on.6 + C16.2 <-> on/off/on.6 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C2.- <-> R9.1 + C2.- <-> R9.1 + C5.- <-> R21.2 + C5.- <-> R21.2 + C6.- <-> R12.1 + C6.- <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.2 <-> Tone.2 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C9.2 <-> on/off/on.2 <-> R2.1 + C9.2 <-> on/off/on.2 <-> R2.1 <-> Tone.3 Q1.1 <-> R7.2 Q1.1 <-> R7.2 Q2.1 <-> R19.2 diff --git a/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt index 8f80f10b9..748ab9044 100644 --- a/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt @@ -1,41 +1,41 @@ -Switch setup: [.ON1:.ON1] +Switch setup: [ on/off/on.ON1:on/off/on.ON1 ] - C1.1 <-> Q1.3 <-> R3.1 - C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> Volume.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.- <-> Volume.3 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - C10.2 <-> D2.2 <-> D3.1 - C10.2 <-> D2.2 <-> D3.1 - C11.1 <-> D2.1 <-> D3.2 - C11.1 <-> D2.1 <-> D3.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 - C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 + C10.2 <-> D2.K <-> D3.A + C10.2 <-> D2.K <-> D3.A + C11.1 <-> D2.A <-> D3.K + C11.1 <-> D2.A <-> D3.K + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.- <-> C4.- <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 + C12.1 <-> C17.2 <-> C4.- <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 - C12.2 <-> R11.1 <-> Tone.3 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 + C12.2 <-> R11.1 <-> Tone.1 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 C15.1 <-> C9.2 <-> R2.1 - C15.1 <-> C9.2 <-> R2.1 <-> Tone.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C2.2 <-> R9.1 - C2.2 <-> R9.1 - C5.2 <-> R21.2 - C5.2 <-> R21.2 - C6.2 <-> R12.1 - C6.2 <-> R12.1 + C15.1 <-> C9.2 <-> R2.1 <-> Tone.3 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C2.- <-> R9.1 + C2.- <-> R9.1 + C5.- <-> R21.2 + C5.- <-> R21.2 + C6.- <-> R12.1 + C6.- <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.2 <-> Tone.2 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 Q1.1 <-> R7.2 Q2.1 <-> R19.2 @@ -45,44 +45,44 @@ Switch setup: [.ON1:.ON1] Q4.1 <-> R4.2 Q4.1 <-> R4.2 -Switch setup: [.ON1:.ON2] +Switch setup: [ on/off/on.ON1:on/off/on.ON2 ] - C1.1 <-> Q1.3 <-> R3.1 - C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> Volume.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.- <-> Volume.3 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - C10.2 <-> D2.2 <-> D3.1 - C10.2 <-> D2.2 <-> D3.1 - C11.1 <-> D2.1 <-> D3.2 - C11.1 <-> D2.1 <-> D3.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 - C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 + C10.2 <-> D2.K <-> D3.A + C10.2 <-> D2.K <-> D3.A + C11.1 <-> D2.A <-> D3.K + C11.1 <-> D2.A <-> D3.K + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.- <-> C4.- <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 + C12.1 <-> C17.2 <-> C4.- <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 - C12.2 <-> R11.1 <-> Tone.3 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C15.1 <-> C9.2 <-> R2.1 <-> Tone.1 + C12.2 <-> R11.1 <-> Tone.1 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C15.1 <-> C9.2 <-> R2.1 <-> Tone.3 C16.1 <-> C9.2 <-> R2.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C2.2 <-> R9.1 - C2.2 <-> R9.1 - C5.2 <-> R21.2 - C5.2 <-> R21.2 - C6.2 <-> R12.1 - C6.2 <-> R12.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C2.- <-> R9.1 + C2.- <-> R9.1 + C5.- <-> R21.2 + C5.- <-> R21.2 + C6.- <-> R12.1 + C6.- <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.2 <-> Tone.2 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 Q1.1 <-> R7.2 Q2.1 <-> R19.2 @@ -92,44 +92,44 @@ Switch setup: [.ON1:.ON2] Q4.1 <-> R4.2 Q4.1 <-> R4.2 -Switch setup: [.ON2:.ON1] +Switch setup: [ on/off/on.ON2:on/off/on.ON1 ] - C1.1 <-> Q1.3 <-> R3.1 - C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> Volume.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.- <-> Volume.3 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - C10.2 <-> D2.2 <-> D3.1 - C10.2 <-> D2.2 <-> D3.1 - C11.1 <-> D2.1 <-> D3.2 - C11.1 <-> D2.1 <-> D3.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 - C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 + C10.2 <-> D2.K <-> D3.A + C10.2 <-> D2.K <-> D3.A + C11.1 <-> D2.A <-> D3.K + C11.1 <-> D2.A <-> D3.K + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.- <-> C4.- <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 + C12.1 <-> C17.2 <-> C4.- <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 - C12.2 <-> R11.1 <-> Tone.3 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 + C12.2 <-> R11.1 <-> Tone.1 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 C15.1 <-> C9.2 <-> R2.1 - C16.1 <-> C9.2 <-> R2.1 <-> Tone.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C2.2 <-> R9.1 - C2.2 <-> R9.1 - C5.2 <-> R21.2 - C5.2 <-> R21.2 - C6.2 <-> R12.1 - C6.2 <-> R12.1 + C16.1 <-> C9.2 <-> R2.1 <-> Tone.3 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C2.- <-> R9.1 + C2.- <-> R9.1 + C5.- <-> R21.2 + C5.- <-> R21.2 + C6.- <-> R12.1 + C6.- <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.2 <-> Tone.2 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 Q1.1 <-> R7.2 Q2.1 <-> R19.2 @@ -139,44 +139,44 @@ Switch setup: [.ON2:.ON1] Q4.1 <-> R4.2 Q4.1 <-> R4.2 -Switch setup: [.ON2:.ON2] +Switch setup: [ on/off/on.ON2:on/off/on.ON2 ] - C1.1 <-> Q1.3 <-> R3.1 - C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> Volume.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 + C1.- <-> Volume.3 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 - C10.2 <-> D2.2 <-> D3.1 - C10.2 <-> D2.2 <-> D3.1 - C11.1 <-> D2.1 <-> D3.2 - C11.1 <-> D2.1 <-> D3.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 - C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 - C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 + C10.2 <-> D2.K <-> D3.A + C10.2 <-> D2.K <-> D3.A + C11.1 <-> D2.A <-> D3.K + C11.1 <-> D2.A <-> D3.K + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C11.2 <-> C14.2 <-> C5.+ <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.- <-> C4.- <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 + C12.1 <-> C17.2 <-> C4.- <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 - C12.2 <-> R11.1 <-> Tone.3 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 - C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 + C12.2 <-> R11.1 <-> Tone.1 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.1 <-> C2.+ <-> Q4.2 <-> R10.1 <-> R5.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C13.2 <-> C3.+ <-> Q4.3 <-> R10.2 <-> R8.2 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 + C14.1 <-> C6.+ <-> D2.K <-> D3.A <-> Q3.2 <-> R13.1 <-> R22.1 C16.1 <-> C9.2 <-> R2.1 - C16.1 <-> C9.2 <-> R2.1 <-> Tone.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 - C2.2 <-> R9.1 - C2.2 <-> R9.1 - C5.2 <-> R21.2 - C5.2 <-> R21.2 - C6.2 <-> R12.1 - C6.2 <-> R12.1 + C16.1 <-> C9.2 <-> R2.1 <-> Tone.3 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C17.1 <-> C4.+ <-> D1.K <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 + C2.- <-> R9.1 + C2.- <-> R9.1 + C5.- <-> R21.2 + C5.- <-> R21.2 + C6.- <-> R12.1 + C6.- <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.2 <-> Tone.2 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 - C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 + C8.1 <-> D2.A <-> D3.K <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 Q1.1 <-> R7.2 Q2.1 <-> R19.2 diff --git a/diylc-regression-data/input/cloud/netlist/197_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/197_excl_switches.txt index 63e0823a5..2d3672367 100644 --- a/diylc-regression-data/input/cloud/netlist/197_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/197_excl_switches.txt @@ -1,25 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C7.2 - .1 <-> C7.2 - .2 <-> C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 - .2 <-> C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.2 <-> IC1.3 <-> R2.1 C1.2 <-> IC1.3 <-> R2.1 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.2 <-> R6.1 <-> R7.1 C2.2 <-> R6.1 <-> R7.1 C3.1 <-> IC1.5 <-> R7.2 C3.1 <-> IC1.5 <-> R7.2 + C3.2 <-> C6.2 <-> C9.+ <-> Cab Type.2 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C9.+ <-> Cab Type.2 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.2 <-> R3.2 <-> R9.1 @@ -28,12 +26,14 @@ Switch setup: [Default] C5.1 <-> R17.2 C6.1 <-> C7.1 <-> IC1.12 <-> R9.2 C6.1 <-> C7.1 <-> IC1.12 <-> R9.2 + C7.2 <-> Cab Type.1 + C7.2 <-> Cab Type.1 C8.1 <-> R15.1 C8.1 <-> R15.1 C8.2 <-> IC1.8 <-> R11.2 C8.2 <-> IC1.8 <-> R11.2 - D1.2 <-> D2.1 <-> R12.2 - D1.2 <-> D2.1 <-> R12.2 + D1.K <-> D2.A <-> R12.2 + D1.K <-> D2.A <-> R12.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.9 <-> R10.2 <-> R11.1 diff --git a/diylc-regression-data/input/cloud/netlist/197_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/197_incl_switches.txt index abdc57179..813b5cb32 100644 --- a/diylc-regression-data/input/cloud/netlist/197_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/197_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [.ON1:.ON1:.ON1, .ON1:.ON1:.ON2] +Switch setup: [ Cab Type.ON1:Cab Type.ON1 ] C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.2 <-> IC1.3 <-> R2.1 C1.2 <-> IC1.3 <-> R2.1 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.2 <-> R6.1 <-> R7.1 C2.2 <-> R6.1 <-> R7.1 C3.1 <-> IC1.5 <-> R7.2 C3.1 <-> IC1.5 <-> R7.2 - C3.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 - C3.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C7.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C7.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.2 <-> R3.2 <-> R9.1 @@ -30,8 +30,8 @@ Switch setup: [.ON1:.ON1:.ON1, .ON1:.ON1:.ON2] C8.1 <-> R15.1 C8.2 <-> IC1.8 <-> R11.2 C8.2 <-> IC1.8 <-> R11.2 - D1.2 <-> D2.1 <-> R12.2 - D1.2 <-> D2.1 <-> R12.2 + D1.K <-> D2.A <-> R12.2 + D1.K <-> D2.A <-> R12.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.9 <-> R10.2 <-> R11.1 @@ -41,26 +41,26 @@ Switch setup: [.ON1:.ON1:.ON1, .ON1:.ON1:.ON2] R16.2 <-> R17.1 R16.2 <-> R17.1 -Switch setup: [.ON1:.ON2:.ON1, .ON1:.ON2:.ON2] +Switch setup: [ Cab Type.ON1:Cab Type.ON2 ] C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.2 <-> IC1.3 <-> R2.1 C1.2 <-> IC1.3 <-> R2.1 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.2 <-> R6.1 <-> R7.1 C2.2 <-> R6.1 <-> R7.1 C3.1 <-> IC1.5 <-> R7.2 C3.1 <-> IC1.5 <-> R7.2 - C3.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 - C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C7.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.2 <-> R3.2 <-> R9.1 @@ -73,8 +73,8 @@ Switch setup: [.ON1:.ON2:.ON1, .ON1:.ON2:.ON2] C8.1 <-> R15.1 C8.2 <-> IC1.8 <-> R11.2 C8.2 <-> IC1.8 <-> R11.2 - D1.2 <-> D2.1 <-> R12.2 - D1.2 <-> D2.1 <-> R12.2 + D1.K <-> D2.A <-> R12.2 + D1.K <-> D2.A <-> R12.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.9 <-> R10.2 <-> R11.1 @@ -84,26 +84,26 @@ Switch setup: [.ON1:.ON2:.ON1, .ON1:.ON2:.ON2] R16.2 <-> R17.1 R16.2 <-> R17.1 -Switch setup: [.ON2:.ON1:.ON1, .ON2:.ON1:.ON2] +Switch setup: [ Cab Type.ON2:Cab Type.ON1 ] C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.2 <-> IC1.3 <-> R2.1 C1.2 <-> IC1.3 <-> R2.1 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.2 <-> R6.1 <-> R7.1 C2.2 <-> R6.1 <-> R7.1 C3.1 <-> IC1.5 <-> R7.2 C3.1 <-> IC1.5 <-> R7.2 - C3.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 - C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C7.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.2 <-> R3.2 <-> R9.1 @@ -116,8 +116,8 @@ Switch setup: [.ON2:.ON1:.ON1, .ON2:.ON1:.ON2] C8.1 <-> R15.1 C8.2 <-> IC1.8 <-> R11.2 C8.2 <-> IC1.8 <-> R11.2 - D1.2 <-> D2.1 <-> R12.2 - D1.2 <-> D2.1 <-> R12.2 + D1.K <-> D2.A <-> R12.2 + D1.K <-> D2.A <-> R12.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.9 <-> R10.2 <-> R11.1 @@ -127,26 +127,26 @@ Switch setup: [.ON2:.ON1:.ON1, .ON2:.ON1:.ON2] R16.2 <-> R17.1 R16.2 <-> R17.1 -Switch setup: [.ON2:.ON2:.ON1, .ON2:.ON2:.ON2] +Switch setup: [ Cab Type.ON2:Cab Type.ON2 ] C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.1 <-> R1.1 <-> R4.1 <-> R5.1 C1.2 <-> IC1.3 <-> R2.1 C1.2 <-> IC1.3 <-> R2.1 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.1 <-> D2.2 <-> D3.2 <-> IC1.4 <-> R18.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C10.2 <-> C11.2 <-> C9.2 <-> D1.1 <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 - C11.1 <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.+ <-> D2.K <-> D3.K <-> IC1.4 <-> R18.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C10.- <-> C11.- <-> C9.- <-> D1.A <-> IC1.11 <-> R13.2 <-> R5.2 <-> R8.2 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 + C11.+ <-> R12.1 <-> R13.1 <-> R14.1 <-> R16.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C2.2 <-> R6.1 <-> R7.1 C2.2 <-> R6.1 <-> R7.1 C3.1 <-> IC1.5 <-> R7.2 C3.1 <-> IC1.5 <-> R7.2 - C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 - C3.2 <-> C6.2 <-> C9.1 <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 + C3.2 <-> C6.2 <-> C9.+ <-> IC1.10 <-> R18.1 <-> R2.2 <-> R8.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.1 <-> C5.2 <-> IC1.13 <-> IC1.14 <-> R10.1 C4.2 <-> R3.2 <-> R9.1 @@ -159,8 +159,8 @@ Switch setup: [.ON2:.ON2:.ON1, .ON2:.ON2:.ON2] C8.1 <-> R15.1 C8.2 <-> IC1.8 <-> R11.2 C8.2 <-> IC1.8 <-> R11.2 - D1.2 <-> D2.1 <-> R12.2 - D1.2 <-> D2.1 <-> R12.2 + D1.K <-> D2.A <-> R12.2 + D1.K <-> D2.A <-> R12.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.1 <-> IC1.2 <-> R6.2 IC1.9 <-> R10.2 <-> R11.1 diff --git a/diylc-regression-data/input/cloud/netlist/198_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/198_excl_switches.txt index a0e132949..2d282c3d6 100644 --- a/diylc-regression-data/input/cloud/netlist/198_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/198_excl_switches.txt @@ -1,45 +1,45 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - *.1 <-> IC2.3 <-> R29.2 <-> R7.1 - *.1 <-> IC2.3 <-> R29.2 <-> R7.1 <-> Tone.1 - *.1 <-> Tone.2 - *.2 <-> C1.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 - *.2 <-> C1.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 - *.2 <-> R31.2 - *.2 <-> R31.2 - Balance.1 <-> C22.1 + *.+ <-> IC2.3 <-> R29.2 <-> R7.1 + *.+ <-> IC2.3 <-> R29.2 <-> R7.1 <-> Tone.3 + *.+ <-> Tone.2 + *.- <-> C1.- <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 + *.- <-> C1.- <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 + *.- <-> R31.2 + *.- <-> R31.2 + Balance.1 <-> C1.+ <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 Balance.2 <-> R32.2 - Balance.3 <-> C1.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 - C1.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 - C2.1 <-> IC1.3 <-> R3.1 - C2.1 <-> IC1.3 <-> R3.1 - C2.2 <-> R4.1 - C2.2 <-> R4.1 + Balance.3 <-> C22.1 + C1.+ <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 + C2.+ <-> IC1.3 <-> R3.1 + C2.+ <-> IC1.3 <-> R3.1 + C2.- <-> R4.1 + C2.- <-> R4.1 C22.1 <-> R32.1 C22.1 <-> R32.1 C22.2 <-> IC2.1 <-> R30.1 C22.2 <-> IC2.1 <-> R30.1 C22.2 <-> IC2.8 <-> R8.1 C22.2 <-> IC2.8 <-> R8.1 - C23.1 <-> R33.2 - C23.1 <-> R33.2 - C23.2 <-> R34.1 - C23.2 <-> R34.1 + C23.+ <-> R33.2 + C23.+ <-> R33.2 + C23.- <-> R34.1 + C23.- <-> R34.1 C3.1 <-> R5.2 C3.1 <-> R5.2 C4.1 <-> IC1.1 <-> IC1.2 C4.1 <-> IC1.1 <-> IC1.2 C4.2 <-> IC1.8 <-> R6.1 C4.2 <-> IC1.8 <-> R6.1 - C5.1 <-> D1.2 <-> D2.1 <-> Drive.3 <-> IC1.6 <-> R29.1 - C5.1 <-> D1.2 <-> D2.1 <-> IC1.6 <-> R29.1 - C5.2 <-> D1.1 <-> D2.2 <-> IC1.7 <-> R28.1 <-> R5.1 - C5.2 <-> D1.1 <-> D2.2 <-> IC1.7 <-> R28.1 <-> R5.1 - Drive.1 <-> Drive.2 <-> R28.2 + C5.1 <-> D1.K <-> D2.A <-> Drive.1 <-> IC1.6 <-> R29.1 + C5.1 <-> D1.K <-> D2.A <-> IC1.6 <-> R29.1 + C5.2 <-> D1.A <-> D2.K <-> IC1.7 <-> R28.1 <-> R5.1 + C5.2 <-> D1.A <-> D2.K <-> IC1.7 <-> R28.1 <-> R5.1 + Drive.2 <-> Drive.3 <-> R28.2 IC1.5 <-> IC2.5 <-> R2.1 IC1.5 <-> IC2.5 <-> R2.1 IC2.2 <-> R30.2 - IC2.2 <-> R30.2 <-> Tone.3 + IC2.2 <-> R30.2 <-> Tone.1 IC2.6 <-> IC2.7 <-> R33.1 IC2.6 <-> IC2.7 <-> R33.1 diff --git a/diylc-regression-data/input/cloud/netlist/198_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/198_incl_switches.txt index a0e132949..2d282c3d6 100644 --- a/diylc-regression-data/input/cloud/netlist/198_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/198_incl_switches.txt @@ -1,45 +1,45 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - *.1 <-> IC2.3 <-> R29.2 <-> R7.1 - *.1 <-> IC2.3 <-> R29.2 <-> R7.1 <-> Tone.1 - *.1 <-> Tone.2 - *.2 <-> C1.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 - *.2 <-> C1.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 - *.2 <-> R31.2 - *.2 <-> R31.2 - Balance.1 <-> C22.1 + *.+ <-> IC2.3 <-> R29.2 <-> R7.1 + *.+ <-> IC2.3 <-> R29.2 <-> R7.1 <-> Tone.3 + *.+ <-> Tone.2 + *.- <-> C1.- <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 + *.- <-> C1.- <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R31.1 <-> R34.2 + *.- <-> R31.2 + *.- <-> R31.2 + Balance.1 <-> C1.+ <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 Balance.2 <-> R32.2 - Balance.3 <-> C1.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 - C1.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 - C2.1 <-> IC1.3 <-> R3.1 - C2.1 <-> IC1.3 <-> R3.1 - C2.2 <-> R4.1 - C2.2 <-> R4.1 + Balance.3 <-> C22.1 + C1.+ <-> C3.2 <-> R1.2 <-> R2.2 <-> R3.2 <-> R6.2 <-> R7.2 <-> R8.2 + C2.+ <-> IC1.3 <-> R3.1 + C2.+ <-> IC1.3 <-> R3.1 + C2.- <-> R4.1 + C2.- <-> R4.1 C22.1 <-> R32.1 C22.1 <-> R32.1 C22.2 <-> IC2.1 <-> R30.1 C22.2 <-> IC2.1 <-> R30.1 C22.2 <-> IC2.8 <-> R8.1 C22.2 <-> IC2.8 <-> R8.1 - C23.1 <-> R33.2 - C23.1 <-> R33.2 - C23.2 <-> R34.1 - C23.2 <-> R34.1 + C23.+ <-> R33.2 + C23.+ <-> R33.2 + C23.- <-> R34.1 + C23.- <-> R34.1 C3.1 <-> R5.2 C3.1 <-> R5.2 C4.1 <-> IC1.1 <-> IC1.2 C4.1 <-> IC1.1 <-> IC1.2 C4.2 <-> IC1.8 <-> R6.1 C4.2 <-> IC1.8 <-> R6.1 - C5.1 <-> D1.2 <-> D2.1 <-> Drive.3 <-> IC1.6 <-> R29.1 - C5.1 <-> D1.2 <-> D2.1 <-> IC1.6 <-> R29.1 - C5.2 <-> D1.1 <-> D2.2 <-> IC1.7 <-> R28.1 <-> R5.1 - C5.2 <-> D1.1 <-> D2.2 <-> IC1.7 <-> R28.1 <-> R5.1 - Drive.1 <-> Drive.2 <-> R28.2 + C5.1 <-> D1.K <-> D2.A <-> Drive.1 <-> IC1.6 <-> R29.1 + C5.1 <-> D1.K <-> D2.A <-> IC1.6 <-> R29.1 + C5.2 <-> D1.A <-> D2.K <-> IC1.7 <-> R28.1 <-> R5.1 + C5.2 <-> D1.A <-> D2.K <-> IC1.7 <-> R28.1 <-> R5.1 + Drive.2 <-> Drive.3 <-> R28.2 IC1.5 <-> IC2.5 <-> R2.1 IC1.5 <-> IC2.5 <-> R2.1 IC2.2 <-> R30.2 - IC2.2 <-> R30.2 <-> Tone.3 + IC2.2 <-> R30.2 <-> Tone.1 IC2.6 <-> IC2.7 <-> R33.1 IC2.6 <-> IC2.7 <-> R33.1 diff --git a/diylc-regression-data/input/cloud/netlist/199_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/199_excl_switches.txt index 5c9d93692..bafaf05bd 100644 --- a/diylc-regression-data/input/cloud/netlist/199_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/199_excl_switches.txt @@ -1,21 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - .1 <-> C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - .2 <-> R5.1 - .2 <-> R5.1 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> R17.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -32,28 +28,30 @@ Switch setup: [Default] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 + C17.2 <-> C23.+ <-> IC1.5 <-> Momentary Stomp .1 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Momentary Stomp .1 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C2.1 <-> IC2.1 <-> Q1.1 - C2.1 <-> IC2.1 <-> Q1.1 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 - C21.2 <-> IC1.6 <-> R9.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C2.+ <-> IC2.1 <-> Q1.1 + C2.+ <-> IC2.1 <-> Q1.1 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 + C21.- <-> IC1.6 <-> R9.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -66,14 +64,16 @@ Switch setup: [Default] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 + Momentary Stomp .2 <-> R5.1 + Momentary Stomp .2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/199_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/199_incl_switches.txt index 63efa463c..c54afc33f 100644 --- a/diylc-regression-data/input/cloud/netlist/199_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/199_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [.ON1:.ON1] +Switch setup: [ Momentary Stomp .ON1:Momentary Stomp .ON1 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> R17.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -28,30 +28,30 @@ Switch setup: [.ON1:.ON1] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C2.1 <-> IC2.1 <-> Q1.1 - C2.1 <-> IC2.1 <-> Q1.1 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 - C21.2 <-> IC1.6 <-> R9.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C2.+ <-> IC2.1 <-> Q1.1 + C2.+ <-> IC2.1 <-> Q1.1 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 + C21.- <-> IC1.6 <-> R9.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -64,31 +64,31 @@ Switch setup: [.ON1:.ON1] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON1:.ON2] +Switch setup: [ Momentary Stomp .ON1:Momentary Stomp .ON2 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> R17.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -105,30 +105,30 @@ Switch setup: [.ON1:.ON2] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C2.1 <-> IC2.1 <-> Q1.1 - C2.1 <-> IC2.1 <-> Q1.1 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 - C21.2 <-> IC1.6 <-> R9.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C2.+ <-> IC2.1 <-> Q1.1 + C2.+ <-> IC2.1 <-> Q1.1 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 + C21.- <-> IC1.6 <-> R9.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -141,31 +141,31 @@ Switch setup: [.ON1:.ON2] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON2:.ON1] +Switch setup: [ Momentary Stomp .ON2:Momentary Stomp .ON1 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> R17.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -182,30 +182,30 @@ Switch setup: [.ON2:.ON1] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C2.1 <-> IC2.1 <-> Q1.1 - C2.1 <-> IC2.1 <-> Q1.1 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 - C21.2 <-> IC1.6 <-> R9.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C2.+ <-> IC2.1 <-> Q1.1 + C2.+ <-> IC2.1 <-> Q1.1 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 + C21.- <-> IC1.6 <-> R9.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -218,31 +218,31 @@ Switch setup: [.ON2:.ON1] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON2:.ON2] +Switch setup: [ Momentary Stomp .ON2:Momentary Stomp .ON2 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> R17.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -259,30 +259,30 @@ Switch setup: [.ON2:.ON2] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C2.1 <-> IC2.1 <-> Q1.1 - C2.1 <-> IC2.1 <-> Q1.1 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 - C21.2 <-> IC1.6 <-> R9.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C2.+ <-> IC2.1 <-> Q1.1 + C2.+ <-> IC2.1 <-> Q1.1 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 + C21.- <-> IC1.6 <-> R9.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -295,14 +295,14 @@ Switch setup: [.ON2:.ON2] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 diff --git a/diylc-regression-data/input/cloud/netlist/200_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/200_excl_switches.txt index 0cf95bdde..ae1ac6b08 100644 --- a/diylc-regression-data/input/cloud/netlist/200_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/200_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 C1.2 <-> IC1.3 - C2.1 <-> IC2.3 <-> VR1.2 <-> VR1.3 - C2.1 <-> IC2.3 <-> VR1.2 <-> VR1.3 + C2.1 <-> IC2.3 <-> VR1.1 <-> VR1.2 + C2.1 <-> IC2.3 <-> VR1.1 <-> VR1.2 C2.2 <-> IC2.2 C2.2 <-> IC2.2 C3.1 <-> R1.1 C3.1 <-> R1.1 C3.2 <-> IC2.4 C3.2 <-> IC2.4 - C4.1 <-> D1.1 <-> D2.2 <-> R1.2 - C4.1 <-> D1.1 <-> D2.2 <-> R1.2 - C4.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.1 - C4.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.1 - C5.1 <-> D2.2 <-> IC1.7 <-> IC2.8 - C5.1 <-> D2.2 <-> IC1.7 <-> IC2.8 + C4.1 <-> D1.A <-> D2.K <-> R1.2 + C4.1 <-> D1.A <-> D2.K <-> R1.2 + C4.2 <-> C5.- <-> D1.K <-> D2.A <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.3 + C4.2 <-> C5.- <-> D1.K <-> D2.A <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.3 + C5.+ <-> D2.K <-> IC1.7 <-> IC2.8 + C5.+ <-> D2.K <-> IC1.7 <-> IC2.8 IC1.1 <-> IC1.5 IC1.1 <-> IC1.5 IC1.8 <-> IC2.1 diff --git a/diylc-regression-data/input/cloud/netlist/200_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/200_incl_switches.txt index 0cf95bdde..ae1ac6b08 100644 --- a/diylc-regression-data/input/cloud/netlist/200_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/200_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 C1.2 <-> IC1.3 - C2.1 <-> IC2.3 <-> VR1.2 <-> VR1.3 - C2.1 <-> IC2.3 <-> VR1.2 <-> VR1.3 + C2.1 <-> IC2.3 <-> VR1.1 <-> VR1.2 + C2.1 <-> IC2.3 <-> VR1.1 <-> VR1.2 C2.2 <-> IC2.2 C2.2 <-> IC2.2 C3.1 <-> R1.1 C3.1 <-> R1.1 C3.2 <-> IC2.4 C3.2 <-> IC2.4 - C4.1 <-> D1.1 <-> D2.2 <-> R1.2 - C4.1 <-> D1.1 <-> D2.2 <-> R1.2 - C4.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.1 - C4.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.1 - C5.1 <-> D2.2 <-> IC1.7 <-> IC2.8 - C5.1 <-> D2.2 <-> IC1.7 <-> IC2.8 + C4.1 <-> D1.A <-> D2.K <-> R1.2 + C4.1 <-> D1.A <-> D2.K <-> R1.2 + C4.2 <-> C5.- <-> D1.K <-> D2.A <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.3 + C4.2 <-> C5.- <-> D1.K <-> D2.A <-> IC1.2 <-> IC1.4 <-> IC2.11 <-> IC2.13 <-> IC2.5 <-> IC2.7 <-> IC2.9 <-> VR1.3 + C5.+ <-> D2.K <-> IC1.7 <-> IC2.8 + C5.+ <-> D2.K <-> IC1.7 <-> IC2.8 IC1.1 <-> IC1.5 IC1.1 <-> IC1.5 IC1.8 <-> IC2.1 diff --git a/diylc-regression-data/input/cloud/netlist/201_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/201_excl_switches.txt index 09668c7bb..92f137a5f 100644 --- a/diylc-regression-data/input/cloud/netlist/201_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/201_excl_switches.txt @@ -1,27 +1,27 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> L3.2 .Sleeve <-> L8.1 .Tip <-> R3.1 1.Ring <-> 2.Tip <-> R4.2 <-> R7.1 - 1.Sleeve <-> 1.Tip <-> 16uF/475v.2 <-> 2.Sleeve <-> 22/50v.1 <-> 8uF/450v.2 <-> 8uF/450v.2 <-> R4.1 <-> VR1.3 - 10K/3W.1 <-> 22K/3W.2 <-> 470Ω/3W.2 <-> 8uF/450v.1 - 10K/3W.2 <-> 16uF/475v.1 <-> L5.1 <-> L7.2 <-> V3.8 - 1K5.1 <-> 22/50v.1 <-> V1.3 + 1.Sleeve <-> 1.Tip <-> 16uF/475v.- <-> 2.Sleeve <-> 22/50v.+ <-> 8uF/450v.- <-> 8uF/450v.- <-> R4.1 <-> VR1.1 + 10K/3W.1 <-> 22K/3W.2 <-> 470Ω/3W.2 <-> 8uF/450v.+ + 10K/3W.2 <-> 16uF/475v.+ <-> L5.1 <-> L7.2 <-> V3.8 + 1K5.1 <-> 22/50v.+ <-> V1.3 1K5.1 <-> R3.2 <-> V1.8 - 1K5.2 <-> 1K5.2 <-> 22/50v.2 <-> R6.2 + 1K5.2 <-> 1K5.2 <-> 22/50v.- <-> R6.2 2.Ring <-> R8.1 - 22/50v.2 <-> V2.1 <-> V2.8 - 22K/3W.1 <-> 8uF/450v.1 <-> R2.2 <-> R5.2 + 22/50v.- <-> V2.1 <-> V2.8 + 22K/3W.1 <-> 8uF/450v.+ <-> R2.2 <-> R5.2 470Ω/3W.1 <-> V2.4 C2.1 <-> R2.1 - C2.2 <-> VR1.1 + C2.2 <-> VR1.3 C3.1 <-> R5.1 <-> V1.6 C3.2 <-> R1.2 <-> R6.1 <-> V2.6 + L3.2 <-> SW1.2 L4.1 <-> V3.4 L5.2 <-> V3.2 - L6.1 <-> Pilot.2 - L6.2 <-> Pilot.1 + L6.1 <-> Pilot.K + L6.2 <-> Pilot.A L7.1 <-> V2.3 R1.1 <-> V2.5 R7.2 <-> R8.2 <-> V1.2 diff --git a/diylc-regression-data/input/cloud/netlist/201_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/201_incl_switches.txt index 975cf4fe6..d0d9c4edf 100644 --- a/diylc-regression-data/input/cloud/netlist/201_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/201_incl_switches.txt @@ -1,26 +1,26 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] .Sleeve <-> L8.1 .Tip <-> R3.1 1.Ring <-> 2.Tip <-> R4.2 <-> R7.1 - 1.Sleeve <-> 1.Tip <-> 16uF/475v.2 <-> 2.Sleeve <-> 22/50v.1 <-> 8uF/450v.2 <-> 8uF/450v.2 <-> R4.1 <-> VR1.3 - 10K/3W.1 <-> 22K/3W.2 <-> 470Ω/3W.2 <-> 8uF/450v.1 - 10K/3W.2 <-> 16uF/475v.1 <-> L5.1 <-> L7.2 <-> V3.8 - 1K5.1 <-> 22/50v.1 <-> V1.3 + 1.Sleeve <-> 1.Tip <-> 16uF/475v.- <-> 2.Sleeve <-> 22/50v.+ <-> 8uF/450v.- <-> 8uF/450v.- <-> R4.1 <-> VR1.1 + 10K/3W.1 <-> 22K/3W.2 <-> 470Ω/3W.2 <-> 8uF/450v.+ + 10K/3W.2 <-> 16uF/475v.+ <-> L5.1 <-> L7.2 <-> V3.8 + 1K5.1 <-> 22/50v.+ <-> V1.3 1K5.1 <-> R3.2 <-> V1.8 - 1K5.2 <-> 1K5.2 <-> 22/50v.2 <-> R6.2 + 1K5.2 <-> 1K5.2 <-> 22/50v.- <-> R6.2 2.Ring <-> R8.1 - 22/50v.2 <-> V2.1 <-> V2.8 - 22K/3W.1 <-> 8uF/450v.1 <-> R2.2 <-> R5.2 + 22/50v.- <-> V2.1 <-> V2.8 + 22K/3W.1 <-> 8uF/450v.+ <-> R2.2 <-> R5.2 470Ω/3W.1 <-> V2.4 C2.1 <-> R2.1 - C2.2 <-> VR1.1 + C2.2 <-> VR1.3 C3.1 <-> R5.1 <-> V1.6 C3.2 <-> R1.2 <-> R6.1 <-> V2.6 L4.1 <-> V3.4 L5.2 <-> V3.2 - L6.1 <-> Pilot.2 - L6.2 <-> Pilot.1 + L6.1 <-> Pilot.K + L6.2 <-> Pilot.A L7.1 <-> V2.3 R1.1 <-> V2.5 R7.2 <-> R8.2 <-> V1.2 diff --git a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt index 913a4578a..334e012dd 100644 --- a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.2 - .2 <-> C1.2 - .3 <-> C1.1 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C1.1 <-> C2.1 <-> SW1.3 + C1.2 <-> SW1.2 + C2.2 <-> SW1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt index 813757428..04d489e85 100644 --- a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt @@ -1,38 +1,38 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2] +Switch setup: [ SW1.ON1 ] C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 C1.1 <-> C2.1 C1.2 <-> C2.2 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 -Switch setup: [.ON2:.ON1, .ON2:.ON2] +Switch setup: [ SW1.ON2 ] C1.1 <-> C1.2 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/203_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/203_excl_switches.txt index 8990ad0af..113f43bd7 100644 --- a/diylc-regression-data/input/cloud/netlist/203_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/203_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC2.1 <-> IC2.2 C1.1 <-> R6.2 @@ -6,36 +6,36 @@ Switch setup: [Default] C1.2 <-> R6.2 C2.1 <-> IC2.3 <-> Q1.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C4.2 <-> C5.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R1.1 <-> R11.1 <-> R15.2 <-> R16.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> R7.2 <-> R9.1 <-> VR1.1 - C2.2 <-> C5.1 <-> C9.1 <-> R10.1 <-> R7.2 <-> R9.2 + C2.2 <-> C4.- <-> C5.1 <-> C7.- <-> C9.+ <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R16.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> R7.2 <-> R9.1 <-> VR1.1 + C2.2 <-> C5.1 <-> C9.+ <-> R10.1 <-> R7.2 <-> R9.2 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C4.1 <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C4.+ <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 C5.2 <-> R13.2 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.1 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.2 C6.2 <-> R11.1 C6.2 <-> R11.2 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 IC1.3 <-> R3.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.5 <-> IC2.4 <-> R10.2 <-> R4.1 <-> VR1.3 IC1.8 <-> R4.2 <-> R5.2 IC1.8 <-> R4.2 <-> R5.2 @@ -47,5 +47,5 @@ Switch setup: [Default] IC2.9 <-> VR1.2 Q1.3 <-> R8.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/203_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/203_incl_switches.txt index 8990ad0af..113f43bd7 100644 --- a/diylc-regression-data/input/cloud/netlist/203_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/203_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC2.1 <-> IC2.2 C1.1 <-> R6.2 @@ -6,36 +6,36 @@ Switch setup: [Default] C1.2 <-> R6.2 C2.1 <-> IC2.3 <-> Q1.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C4.2 <-> C5.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R1.1 <-> R11.1 <-> R15.2 <-> R16.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> R7.2 <-> R9.1 <-> VR1.1 - C2.2 <-> C5.1 <-> C9.1 <-> R10.1 <-> R7.2 <-> R9.2 + C2.2 <-> C4.- <-> C5.1 <-> C7.- <-> C9.+ <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R16.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> R7.2 <-> R9.1 <-> VR1.1 + C2.2 <-> C5.1 <-> C9.+ <-> R10.1 <-> R7.2 <-> R9.2 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C4.1 <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C4.+ <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 C5.2 <-> R13.2 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.1 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.2 C6.2 <-> R11.1 C6.2 <-> R11.2 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 IC1.3 <-> R3.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.5 <-> IC2.4 <-> R10.2 <-> R4.1 <-> VR1.3 IC1.8 <-> R4.2 <-> R5.2 IC1.8 <-> R4.2 <-> R5.2 @@ -47,5 +47,5 @@ Switch setup: [Default] IC2.9 <-> VR1.2 Q1.3 <-> R8.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/204_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/204_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/204_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/204_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/204_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/204_incl_switches.txt index 1760a2a9d..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/204_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/204_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [SW1.1, SW1.2, SW1.3] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt index 913a4578a..334e012dd 100644 --- a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.2 - .2 <-> C1.2 - .3 <-> C1.1 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C1.1 <-> C2.1 <-> SW1.3 + C1.2 <-> SW1.2 + C2.2 <-> SW1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt index 813757428..04d489e85 100644 --- a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt @@ -1,38 +1,38 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2] +Switch setup: [ SW1.ON1 ] C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 C1.1 <-> C2.1 C1.2 <-> C2.2 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 -Switch setup: [.ON2:.ON1, .ON2:.ON2] +Switch setup: [ SW1.ON2 ] C1.1 <-> C1.2 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/206_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/206_excl_switches.txt index c5877d8a6..632eaddc6 100644 --- a/diylc-regression-data/input/cloud/netlist/206_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/206_excl_switches.txt @@ -1,21 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - .1 <-> C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - .2 <-> R5.1 - .2 <-> R5.1 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> IC1.6 <-> R9.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> IC1.6 <-> R9.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -32,28 +28,30 @@ Switch setup: [Default] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Momentary Stomp .1 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Momentary Stomp .1 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 <-> R9.2 - C21.2 <-> R17.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 <-> R9.2 + C21.- <-> R17.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -66,14 +64,16 @@ Switch setup: [Default] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 + Momentary Stomp .2 <-> R5.1 + Momentary Stomp .2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/206_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/206_incl_switches.txt index 6550833fb..b5340c366 100644 --- a/diylc-regression-data/input/cloud/netlist/206_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/206_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [.ON1:.ON1] +Switch setup: [ Momentary Stomp .ON1:Momentary Stomp .ON1 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> IC1.6 <-> R9.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> IC1.6 <-> R9.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -28,30 +28,30 @@ Switch setup: [.ON1:.ON1] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 <-> R9.2 - C21.2 <-> R17.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 <-> R9.2 + C21.- <-> R17.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -64,31 +64,31 @@ Switch setup: [.ON1:.ON1] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON1:.ON2] +Switch setup: [ Momentary Stomp .ON1:Momentary Stomp .ON2 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> IC1.6 <-> R9.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> IC1.6 <-> R9.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -105,30 +105,30 @@ Switch setup: [.ON1:.ON2] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 <-> R9.2 - C21.2 <-> R17.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 <-> R9.2 + C21.- <-> R17.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -141,31 +141,31 @@ Switch setup: [.ON1:.ON2] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON2:.ON1] +Switch setup: [ Momentary Stomp .ON2:Momentary Stomp .ON1 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> IC1.6 <-> R9.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> IC1.6 <-> R9.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -182,30 +182,30 @@ Switch setup: [.ON2:.ON1] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R5.1 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 <-> R9.2 - C21.2 <-> R17.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 <-> R9.2 + C21.- <-> R17.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -218,31 +218,31 @@ Switch setup: [.ON2:.ON1] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 -Switch setup: [.ON2:.ON2] +Switch setup: [ Momentary Stomp .ON2:Momentary Stomp .ON2 ] - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.1 <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 - C1.2 <-> R10.1 - C1.2 <-> R10.1 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.+ <-> C12.1 <-> IC1.1 <-> R1.2 <-> R7.2 + C1.- <-> R10.1 + C1.- <-> R10.1 C10.1 <-> Feedback.2 <-> R16.1 C10.1 <-> Feedback.2 <-> R16.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 - C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.2 <-> C2.2 <-> C23.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> C8.2 <-> Feedback.3 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.3 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 + C10.2 <-> C14.2 <-> C17.1 <-> C17.1 <-> C17.1 <-> C18.2 <-> C19.- <-> C2.- <-> C23.- <-> C3.- <-> C4.- <-> C7.2 <-> C8.2 <-> Feedback.1 <-> IC1.4 <-> IC2.3 <-> IC2.4 <-> Mix.1 <-> Q1.2 <-> R12.2 <-> R3.2 <-> R4.1 <-> R6.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 C11.1 <-> IC1.7 <-> R11.2 <-> R7.1 <-> R9.1 - C11.2 <-> C21.1 <-> IC1.6 <-> R9.2 - C11.2 <-> C21.1 <-> R17.2 + C11.2 <-> C21.+ <-> IC1.6 <-> R9.2 + C11.2 <-> C21.+ <-> R17.2 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C12.2 <-> IC1.2 <-> R1.1 <-> R2.1 C13.1 <-> R3.1 @@ -259,30 +259,30 @@ Switch setup: [.ON2:.ON2] C16.1 <-> IC2.11 <-> R20.2 <-> R21.1 C16.2 <-> IC2.12 <-> R18.1 C16.2 <-> IC2.12 <-> R19.2 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C2.1 <-> IC2.1 <-> Q1.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 - C17.2 <-> C23.1 <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C2.+ <-> IC2.1 <-> Q1.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 + C17.2 <-> C23.+ <-> IC1.5 <-> Q1.3 <-> R8.1 C17.2 <-> IC2.8 C17.2 <-> IC2.8 C18.1 <-> IC2.7 C18.1 <-> IC2.7 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C19.1 <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 - C20.1 <-> R11.1 - C20.1 <-> R11.1 - C20.2 <-> Mix.2 - C20.2 <-> Mix.2 - C21.2 <-> IC1.6 <-> R9.2 - C21.2 <-> R17.2 - C22.1 <-> C8.1 <-> R20.1 - C22.1 <-> C8.1 <-> R20.1 - C22.2 <-> Mix.1 <-> R16.2 - C22.2 <-> Mix.1 <-> R16.2 - C3.1 <-> IC2.2 - C3.1 <-> IC2.2 - C4.1 <-> D1.1 <-> R5.2 - C4.1 <-> D1.1 <-> R5.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C19.+ <-> IC1.3 <-> IC1.8 <-> R12.1 <-> R8.2 + C20.+ <-> R11.1 + C20.+ <-> R11.1 + C20.- <-> Mix.2 + C20.- <-> Mix.2 + C21.- <-> IC1.6 <-> R9.2 + C21.- <-> R17.2 + C22.+ <-> C8.1 <-> R20.1 + C22.+ <-> C8.1 <-> R20.1 + C22.- <-> Mix.3 <-> R16.2 + C22.- <-> Mix.3 <-> R16.2 + C3.+ <-> IC2.2 + C3.+ <-> IC2.2 + C4.+ <-> D1.A <-> R5.2 + C4.+ <-> D1.A <-> R5.2 C5.1 <-> IC2.13 <-> R18.1 C5.1 <-> IC2.13 <-> R19.2 C5.2 <-> IC2.14 @@ -295,14 +295,14 @@ Switch setup: [.ON2:.ON2] C7.1 <-> R18.2 <-> R19.1 <-> R21.2 C9.1 <-> R15.2 C9.1 <-> R15.2 - C9.2 <-> Feedback.1 - C9.2 <-> Feedback.1 - D1.2 <-> Decay.2 <-> Decay.3 - D1.2 <-> Decay.2 <-> Decay.3 - Decay.1 <-> R4.2 - Decay.1 <-> R4.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - IC2.6 <-> LDR.1 <-> Time.1 <-> Time.2 - LDR.2 <-> R6.2 <-> Time.3 - LDR.2 <-> R6.2 <-> Time.3 + C9.2 <-> Feedback.3 + C9.2 <-> Feedback.3 + D1.K <-> Decay.1 <-> Decay.2 + D1.K <-> Decay.1 <-> Decay.2 + Decay.3 <-> R4.2 + Decay.3 <-> R4.2 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + IC2.6 <-> LDR.1 <-> Time.2 <-> Time.3 + LDR.2 <-> R6.2 <-> Time.1 + LDR.2 <-> R6.2 <-> Time.1 diff --git a/diylc-regression-data/input/cloud/netlist/207_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/207_excl_switches.txt index 87a01492b..5eb8fb339 100644 --- a/diylc-regression-data/input/cloud/netlist/207_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/207_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - J1.Sleeve <-> Series/Parallel.1 <-> Series/Parallel.3 <-> SW1.3 <-> Volume.3 + J1.Sleeve <-> Series/Parallel.1 <-> Series/Parallel.3 <-> SW1.3 <-> Volume.1 J1.Tip <-> Volume.2 Series/Parallel.2 <-> SW1.1 <-> SW1.5 - SW1.7 <-> Volume.1 + SW1.7 <-> Volume.3 diff --git a/diylc-regression-data/input/cloud/netlist/207_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/207_incl_switches.txt index de576f334..2caf814b5 100644 --- a/diylc-regression-data/input/cloud/netlist/207_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/207_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [SW1.1, SW1.3] +Switch setup: [ SW1.1,SW1.3 ] - J1.Sleeve <-> Series/Parallel.1 <-> Series/Parallel.3 <-> Volume.3 + J1.Sleeve <-> Series/Parallel.1 <-> Series/Parallel.3 <-> Volume.1 J1.Tip <-> Volume.2 - Series/Parallel.2 <-> Volume.1 + Series/Parallel.2 <-> Volume.3 -Switch setup: [SW1.2] +Switch setup: [ SW1.2 ] J1.Sleeve <-> Series/Parallel.1 <-> Series/Parallel.3 <-> Volume.1 <-> Volume.3 J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/208_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/208_excl_switches.txt index a5d773ea4..40ab96a36 100644 --- a/diylc-regression-data/input/cloud/netlist/208_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/208_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> R4.1 - C2.1 <-> C2.1 <-> C4.2 <-> D1.2 <-> Fuzz.3 <-> Q1.3 - C2.2 <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.3 - C2.2 <-> Fuzz.2 + C1.+ <-> Q1.2 <-> R4.1 + C2.+ <-> C2.+ <-> C4.2 <-> D1.K <-> Fuzz.1 <-> Q1.3 + C2.- <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.1 + C2.- <-> Fuzz.2 C3.1 <-> R2.2 <-> R3.2 - C3.2 <-> Volume.1 - Fuzz.1 <-> Q2.3 <-> R4.2 + C3.2 <-> Volume.3 + Fuzz.3 <-> Q2.3 <-> R4.2 Q1.1 <-> Q2.2 <-> R1.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/208_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/208_incl_switches.txt index a5d773ea4..40ab96a36 100644 --- a/diylc-regression-data/input/cloud/netlist/208_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/208_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> R4.1 - C2.1 <-> C2.1 <-> C4.2 <-> D1.2 <-> Fuzz.3 <-> Q1.3 - C2.2 <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.3 - C2.2 <-> Fuzz.2 + C1.+ <-> Q1.2 <-> R4.1 + C2.+ <-> C2.+ <-> C4.2 <-> D1.K <-> Fuzz.1 <-> Q1.3 + C2.- <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.1 + C2.- <-> Fuzz.2 C3.1 <-> R2.2 <-> R3.2 - C3.2 <-> Volume.1 - Fuzz.1 <-> Q2.3 <-> R4.2 + C3.2 <-> Volume.3 + Fuzz.3 <-> Q2.3 <-> R4.2 Q1.1 <-> Q2.2 <-> R1.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/209_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/209_excl_switches.txt index a5d773ea4..40ab96a36 100644 --- a/diylc-regression-data/input/cloud/netlist/209_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/209_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> R4.1 - C2.1 <-> C2.1 <-> C4.2 <-> D1.2 <-> Fuzz.3 <-> Q1.3 - C2.2 <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.3 - C2.2 <-> Fuzz.2 + C1.+ <-> Q1.2 <-> R4.1 + C2.+ <-> C2.+ <-> C4.2 <-> D1.K <-> Fuzz.1 <-> Q1.3 + C2.- <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.1 + C2.- <-> Fuzz.2 C3.1 <-> R2.2 <-> R3.2 - C3.2 <-> Volume.1 - Fuzz.1 <-> Q2.3 <-> R4.2 + C3.2 <-> Volume.3 + Fuzz.3 <-> Q2.3 <-> R4.2 Q1.1 <-> Q2.2 <-> R1.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/209_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/209_incl_switches.txt index a5d773ea4..40ab96a36 100644 --- a/diylc-regression-data/input/cloud/netlist/209_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/209_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> R4.1 - C2.1 <-> C2.1 <-> C4.2 <-> D1.2 <-> Fuzz.3 <-> Q1.3 - C2.2 <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.3 - C2.2 <-> Fuzz.2 + C1.+ <-> Q1.2 <-> R4.1 + C2.+ <-> C2.+ <-> C4.2 <-> D1.K <-> Fuzz.1 <-> Q1.3 + C2.- <-> C4.1 <-> R1.2 <-> R2.1 <-> Volume.1 + C2.- <-> Fuzz.2 C3.1 <-> R2.2 <-> R3.2 - C3.2 <-> Volume.1 - Fuzz.1 <-> Q2.3 <-> R4.2 + C3.2 <-> Volume.3 + Fuzz.3 <-> Q2.3 <-> R4.2 Q1.1 <-> Q2.2 <-> R1.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/210_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/210_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/210_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/210_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/210_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/210_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/210_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/210_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt index 19e8a0d8d..69375794c 100644 --- a/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 2K2.1 <-> 2K2.2 <-> 2K2.2 <-> C4.1 <-> C5.1 <-> C6.2 <-> C7.2 <-> D2.1 <-> D3.1 <-> D3.2 <-> D4.1 <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.1 <-> LM324.10 <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> LM324.8 <-> Q1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R3.2 <-> R3.2 <-> R5.2 <-> VR1.1 <-> VR2.1 <-> VR2.2 - 2K2.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> D1.2 <-> D4.2 <-> J3.Sleeve <-> LM324.11 <-> LM324.4 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R5.1 <-> VR1.3 - C1.1 <-> C1.2 <-> J1.Sleeve <-> LM324.2 <-> LM324.9 <-> R1.1 <-> R1.1 <-> R1.2 <-> R3.1 <-> R3.1 <-> R4.1 - C2.1 <-> C2.2 <-> J2.Sleeve <-> LM324.13 <-> LM324.6 <-> R1.1 <-> R2.1 <-> R2.2 - C3.1 <-> LM324.14 <-> LM324.7 <-> R1.2 - C3.2 <-> VR2.3 - D1.1 <-> D2.2 + 2K2.+ <-> 2K2.- <-> 2K2.- <-> C4.+ <-> C5.+ <-> C6.- <-> C7.- <-> D2.A <-> D3.A <-> D3.K <-> D4.A <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.1 <-> LM324.10 <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> LM324.8 <-> Q1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R3.2 <-> R3.2 <-> R5.2 <-> VR1.3 <-> VR2.2 <-> VR2.3 + 2K2.+ <-> C4.- <-> C5.- <-> C6.+ <-> C7.+ <-> D1.K <-> D4.K <-> J3.Sleeve <-> LM324.11 <-> LM324.4 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R5.1 <-> VR1.1 + C1.+ <-> C1.- <-> J1.Sleeve <-> LM324.2 <-> LM324.9 <-> R1.1 <-> R1.1 <-> R1.2 <-> R3.1 <-> R3.1 <-> R4.1 + C2.+ <-> C2.- <-> J2.Sleeve <-> LM324.13 <-> LM324.6 <-> R1.1 <-> R2.1 <-> R2.2 + C3.+ <-> LM324.14 <-> LM324.7 <-> R1.2 + C3.- <-> VR2.1 + D1.A <-> D2.K R4.2 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt index 19e8a0d8d..b8ebd004f 100644 --- a/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt @@ -1,11 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 2K2.1 <-> 2K2.2 <-> 2K2.2 <-> C4.1 <-> C5.1 <-> C6.2 <-> C7.2 <-> D2.1 <-> D3.1 <-> D3.2 <-> D4.1 <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.1 <-> LM324.10 <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> LM324.8 <-> Q1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R3.2 <-> R3.2 <-> R5.2 <-> VR1.1 <-> VR2.1 <-> VR2.2 - 2K2.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> D1.2 <-> D4.2 <-> J3.Sleeve <-> LM324.11 <-> LM324.4 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R5.1 <-> VR1.3 - C1.1 <-> C1.2 <-> J1.Sleeve <-> LM324.2 <-> LM324.9 <-> R1.1 <-> R1.1 <-> R1.2 <-> R3.1 <-> R3.1 <-> R4.1 - C2.1 <-> C2.2 <-> J2.Sleeve <-> LM324.13 <-> LM324.6 <-> R1.1 <-> R2.1 <-> R2.2 - C3.1 <-> LM324.14 <-> LM324.7 <-> R1.2 - C3.2 <-> VR2.3 - D1.1 <-> D2.2 + 2K2.+ <-> D1.K <-> D4.K <-> Q1.2 + 2K2.+ <-> D2.A <-> D3.A <-> Q2.2 + 2K2.- <-> 2K2.- <-> C6.- <-> C7.- <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.10 <-> LM324.3 <-> LM324.5 <-> Q1.1 <-> Q2.1 <-> R5.2 <-> VR1.3 <-> VR2.3 + C1.+ <-> J1.Sleeve + C1.- <-> R1.1 + C2.+ <-> J2.Sleeve + C2.- <-> R2.1 + C3.+ <-> LM324.7 <-> R1.2 + C3.- <-> VR2.1 + C4.+ <-> LM324.1 <-> R1.2 + C4.- <-> VR1.1 + C5.+ <-> LM324.8 <-> R3.2 + C5.- <-> J3.Sleeve <-> R5.1 + C6.+ <-> LM324.11 <-> Q2.3 + C7.+ <-> LM324.4 <-> Q1.3 + D1.A <-> D2.K + D3.K <-> D4.A + LM324.2 <-> R1.1 <-> R1.2 + LM324.6 <-> R1.1 <-> R2.2 + LM324.9 <-> R3.1 <-> R3.1 <-> R4.1 + R3.2 <-> VR2.2 R4.2 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt index 0d934139c..e93fa8ec9 100644 --- a/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C2.2 <-> C3.2 <-> GND - D2.1 <-> D2.2 - D4.1 <-> D4.2 + C1.- <-> C2.- <-> C3.2 <-> GND + D2.A <-> D2.K + D4.A <-> D4.K R10.1 <-> R2.2 R3.1 <-> R6.2 R5.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt index 0d934139c..e93fa8ec9 100644 --- a/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C2.2 <-> C3.2 <-> GND - D2.1 <-> D2.2 - D4.1 <-> D4.2 + C1.- <-> C2.- <-> C3.2 <-> GND + D2.A <-> D2.K + D4.A <-> D4.K R10.1 <-> R2.2 R3.1 <-> R6.2 R5.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/213_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/213_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/213_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/213_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/213_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/213_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/213_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/213_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/214_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/214_excl_switches.txt index 2b3d840f7..f5e0135f0 100644 --- a/diylc-regression-data/input/cloud/netlist/214_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/214_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC2.1 <-> IC2.2 C1.2 <-> R6.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C5.1 <-> C9.1 <-> R10.1 <-> R7.2 <-> R9.2 + C2.2 <-> C5.1 <-> C9.+ <-> R10.1 <-> R7.2 <-> R9.2 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.1 C6.2 <-> R11.1 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.5 <-> IC2.4 <-> R10.2 <-> R4.1 <-> VR1.3 IC1.8 <-> R4.2 <-> R5.2 IC2.13 <-> R12.2 <-> R13.1 IC2.6 <-> IC2.7 <-> Q1.1 IC2.9 <-> VR1.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/214_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/214_incl_switches.txt index 2b3d840f7..f5e0135f0 100644 --- a/diylc-regression-data/input/cloud/netlist/214_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/214_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC2.1 <-> IC2.2 C1.2 <-> R6.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C5.1 <-> C9.1 <-> R10.1 <-> R7.2 <-> R9.2 + C2.2 <-> C5.1 <-> C9.+ <-> R10.1 <-> R7.2 <-> R9.2 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.1 C6.2 <-> R11.1 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.2 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.5 <-> IC2.4 <-> R10.2 <-> R4.1 <-> VR1.3 IC1.8 <-> R4.2 <-> R5.2 IC2.13 <-> R12.2 <-> R13.1 IC2.6 <-> IC2.7 <-> Q1.1 IC2.9 <-> VR1.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/215_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/215_excl_switches.txt index ca15747e1..93c7eb4d6 100644 --- a/diylc-regression-data/input/cloud/netlist/215_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/215_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.2 C1.2 <-> IC2.1 <-> IC2.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C5.1 <-> C9.1 <-> R16.2 <-> R7.2 <-> R9.1 + C2.2 <-> C5.1 <-> C9.+ <-> R16.2 <-> R7.2 <-> R9.1 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C4.1 <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 - C4.2 <-> C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C4.+ <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 + C4.- <-> C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.2 C6.2 <-> R11.2 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.8 <-> R4.2 <-> R5.2 IC2.13 <-> R12.2 <-> R13.1 IC2.6 <-> IC2.7 <-> Q1.1 IC2.9 <-> VR1.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/215_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/215_incl_switches.txt index ca15747e1..93c7eb4d6 100644 --- a/diylc-regression-data/input/cloud/netlist/215_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/215_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.2 C1.2 <-> IC2.1 <-> IC2.2 C2.1 <-> IC2.3 <-> Q1.2 - C2.2 <-> C5.1 <-> C9.1 <-> R16.2 <-> R7.2 <-> R9.1 + C2.2 <-> C5.1 <-> C9.+ <-> R16.2 <-> R7.2 <-> R9.1 C3.1 <-> IC1.6 <-> IC1.7 <-> R3.1 - C3.2 <-> D3.1 <-> IC1.2 <-> R2.1 - C4.1 <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 - C4.2 <-> C7.2 <-> C9.2 <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 + C3.2 <-> D3.A <-> IC1.2 <-> R2.1 + C4.+ <-> IC1.5 <-> IC2.4 <-> R16.1 <-> R4.1 <-> VR1.3 + C4.- <-> C7.- <-> C9.- <-> IC1.4 <-> IC2.11 <-> R11.1 <-> R15.2 <-> R5.1 <-> R6.1 <-> R7.1 <-> VR1.1 C5.2 <-> R13.2 C6.1 <-> IC2.12 <-> IC2.5 <-> R9.2 C6.2 <-> R11.2 - C7.1 <-> IC2.10 <-> R14.1 <-> R15.1 - D3.1 <-> D3.2 <-> R2.2 - D3.1 <-> IC2.14 <-> R12.1 - D3.1 <-> Resolution.3 - D3.2 <-> IC2.8 - D3.2 <-> R14.2 - D3.2 <-> Resolution.1 + C7.+ <-> IC2.10 <-> R14.1 <-> R15.1 + D3.A <-> D3.K <-> R2.2 + D3.A <-> IC2.14 <-> R12.1 + D3.A <-> Resolution.1 + D3.K <-> IC2.8 + D3.K <-> R14.2 + D3.K <-> Resolution.3 IC1.1 <-> R1.2 <-> R8.1 <-> Resolution.2 - IC1.3 <-> R3.2 <-> Sample Rate.3 + IC1.3 <-> R3.2 <-> Sample Rate.1 IC1.8 <-> R4.2 <-> R5.2 IC2.13 <-> R12.2 <-> R13.1 IC2.6 <-> IC2.7 <-> Q1.1 IC2.9 <-> VR1.2 Q1.3 <-> R8.2 - R1.1 <-> Sample Rate.1 <-> Sample Rate.2 + R1.1 <-> Sample Rate.2 <-> Sample Rate.3 diff --git a/diylc-regression-data/input/cloud/netlist/216_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/216_excl_switches.txt index b233162fa..6248a1f0c 100644 --- a/diylc-regression-data/input/cloud/netlist/216_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/216_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Boost.1 <-> D1.1 <-> Q1.1 - Boost.2 <-> Boost.3 <-> C1.2 <-> C2.2 <-> R1.1 <-> R2.2 - C1.1 <-> C2.1 <-> D1.2 <-> R4.2 + Boost.1 <-> Boost.2 <-> C1.2 <-> C2.- <-> R1.1 <-> R2.2 + Boost.3 <-> D1.A <-> Q1.1 + C1.1 <-> C2.+ <-> D1.K <-> R4.2 C1.1 <-> R1.2 - C1.2 <-> D1.2 <-> Q1.2 <-> R2.1 <-> R3.1 - C3.1 <-> Q1.3 <-> R3.2 <-> R4.1 + C1.2 <-> D1.K <-> Q1.2 <-> R2.1 <-> R3.1 + C3.+ <-> Q1.3 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/216_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/216_incl_switches.txt index b233162fa..6248a1f0c 100644 --- a/diylc-regression-data/input/cloud/netlist/216_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/216_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Boost.1 <-> D1.1 <-> Q1.1 - Boost.2 <-> Boost.3 <-> C1.2 <-> C2.2 <-> R1.1 <-> R2.2 - C1.1 <-> C2.1 <-> D1.2 <-> R4.2 + Boost.1 <-> Boost.2 <-> C1.2 <-> C2.- <-> R1.1 <-> R2.2 + Boost.3 <-> D1.A <-> Q1.1 + C1.1 <-> C2.+ <-> D1.K <-> R4.2 C1.1 <-> R1.2 - C1.2 <-> D1.2 <-> Q1.2 <-> R2.1 <-> R3.1 - C3.1 <-> Q1.3 <-> R3.2 <-> R4.1 + C1.2 <-> D1.K <-> Q1.2 <-> R2.1 <-> R3.1 + C3.+ <-> Q1.3 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/217_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/217_excl_switches.txt index 94f97e97c..64af7d99d 100644 --- a/diylc-regression-data/input/cloud/netlist/217_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/217_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Boost.1 <-> D1.1 <-> Q1.1 - Boost.2 <-> Boost.3 <-> C1.2 <-> R1.1 <-> R2.2 - C1.1 <-> C2.1 <-> D1.2 <-> R4.2 + Boost.1 <-> Boost.2 <-> C1.2 <-> R1.1 <-> R2.2 + Boost.3 <-> D1.A <-> Q1.1 + C1.1 <-> C2.+ <-> D1.K <-> R4.2 C1.1 <-> R1.2 - C1.2 <-> D1.2 <-> Q1.2 <-> R2.1 <-> R3.1 - C3.1 <-> Q1.3 <-> R3.2 <-> R4.1 + C1.2 <-> D1.K <-> Q1.2 <-> R2.1 <-> R3.1 + C3.+ <-> Q1.3 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/217_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/217_incl_switches.txt index 94f97e97c..64af7d99d 100644 --- a/diylc-regression-data/input/cloud/netlist/217_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/217_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Boost.1 <-> D1.1 <-> Q1.1 - Boost.2 <-> Boost.3 <-> C1.2 <-> R1.1 <-> R2.2 - C1.1 <-> C2.1 <-> D1.2 <-> R4.2 + Boost.1 <-> Boost.2 <-> C1.2 <-> R1.1 <-> R2.2 + Boost.3 <-> D1.A <-> Q1.1 + C1.1 <-> C2.+ <-> D1.K <-> R4.2 C1.1 <-> R1.2 - C1.2 <-> D1.2 <-> Q1.2 <-> R2.1 <-> R3.1 - C3.1 <-> Q1.3 <-> R3.2 <-> R4.1 + C1.2 <-> D1.K <-> Q1.2 <-> R2.1 <-> R3.1 + C3.+ <-> Q1.3 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/218_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/218_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/218_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/218_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/218_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/218_incl_switches.txt index d9437c989..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/218_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/218_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/219_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/219_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/219_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/219_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/219_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/219_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/219_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/219_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt index 913a4578a..334e012dd 100644 --- a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.2 - .2 <-> C1.2 - .3 <-> C1.1 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C1.1 <-> C2.1 <-> SW1.3 + C1.2 <-> SW1.2 + C2.2 <-> SW1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt index 813757428..04d489e85 100644 --- a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt @@ -1,38 +1,38 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2] +Switch setup: [ SW1.ON1 ] C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 C1.1 <-> C2.1 C1.2 <-> C2.2 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 -Switch setup: [.ON2:.ON1, .ON2:.ON2] +Switch setup: [ SW1.ON2 ] C1.1 <-> C1.2 <-> C2.1 C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1 + C3.1 <-> D2.A <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 + C3.2 <-> C4.1 <-> Q1.1 <-> Q2.2 C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 - C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.A <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 C6.2 <-> Q3.Q3.0 - D2.1 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R1.2 - D2.1 <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 - D2.2 <-> R4.2 + D2.A <-> Q1.Q1.1 <-> Q2.Q2.1 <-> R1.2 + D2.K <-> R4.2 Q2.Q2.2 <-> R3.2 Q3.3 <-> R6.1 Q3.Q3.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/221_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/221_excl_switches.txt index 6caaddb1b..4c641411c 100644 --- a/diylc-regression-data/input/cloud/netlist/221_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/221_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 5K.1 <-> 5K.2 <-> C1.1 <-> C1.1 <-> R1.1 <-> R1.2 - 5K.3 <-> C1.2 + 5K.1 <-> 5K.2 <-> C1.+ <-> C1.+ <-> R1.1 <-> R1.2 + 5K.3 <-> C1.- + Boost.1 <-> C1.- <-> R1.1 Boost.2 <-> C2.2 - Boost.3 <-> C1.2 <-> R1.1 C2.1 <-> R1.1 <-> R1.2 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/221_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/221_incl_switches.txt index 6caaddb1b..4c641411c 100644 --- a/diylc-regression-data/input/cloud/netlist/221_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/221_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 5K.1 <-> 5K.2 <-> C1.1 <-> C1.1 <-> R1.1 <-> R1.2 - 5K.3 <-> C1.2 + 5K.1 <-> 5K.2 <-> C1.+ <-> C1.+ <-> R1.1 <-> R1.2 + 5K.3 <-> C1.- + Boost.1 <-> C1.- <-> R1.1 Boost.2 <-> C2.2 - Boost.3 <-> C1.2 <-> R1.1 C2.1 <-> R1.1 <-> R1.2 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt index 705ac01e1..0ceb9e942 100644 --- a/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt @@ -1,6 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 - 3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 - 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> R1.1 <-> R1.1 <-> R1.1 + 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.2 + 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R2.1 <-> R2.2 + 3915.4 <-> 3915.4 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.2 + 3915.4 <-> 3915.6 <-> R2.1 <-> R2.2 + 3915.5 <-> 3915.5 + 3915.5 <-> 3915.5 + 3915.5 <-> 3915.5 + 3915.6 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 + 3915.7 <-> R1.1 + 3915.7 <-> R1.1 + 3915.7 <-> R1.1 + 3915.7 <-> R1.2 + 3915.7 <-> R1.2 + 3915.7 <-> R1.2 + R2.1 <-> R2.2 + R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt index 705ac01e1..0ceb9e942 100644 --- a/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt @@ -1,6 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 - 3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 - 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> R1.1 <-> R1.1 <-> R1.1 + 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.2 + 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R2.1 <-> R2.2 + 3915.4 <-> 3915.4 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.2 + 3915.4 <-> 3915.6 <-> R2.1 <-> R2.2 + 3915.5 <-> 3915.5 + 3915.5 <-> 3915.5 + 3915.5 <-> 3915.5 + 3915.6 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 + 3915.7 <-> R1.1 + 3915.7 <-> R1.1 + 3915.7 <-> R1.1 + 3915.7 <-> R1.2 + 3915.7 <-> R1.2 + 3915.7 <-> R1.2 + R2.1 <-> R2.2 + R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt index 61438e2b4..1a7e48879 100644 --- a/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2 - C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2 - IC1.1 <-> IC1.5 + C1.1 <-> IC1.3 <-> R1.1 <-> R1.1 + C1.2 <-> IC1.4 <-> R1.2 + IC1.2 <-> IC1.7 + IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt index 61438e2b4..1a7e48879 100644 --- a/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2 - C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2 - IC1.1 <-> IC1.5 + C1.1 <-> IC1.3 <-> R1.1 <-> R1.1 + C1.2 <-> IC1.4 <-> R1.2 + IC1.2 <-> IC1.7 + IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt index 0d993c3a3..cb0c1948e 100644 --- a/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt @@ -1,6 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> VR1.1 - .1 <-> .2 <-> .2 <-> IC1.2 <-> IC1.6 <-> VR1.2 - .1 <-> .2 <-> IC1.3 <-> IC1.7 <-> VR1.3 + .1 <-> .2 <-> .2 <-> IC1.2 + .1 <-> IC1.1 <-> IC1.8 + .1 <-> IC1.3 + .1 <-> IC1.5 <-> VR1.1 + .2 <-> IC1.7 <-> VR1.3 + IC1.6 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt index 0d993c3a3..cb0c1948e 100644 --- a/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt @@ -1,6 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> VR1.1 - .1 <-> .2 <-> .2 <-> IC1.2 <-> IC1.6 <-> VR1.2 - .1 <-> .2 <-> IC1.3 <-> IC1.7 <-> VR1.3 + .1 <-> .2 <-> .2 <-> IC1.2 + .1 <-> IC1.1 <-> IC1.8 + .1 <-> IC1.3 + .1 <-> IC1.5 <-> VR1.1 + .2 <-> IC1.7 <-> VR1.3 + IC1.6 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt index 61438e2b4..1a7e48879 100644 --- a/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2 - C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2 - IC1.1 <-> IC1.5 + C1.1 <-> IC1.3 <-> R1.1 <-> R1.1 + C1.2 <-> IC1.4 <-> R1.2 + IC1.2 <-> IC1.7 + IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt index 61438e2b4..1a7e48879 100644 --- a/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2 - C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2 - IC1.1 <-> IC1.5 + C1.1 <-> IC1.3 <-> R1.1 <-> R1.1 + C1.2 <-> IC1.4 <-> R1.2 + IC1.2 <-> IC1.7 + IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt index 45871a26b..be205e1ef 100644 --- a/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt @@ -1,9 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.1 <-> C7.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R2.2 <-> R3.2 <-> R4.1 - C1.2 <-> C10.1 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> IC1.12 <-> IC1.14 <-> IC1.15 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R3.1 <-> R4.2 - C2.2 <-> C8.1 <-> IC1.10 <-> IC1.2 - C3.2 <-> C9.1 <-> IC1.11 <-> IC1.3 - C4.2 <-> IC1.16 <-> IC1.8 - C8.2 <-> C9.2 <-> IC1.13 <-> IC1.5 <-> R2.1 + C1.+ <-> IC1.1 <-> R1.1 + C1.- <-> C11.- <-> C6.- <-> C7.- <-> IC1.4 <-> R4.2 + C10.+ <-> IC1.14 <-> IC1.15 + C11.+ <-> IC1.12 <-> R1.2 + C2.+ <-> C3.+ <-> C5.+ <-> IC1.7 <-> R3.1 + C2.- <-> IC1.2 + C3.- <-> IC1.3 + C4.+ <-> IC1.6 + C6.+ <-> R2.2 <-> R3.2 + C7.+ <-> IC1.9 <-> R4.1 + C8.+ <-> IC1.10 + C8.- <-> C9.- + C9.+ <-> IC1.11 + IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt index 45871a26b..be205e1ef 100644 --- a/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt @@ -1,9 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.1 <-> C7.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R2.2 <-> R3.2 <-> R4.1 - C1.2 <-> C10.1 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> IC1.12 <-> IC1.14 <-> IC1.15 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R3.1 <-> R4.2 - C2.2 <-> C8.1 <-> IC1.10 <-> IC1.2 - C3.2 <-> C9.1 <-> IC1.11 <-> IC1.3 - C4.2 <-> IC1.16 <-> IC1.8 - C8.2 <-> C9.2 <-> IC1.13 <-> IC1.5 <-> R2.1 + C1.+ <-> IC1.1 <-> R1.1 + C1.- <-> C11.- <-> C6.- <-> C7.- <-> IC1.4 <-> R4.2 + C10.+ <-> IC1.14 <-> IC1.15 + C11.+ <-> IC1.12 <-> R1.2 + C2.+ <-> C3.+ <-> C5.+ <-> IC1.7 <-> R3.1 + C2.- <-> IC1.2 + C3.- <-> IC1.3 + C4.+ <-> IC1.6 + C6.+ <-> R2.2 <-> R3.2 + C7.+ <-> IC1.9 <-> R4.1 + C8.+ <-> IC1.10 + C8.- <-> C9.- + C9.+ <-> IC1.11 + IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/227_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/227_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/227_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/227_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/227_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/227_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/227_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/227_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/228_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/228_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/228_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/228_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/228_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/228_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/228_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/228_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/229_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/229_excl_switches.txt index 0f8ed23bf..b24f58aba 100644 --- a/diylc-regression-data/input/cloud/netlist/229_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/229_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + C1.+ <-> C1.+ <-> C1.+ <-> C1.+ <-> C1.+ <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/229_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/229_incl_switches.txt index 0f8ed23bf..b24f58aba 100644 --- a/diylc-regression-data/input/cloud/netlist/229_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/229_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + C1.+ <-> C1.+ <-> C1.+ <-> C1.+ <-> C1.+ <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.1 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> L2.2 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt index d34ef2bc6..1b510b66e 100644 --- a/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt @@ -1,6 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> TL071.1 <-> TL071.3 <-> TL071.5 <-> TL071.7 <-> VR1.1 <-> VR1.2 - TL071.2 <-> TL071.6 <-> VR1.3 - TL071.4 <-> TL071.8 + C1.2 <-> TL071.7 <-> VR1.1 <-> VR1.2 + TL071.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt index d34ef2bc6..1b510b66e 100644 --- a/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt @@ -1,6 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> TL071.1 <-> TL071.3 <-> TL071.5 <-> TL071.7 <-> VR1.1 <-> VR1.2 - TL071.2 <-> TL071.6 <-> VR1.3 - TL071.4 <-> TL071.8 + C1.2 <-> TL071.7 <-> VR1.1 <-> VR1.2 + TL071.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt index e0c86c2bc..eca3f5ef0 100644 --- a/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt @@ -1,4 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> L1.1 <-> L1.2 <-> L2.1 <-> L2.2 <-> L3.1 <-> L3.2 <-> L4.1 <-> L4.2 <-> L5.1 <-> L5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 + C1.+ <-> L1.2 + C1.- <-> R1.1 + C2.+ <-> L2.2 + C2.- <-> R2.1 + C3.+ <-> L3.2 + C3.- <-> R3.1 + C4.+ <-> L4.2 + C4.- <-> R4.1 + C5.+ <-> L5.2 + C5.- <-> R5.1 + L1.1 <-> L2.1 <-> L3.1 <-> L4.1 <-> L5.1 + R1.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt index e0c86c2bc..eca3f5ef0 100644 --- a/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt @@ -1,4 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> L1.1 <-> L1.2 <-> L2.1 <-> L2.2 <-> L3.1 <-> L3.2 <-> L4.1 <-> L4.2 <-> L5.1 <-> L5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 + C1.+ <-> L1.2 + C1.- <-> R1.1 + C2.+ <-> L2.2 + C2.- <-> R2.1 + C3.+ <-> L3.2 + C3.- <-> R3.1 + C4.+ <-> L4.2 + C4.- <-> R4.1 + C5.+ <-> L5.2 + C5.- <-> R5.1 + L1.1 <-> L2.1 <-> L3.1 <-> L4.1 <-> L5.1 + R1.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt index df329345b..9a21f106a 100644 --- a/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt @@ -1,5 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 10k.1 <-> 47n.1 + 10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4 + 10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.- <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5 + 150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7 + 150n.2 <-> 220u.+ <-> 47n.2 <-> 47u.- <-> IC1.1 <-> IC2.4 <-> IC3.1 + 2,2k.1 <-> IC3.6 + 47u.+ <-> 560.2 <-> IC1.2 <-> IC1.7 + 560.1 <-> IC1.6 diff --git a/diylc-regression-data/input/cloud/netlist/235_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/235_excl_switches.txt index 61a71cb54..4ca548c89 100644 --- a/diylc-regression-data/input/cloud/netlist/235_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/235_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1A.3 <-> R9.1 C1.1 <-> Q1B.1 <-> R2.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/235_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/235_incl_switches.txt index 61a71cb54..4ca548c89 100644 --- a/diylc-regression-data/input/cloud/netlist/235_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/235_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1A.3 <-> R9.1 C1.1 <-> Q1B.1 <-> R2.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt index e54cbf554..bad583702 100644 --- a/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt @@ -1,10 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> R8.2 - .2 <-> IC2.7 <-> R19.1 <-> R27.1 <-> R8.2 - .3 <-> R8.2 - C1.1 <-> C2.1 - C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 + C1.+ <-> C2.+ + C1.- <-> IC1.13 <-> R3.1 <-> Rate (C).1 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -12,25 +9,26 @@ Switch setup: [Default] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 - C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C2.- <-> IC1.14 <-> R1.1 <-> R6.2 C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 C3.2 <-> IC1.9 <-> R11.2 - C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 - C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 - C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C4.+ <-> C6.1 <-> D1.A <-> D2.K <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.- <-> C8.- <-> C9.- <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 + C5.1 <-> C7.+ <-> IC2.6 <-> R8.1 C5.2 <-> R19.2 C6.2 <-> R12.2 - C7.2 <-> R4.1 - C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 - C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 - D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 - D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 - D3.2 <-> R17.1 - D4.2 <-> R7.1 + C7.- <-> R4.1 + C8.+ <-> IC1.3 <-> R13.2 <-> R14.1 + C9.+ <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.K <-> D2.A <-> Depth (B).1 <-> R1.2 + D3.A <-> D4.A <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 + D3.K <-> R17.1 + D4.K <-> R7.1 Depth (B).2 <-> IC1.5 IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 IC2.2 <-> R12.1 <-> R8.2 + IC2.7 <-> R19.1 <-> R27.1 <-> R8.2 <-> SW1.2 IC3.1 <-> R18.1 IC3.10 <-> R20.1 IC3.11 <-> R21.2 @@ -39,5 +37,7 @@ Switch setup: [Default] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 - R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 + R2.2 <-> R3.2 <-> Rate (C).2 <-> Rate (C).3 + R8.2 <-> SW1.1 + R8.2 <-> SW1.3 diff --git a/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt index 303ca9f32..ea713a465 100644 --- a/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - C1.1 <-> C2.1 - C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 + C1.+ <-> C2.+ + C1.- <-> IC1.13 <-> R3.1 <-> Rate (C).1 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -9,21 +9,21 @@ Switch setup: [.ON1] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 - C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C2.- <-> IC1.14 <-> R1.1 <-> R6.2 C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 C3.2 <-> IC1.9 <-> R11.2 - C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 - C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 - C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C4.+ <-> C6.1 <-> D1.A <-> D2.K <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.- <-> C8.- <-> C9.- <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 + C5.1 <-> C7.+ <-> IC2.6 <-> R8.1 C5.2 <-> R19.2 C6.2 <-> R12.2 - C7.2 <-> R4.1 - C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 - C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 - D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 - D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 - D3.2 <-> R17.1 - D4.2 <-> R7.1 + C7.- <-> R4.1 + C8.+ <-> IC1.3 <-> R13.2 <-> R14.1 + C9.+ <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.K <-> D2.A <-> Depth (B).1 <-> R1.2 + D3.A <-> D4.A <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 + D3.K <-> R17.1 + D4.K <-> R7.1 Depth (B).2 <-> IC1.5 IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 @@ -37,12 +37,12 @@ Switch setup: [.ON1] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 - R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 + R2.2 <-> R3.2 <-> Rate (C).2 <-> Rate (C).3 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - C1.1 <-> C2.1 - C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 + C1.+ <-> C2.+ + C1.- <-> IC1.13 <-> R3.1 <-> Rate (C).1 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -50,21 +50,21 @@ Switch setup: [.ON2] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 - C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C2.- <-> IC1.14 <-> R1.1 <-> R6.2 C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 C3.2 <-> IC1.9 <-> R11.2 - C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 - C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 - C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C4.+ <-> C6.1 <-> D1.A <-> D2.K <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.- <-> C8.- <-> C9.- <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 + C5.1 <-> C7.+ <-> IC2.6 <-> R8.1 C5.2 <-> R19.2 C6.2 <-> R12.2 - C7.2 <-> R4.1 - C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 - C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 - D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 - D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 - D3.2 <-> R17.1 - D4.2 <-> R7.1 + C7.- <-> R4.1 + C8.+ <-> IC1.3 <-> R13.2 <-> R14.1 + C9.+ <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.K <-> D2.A <-> Depth (B).1 <-> R1.2 + D3.A <-> D4.A <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 + D3.K <-> R17.1 + D4.K <-> R7.1 Depth (B).2 <-> IC1.5 IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 @@ -78,5 +78,5 @@ Switch setup: [.ON2] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 - R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 + R2.2 <-> R3.2 <-> Rate (C).2 <-> Rate (C).3 diff --git a/diylc-regression-data/input/cloud/netlist/237_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/237_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/237_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/237_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/237_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/237_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/237_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/237_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/238_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/238_excl_switches.txt index 2ba9434a7..2817455e5 100644 --- a/diylc-regression-data/input/cloud/netlist/238_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/238_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R24.1 <-> R27.2 C1.1 <-> R3.1 C1.1 <-> R8.1 - C1.2 <-> C15.2 <-> C2.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R1.2 <-> R2.1 + C1.2 <-> C15.2 <-> C2.1 <-> D1.K <-> D2.A <-> IC1.2 <-> R1.2 <-> R2.1 C1.2 <-> IC1.8 <-> R12.2 C10.1 <-> C9.1 <-> R33.2 C10.2 <-> R34.1 <-> R35.1 - C12.1 <-> R30.2 <-> R31.2 - C12.1 <-> R36.1 <-> R37.1 - C12.2 <-> C7.1 <-> R23.2 - C12.2 <-> C8.1 <-> R22.1 - C13.1 <-> C15.1 <-> D11.2 <-> D12.2 <-> IC1.5 <-> IC2.4 <-> IC2.4 <-> R13.2 <-> R19.2 - C13.1 <-> R16.2 <-> R19.1 <-> R20.1 <-> R21.1 <-> R32.1 - C13.2 <-> C13.2 <-> C14.2 <-> C15.2 <-> C5.1 <-> C6.1 <-> D11.1 <-> D12.1 <-> IC1.4 <-> IC2.11 <-> IC2.11 <-> R11.2 <-> R14.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R38.1 <-> R6.1 <-> R8.2 - C14.1 <-> R12.1 <-> R13.1 <-> R14.1 - C15.1 <-> D1.1 <-> D2.2 <-> IC1.1 <-> R15.1 + C12.+ <-> R30.2 <-> R31.2 + C12.+ <-> R36.1 <-> R37.1 + C12.- <-> C7.1 <-> R23.2 + C12.- <-> C8.1 <-> R22.1 + C13.+ <-> C15.1 <-> D11.K <-> D12.K <-> IC1.5 <-> IC2.4 <-> IC2.4 <-> R13.2 <-> R19.2 + C13.+ <-> R16.2 <-> R19.1 <-> R20.1 <-> R21.1 <-> R32.1 + C13.- <-> C13.- <-> C14.- <-> C15.2 <-> C5.1 <-> C6.1 <-> D11.A <-> D12.A <-> IC1.4 <-> IC2.11 <-> IC2.11 <-> R11.2 <-> R14.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R38.1 <-> R6.1 <-> R8.2 + C14.+ <-> R12.1 <-> R13.1 <-> R14.1 + C15.1 <-> D1.A <-> D2.K <-> IC1.1 <-> R15.1 C3.2 <-> R11.1 C4.1 <-> R6.2 - C4.2 <-> D6.1 <-> D9.2 <-> IC2.6 <-> R7.2 + C4.2 <-> D6.A <-> D9.K <-> IC2.6 <-> R7.2 C5.2 <-> IC2.3 <-> R15.2 C6.1 <-> R28.2 <-> R29.1 C6.2 <-> IC2.5 <-> R18.2 @@ -26,13 +26,13 @@ Switch setup: [Default] C7.2 <-> IC2.5 <-> R21.2 C8.2 <-> IC2.3 <-> R16.1 C9.2 <-> IC2.12 <-> R32.2 - D10.1 <-> D5.2 <-> IC2.7 <-> R26.1 <-> R9.2 - D10.2 <-> D7.1 - D3.1 <-> D4.2 - D3.2 <-> D5.1 - D4.1 <-> D6.2 - D7.2 <-> D8.1 - D8.2 <-> D9.1 + D10.A <-> D5.K <-> IC2.7 <-> R26.1 <-> R9.2 + D10.K <-> D7.A + D3.A <-> D4.K + D3.K <-> D5.A + D4.A <-> D6.K + D7.K <-> D8.A + D8.K <-> D9.A IC1.3 <-> IC1.6 <-> IC1.7 IC2.1 <-> IC2.2 <-> R22.2 IC2.1 <-> R17.2 <-> R18.1 diff --git a/diylc-regression-data/input/cloud/netlist/238_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/238_incl_switches.txt index 2934fd4d8..2817455e5 100644 --- a/diylc-regression-data/input/cloud/netlist/238_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/238_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] C1.1 <-> R24.1 <-> R27.2 C1.1 <-> R3.1 C1.1 <-> R8.1 - C1.2 <-> C15.2 <-> C2.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R1.2 <-> R2.1 + C1.2 <-> C15.2 <-> C2.1 <-> D1.K <-> D2.A <-> IC1.2 <-> R1.2 <-> R2.1 C1.2 <-> IC1.8 <-> R12.2 C10.1 <-> C9.1 <-> R33.2 C10.2 <-> R34.1 <-> R35.1 - C12.1 <-> R30.2 <-> R31.2 - C12.1 <-> R36.1 <-> R37.1 - C12.2 <-> C7.1 <-> R23.2 - C12.2 <-> C8.1 <-> R22.1 - C13.1 <-> C15.1 <-> D11.2 <-> D12.2 <-> IC1.5 <-> IC2.4 <-> IC2.4 <-> R13.2 <-> R19.2 - C13.1 <-> R16.2 <-> R19.1 <-> R20.1 <-> R21.1 <-> R32.1 - C13.2 <-> C13.2 <-> C14.2 <-> C15.2 <-> C5.1 <-> C6.1 <-> D11.1 <-> D12.1 <-> IC1.4 <-> IC2.11 <-> IC2.11 <-> R11.2 <-> R14.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R38.1 <-> R6.1 <-> R8.2 - C14.1 <-> R12.1 <-> R13.1 <-> R14.1 - C15.1 <-> D1.1 <-> D2.2 <-> IC1.1 <-> R15.1 + C12.+ <-> R30.2 <-> R31.2 + C12.+ <-> R36.1 <-> R37.1 + C12.- <-> C7.1 <-> R23.2 + C12.- <-> C8.1 <-> R22.1 + C13.+ <-> C15.1 <-> D11.K <-> D12.K <-> IC1.5 <-> IC2.4 <-> IC2.4 <-> R13.2 <-> R19.2 + C13.+ <-> R16.2 <-> R19.1 <-> R20.1 <-> R21.1 <-> R32.1 + C13.- <-> C13.- <-> C14.- <-> C15.2 <-> C5.1 <-> C6.1 <-> D11.A <-> D12.A <-> IC1.4 <-> IC2.11 <-> IC2.11 <-> R11.2 <-> R14.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R38.1 <-> R6.1 <-> R8.2 + C14.+ <-> R12.1 <-> R13.1 <-> R14.1 + C15.1 <-> D1.A <-> D2.K <-> IC1.1 <-> R15.1 C3.2 <-> R11.1 C4.1 <-> R6.2 - C4.2 <-> D6.1 <-> D9.2 <-> IC2.6 <-> R7.2 + C4.2 <-> D6.A <-> D9.K <-> IC2.6 <-> R7.2 C5.2 <-> IC2.3 <-> R15.2 C6.1 <-> R28.2 <-> R29.1 C6.2 <-> IC2.5 <-> R18.2 @@ -26,13 +26,13 @@ Switch setup: [.ON1, .ON2] C7.2 <-> IC2.5 <-> R21.2 C8.2 <-> IC2.3 <-> R16.1 C9.2 <-> IC2.12 <-> R32.2 - D10.1 <-> D5.2 <-> IC2.7 <-> R26.1 <-> R9.2 - D10.2 <-> D7.1 - D3.1 <-> D4.2 - D3.2 <-> D5.1 - D4.1 <-> D6.2 - D7.2 <-> D8.1 - D8.2 <-> D9.1 + D10.A <-> D5.K <-> IC2.7 <-> R26.1 <-> R9.2 + D10.K <-> D7.A + D3.A <-> D4.K + D3.K <-> D5.A + D4.A <-> D6.K + D7.K <-> D8.A + D8.K <-> D9.A IC1.3 <-> IC1.6 <-> IC1.7 IC2.1 <-> IC2.2 <-> R22.2 IC2.1 <-> R17.2 <-> R18.1 diff --git a/diylc-regression-data/input/cloud/netlist/239_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/239_excl_switches.txt index 147271de1..f4a80b3ce 100644 --- a/diylc-regression-data/input/cloud/netlist/239_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/239_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> B1K Attack.1 <-> BCE.3 + 100K.1 <-> B1K Attack.3 <-> BCE.3 100K.2 <-> 100nF.1 <-> EBC.2 100nF.2 <-> 10K.2 <-> CBE.1 - 10k.1 <-> 10n.2 <-> 47u.2 <-> CBE.3 <-> EBC.1 - 10K.1 <-> 470R.1 <-> 47K.1 <-> 47u.1 - 10k.2 <-> 10u.2 <-> CBE.2 - 10n.1 <-> 10u.1 - 10nF.1 <-> A100K Volume.1 + 10k.1 <-> 10n.2 <-> 47u.- <-> CBE.3 <-> EBC.1 + 10K.1 <-> 470R.1 <-> 47K.1 <-> 47u.+ + 10k.2 <-> 10u.- <-> CBE.2 + 10n.1 <-> 10u.+ + 10nF.1 <-> A100K Volume.3 10nF.2 <-> 470R.2 <-> 8K2.2 - 10u.1 <-> B1K Attack.2 + 10u.+ <-> B1K Attack.2 47K.2 <-> BCE.1 8K2.1 <-> BCE.2 - A100K Volume.3 <-> B1K Attack.3 + A100K Volume.1 <-> B1K Attack.1 diff --git a/diylc-regression-data/input/cloud/netlist/239_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/239_incl_switches.txt index 147271de1..f4a80b3ce 100644 --- a/diylc-regression-data/input/cloud/netlist/239_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/239_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> B1K Attack.1 <-> BCE.3 + 100K.1 <-> B1K Attack.3 <-> BCE.3 100K.2 <-> 100nF.1 <-> EBC.2 100nF.2 <-> 10K.2 <-> CBE.1 - 10k.1 <-> 10n.2 <-> 47u.2 <-> CBE.3 <-> EBC.1 - 10K.1 <-> 470R.1 <-> 47K.1 <-> 47u.1 - 10k.2 <-> 10u.2 <-> CBE.2 - 10n.1 <-> 10u.1 - 10nF.1 <-> A100K Volume.1 + 10k.1 <-> 10n.2 <-> 47u.- <-> CBE.3 <-> EBC.1 + 10K.1 <-> 470R.1 <-> 47K.1 <-> 47u.+ + 10k.2 <-> 10u.- <-> CBE.2 + 10n.1 <-> 10u.+ + 10nF.1 <-> A100K Volume.3 10nF.2 <-> 470R.2 <-> 8K2.2 - 10u.1 <-> B1K Attack.2 + 10u.+ <-> B1K Attack.2 47K.2 <-> BCE.1 8K2.1 <-> BCE.2 - A100K Volume.3 <-> B1K Attack.3 + A100K Volume.1 <-> B1K Attack.1 diff --git a/diylc-regression-data/input/cloud/netlist/240_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/240_excl_switches.txt index 4c2d7d165..57463425a 100644 --- a/diylc-regression-data/input/cloud/netlist/240_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/240_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> B500K.3 + 100K.1 <-> B500K.1 100K.2 <-> 1ON.1 <-> 220N.2 <-> CBE.2 - 100U.1 <-> 22K.1 - 100U.1 <-> 22K.2 - 100U.1 <-> B500K.1 <-> B500K.2 - 100U.2 <-> 10K.2 <-> 5K1.1 - 100U.2 <-> 1ON.2 <-> 220N.2 <-> 2K2.1 <-> 33N.2 <-> 56K.1 <-> B10K.1 <-> CBE.1 - 100U.2 <-> C5K.1 - 10K.1 <-> 10N.1 <-> B10K.1 + 100U.+ <-> 22K.1 + 100U.+ <-> 22K.2 + 100U.+ <-> B500K.2 <-> B500K.3 + 100U.- <-> 10K.2 <-> 5K1.1 + 100U.- <-> 1ON.2 <-> 220N.2 <-> 2K2.1 <-> 33N.2 <-> 56K.1 <-> B10K.3 <-> CBE.1 + 100U.- <-> C5K.3 + 10K.1 <-> 10N.1 <-> B10K.3 10N.2 <-> CBE.3 - 220N.1 <-> 5K1.2 <-> B10K.3 - 220N.1 <-> B100K.2 <-> B100K.3 + 220N.1 <-> 5K1.2 <-> B10K.1 + 220N.1 <-> B100K.1 <-> B100K.2 2K2.2 <-> CBE.1 33N.1 <-> B10K.2 56K.2 <-> CBE.3 - B10K.3 <-> C5K.2 <-> C5K.3 + B10K.1 <-> C5K.1 <-> C5K.2 diff --git a/diylc-regression-data/input/cloud/netlist/240_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/240_incl_switches.txt index 4c2d7d165..57463425a 100644 --- a/diylc-regression-data/input/cloud/netlist/240_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/240_incl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> B500K.3 + 100K.1 <-> B500K.1 100K.2 <-> 1ON.1 <-> 220N.2 <-> CBE.2 - 100U.1 <-> 22K.1 - 100U.1 <-> 22K.2 - 100U.1 <-> B500K.1 <-> B500K.2 - 100U.2 <-> 10K.2 <-> 5K1.1 - 100U.2 <-> 1ON.2 <-> 220N.2 <-> 2K2.1 <-> 33N.2 <-> 56K.1 <-> B10K.1 <-> CBE.1 - 100U.2 <-> C5K.1 - 10K.1 <-> 10N.1 <-> B10K.1 + 100U.+ <-> 22K.1 + 100U.+ <-> 22K.2 + 100U.+ <-> B500K.2 <-> B500K.3 + 100U.- <-> 10K.2 <-> 5K1.1 + 100U.- <-> 1ON.2 <-> 220N.2 <-> 2K2.1 <-> 33N.2 <-> 56K.1 <-> B10K.3 <-> CBE.1 + 100U.- <-> C5K.3 + 10K.1 <-> 10N.1 <-> B10K.3 10N.2 <-> CBE.3 - 220N.1 <-> 5K1.2 <-> B10K.3 - 220N.1 <-> B100K.2 <-> B100K.3 + 220N.1 <-> 5K1.2 <-> B10K.1 + 220N.1 <-> B100K.1 <-> B100K.2 2K2.2 <-> CBE.1 33N.1 <-> B10K.2 56K.2 <-> CBE.3 - B10K.3 <-> C5K.2 <-> C5K.3 + B10K.1 <-> C5K.1 <-> C5K.2 diff --git a/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt index 0f4c6fd2b..dd4ec6f5e 100644 --- a/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt @@ -1,12 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1K.1 <-> 1K.1 <-> 1K.1 <-> 1K.1 - 1K.1 <-> 1K.1 <-> BC327.2 <-> BC327.2 - 1K.1 <-> 1K.1 <-> BC337.2 <-> BC337.2 - 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 - 1K.2 <-> 1K.2 <-> BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3 - 1K.2 <-> 1K.2 <-> BC327.2 <-> BC327.2 - BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 + 1K.1 <-> 1K.1 + 1K.1 <-> 1K.1 + 1K.1 <-> BC327.2 + 1K.1 <-> BC327.2 + 1K.1 <-> BC337.2 + 1K.1 <-> BC337.2 + 1K.2 <-> 1K.2 + 1K.2 <-> 1K.2 + 1K.2 <-> 1K.2 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3 + 1K.2 <-> BC327.2 + 1K.2 <-> BC327.2 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 BC327.3 <-> BC327.3 <-> BC327.3 <-> BC327.3 - BC337.3 <-> BC337.3 diff --git a/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt index 0f4c6fd2b..dd4ec6f5e 100644 --- a/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt @@ -1,12 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1K.1 <-> 1K.1 <-> 1K.1 <-> 1K.1 - 1K.1 <-> 1K.1 <-> BC327.2 <-> BC327.2 - 1K.1 <-> 1K.1 <-> BC337.2 <-> BC337.2 - 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 - 1K.2 <-> 1K.2 <-> BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3 - 1K.2 <-> 1K.2 <-> BC327.2 <-> BC327.2 - BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 + 1K.1 <-> 1K.1 + 1K.1 <-> 1K.1 + 1K.1 <-> BC327.2 + 1K.1 <-> BC327.2 + 1K.1 <-> BC337.2 + 1K.1 <-> BC337.2 + 1K.2 <-> 1K.2 + 1K.2 <-> 1K.2 + 1K.2 <-> 1K.2 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3 + 1K.2 <-> BC327.2 + 1K.2 <-> BC327.2 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 + BC327.1 <-> BC337.1 BC327.3 <-> BC327.3 <-> BC327.3 <-> BC327.3 - BC337.3 <-> BC337.3 diff --git a/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt index c27187c61..d4fb5dd40 100644 --- a/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C2.1 <-> GAIN.1 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt index c27187c61..d4fb5dd40 100644 --- a/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C2.1 <-> GAIN.1 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt index 3119c3021..b5aeb9f7e 100644 --- a/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] BC549C.BC549C.1 <-> R15.2 BC549C.BC549C.1 <-> R4.2 @@ -9,7 +9,7 @@ Switch setup: [Default] C1.1 <-> R1.2 C10.2 <-> R18.1 <-> TONE.2 C11.1 <-> R17.2 <-> TONE.3 - C11.2 <-> C14.2 <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 + C11.2 <-> C14.- <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 C12.1 <-> TONE.1 C2.2 <-> C3.1 C4.1 <-> SUSTAIN.1 diff --git a/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt index 3119c3021..b5aeb9f7e 100644 --- a/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] BC549C.BC549C.1 <-> R15.2 BC549C.BC549C.1 <-> R4.2 @@ -9,7 +9,7 @@ Switch setup: [Default] C1.1 <-> R1.2 C10.2 <-> R18.1 <-> TONE.2 C11.1 <-> R17.2 <-> TONE.3 - C11.2 <-> C14.2 <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 + C11.2 <-> C14.- <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 C12.1 <-> TONE.1 C2.2 <-> C3.1 C4.1 <-> SUSTAIN.1 diff --git a/diylc-regression-data/input/cloud/netlist/244_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/244_excl_switches.txt index 58a400d01..6ed95e5de 100644 --- a/diylc-regression-data/input/cloud/netlist/244_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/244_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .2 <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 - .1 <-> .1 <-> .1 <-> C2.2 <-> D1.2 <-> D2.2 <-> IC1.7 - .2 <-> .2 <-> .2 <-> C2.1 <-> D3.1 <-> D4.1 <-> IC1.5 + .+ <-> .+ <-> .+ <-> .- <-> .- <-> .- <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 + .+ <-> .+ <-> .+ <-> C2.2 <-> D1.K <-> D2.K <-> IC1.7 + .- <-> .- <-> .- <-> C2.1 <-> D3.A <-> D4.A <-> IC1.5 C1.2 <-> IC1.1 C1.2 <-> IC1.9 C2.1 <-> R1.1 C2.2 <-> IC1.4 C3.1 <-> IC1.6 C3.2 <-> R1.1 - D1.1 <-> D3.2 - D2.1 <-> D4.2 + D1.A <-> D3.K + D2.A <-> D4.K diff --git a/diylc-regression-data/input/cloud/netlist/244_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/244_incl_switches.txt index 58a400d01..6ed95e5de 100644 --- a/diylc-regression-data/input/cloud/netlist/244_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/244_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .2 <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 - .1 <-> .1 <-> .1 <-> C2.2 <-> D1.2 <-> D2.2 <-> IC1.7 - .2 <-> .2 <-> .2 <-> C2.1 <-> D3.1 <-> D4.1 <-> IC1.5 + .+ <-> .+ <-> .+ <-> .- <-> .- <-> .- <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 + .+ <-> .+ <-> .+ <-> C2.2 <-> D1.K <-> D2.K <-> IC1.7 + .- <-> .- <-> .- <-> C2.1 <-> D3.A <-> D4.A <-> IC1.5 C1.2 <-> IC1.1 C1.2 <-> IC1.9 C2.1 <-> R1.1 C2.2 <-> IC1.4 C3.1 <-> IC1.6 C3.2 <-> R1.1 - D1.1 <-> D3.2 - D2.1 <-> D4.2 + D1.A <-> D3.K + D2.A <-> D4.K diff --git a/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt index c0d9dccb7..380fd4b01 100644 --- a/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt @@ -1,32 +1,32 @@ -Switch setup: [Default] +Switch setup: [ ALL ] + Bass.1 <-> C1.1 <-> R2.1 Bass.2 <-> C5.1 - Bass.3 <-> C1.1 <-> R2.1 - C1.1 <-> C3.2 <-> C3.2 <-> D1.1 <-> Level.3 <-> Opamp.4 <-> R1.1 <-> R1.1 + C1.1 <-> C3.- <-> C3.- <-> D1.A <-> Level.1 <-> Opamp.4 <-> R1.1 <-> R1.1 C1.1 <-> Opamp.3 <-> R1.2 - C1.2 <-> C3.1 <-> C5.2 <-> R1.1 <-> R1.1 <-> R1.2 <-> R2.2 + C1.2 <-> C3.+ <-> C5.2 <-> R1.1 <-> R1.1 <-> R1.2 <-> R2.2 C1.2 <-> Opamp.8 <-> R2.1 C1.2 <-> R1.2 - C2.1 <-> DIP.16 <-> DIP.8 <-> Drive.1 <-> Opamp.2 <-> R2.2 - C2.2 <-> DIP.1 <-> DIP.9 <-> Drive.3 <-> Ge.1 <-> Ge.2 <-> Opamp.1 <-> R2.2 <-> Treble.1 <-> Treble.2 - C3.1 <-> D1.2 <-> Opamp.5 <-> R1.2 + C2.1 <-> DIP.16 <-> DIP.8 <-> Drive.3 <-> Opamp.2 <-> R2.2 + C2.2 <-> DIP.1 <-> DIP.9 <-> Drive.1 <-> Ge.A <-> Ge.K <-> Opamp.1 <-> R2.2 <-> Treble.2 <-> Treble.3 + C3.+ <-> D1.K <-> Opamp.5 <-> R1.2 C4.1 <-> Opamp.6 <-> R3.2 - C4.2 <-> Level.1 - DIP.1 <-> DIP.2 <-> Ge.2 <-> Rct.1 - DIP.10 <-> DIP.11 <-> Rct.2 <-> Sch.1 - DIP.10 <-> DIP.9 <-> Ge.1 <-> Rct.2 - DIP.11 <-> DIP.12 <-> FET.2 <-> Sch.1 - DIP.12 <-> DIP.13 <-> FET.2 <-> Si.1 - DIP.13 <-> DIP.14 <-> LED.2 <-> Si.1 - DIP.14 <-> DIP.15 <-> LED.2 <-> Si.1 - DIP.15 <-> DIP.16 <-> Si.1 - DIP.2 <-> DIP.3 <-> Rct.1 <-> Sch.2 - DIP.3 <-> DIP.4 <-> FET.1 <-> Sch.2 - DIP.4 <-> DIP.5 <-> FET.1 <-> Si.2 - DIP.5 <-> DIP.6 <-> LED.1 <-> Si.2 - DIP.6 <-> DIP.7 <-> LED.1 <-> Si.2 - DIP.7 <-> DIP.8 <-> Si.2 + C4.2 <-> Level.3 + DIP.1 <-> DIP.2 <-> Ge.K <-> Rct.A + DIP.10 <-> DIP.11 <-> Rct.K <-> Sch.A + DIP.10 <-> DIP.9 <-> Ge.A <-> Rct.K + DIP.11 <-> DIP.12 <-> FET.K <-> Sch.A + DIP.12 <-> DIP.13 <-> FET.K <-> Si.A + DIP.13 <-> DIP.14 <-> LED.K <-> Si.A + DIP.14 <-> DIP.15 <-> LED.K <-> Si.A + DIP.15 <-> DIP.16 <-> Si.A + DIP.2 <-> DIP.3 <-> Rct.A <-> Sch.K + DIP.3 <-> DIP.4 <-> FET.A <-> Sch.K + DIP.4 <-> DIP.5 <-> FET.A <-> Si.K + DIP.5 <-> DIP.6 <-> LED.A <-> Si.K + DIP.6 <-> DIP.7 <-> LED.A <-> Si.K + DIP.7 <-> DIP.8 <-> Si.K Drive.2 <-> R2.1 Opamp.7 <-> R2.1 <-> R3.1 - R2.2 <-> Treble.3 + R2.2 <-> Treble.1 diff --git a/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt index e1376e957..380fd4b01 100644 --- a/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt @@ -1,32 +1,32 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] + Bass.1 <-> C1.1 <-> R2.1 Bass.2 <-> C5.1 - Bass.3 <-> C1.1 <-> R2.1 - C1.1 <-> C3.2 <-> C3.2 <-> D1.1 <-> Level.3 <-> Opamp.4 <-> R1.1 <-> R1.1 + C1.1 <-> C3.- <-> C3.- <-> D1.A <-> Level.1 <-> Opamp.4 <-> R1.1 <-> R1.1 C1.1 <-> Opamp.3 <-> R1.2 - C1.2 <-> C3.1 <-> C5.2 <-> R1.1 <-> R1.1 <-> R1.2 <-> R2.2 + C1.2 <-> C3.+ <-> C5.2 <-> R1.1 <-> R1.1 <-> R1.2 <-> R2.2 C1.2 <-> Opamp.8 <-> R2.1 C1.2 <-> R1.2 - C2.1 <-> DIP.16 <-> DIP.8 <-> Drive.1 <-> Opamp.2 <-> R2.2 - C2.2 <-> DIP.1 <-> DIP.9 <-> Drive.3 <-> Ge.1 <-> Ge.2 <-> Opamp.1 <-> R2.2 <-> Treble.1 <-> Treble.2 - C3.1 <-> D1.2 <-> Opamp.5 <-> R1.2 + C2.1 <-> DIP.16 <-> DIP.8 <-> Drive.3 <-> Opamp.2 <-> R2.2 + C2.2 <-> DIP.1 <-> DIP.9 <-> Drive.1 <-> Ge.A <-> Ge.K <-> Opamp.1 <-> R2.2 <-> Treble.2 <-> Treble.3 + C3.+ <-> D1.K <-> Opamp.5 <-> R1.2 C4.1 <-> Opamp.6 <-> R3.2 - C4.2 <-> Level.1 - DIP.1 <-> DIP.2 <-> Ge.2 <-> Rct.1 - DIP.10 <-> DIP.11 <-> Rct.2 <-> Sch.1 - DIP.10 <-> DIP.9 <-> Ge.1 <-> Rct.2 - DIP.11 <-> DIP.12 <-> FET.2 <-> Sch.1 - DIP.12 <-> DIP.13 <-> FET.2 <-> Si.1 - DIP.13 <-> DIP.14 <-> LED.2 <-> Si.1 - DIP.14 <-> DIP.15 <-> LED.2 <-> Si.1 - DIP.15 <-> DIP.16 <-> Si.1 - DIP.2 <-> DIP.3 <-> Rct.1 <-> Sch.2 - DIP.3 <-> DIP.4 <-> FET.1 <-> Sch.2 - DIP.4 <-> DIP.5 <-> FET.1 <-> Si.2 - DIP.5 <-> DIP.6 <-> LED.1 <-> Si.2 - DIP.6 <-> DIP.7 <-> LED.1 <-> Si.2 - DIP.7 <-> DIP.8 <-> Si.2 + C4.2 <-> Level.3 + DIP.1 <-> DIP.2 <-> Ge.K <-> Rct.A + DIP.10 <-> DIP.11 <-> Rct.K <-> Sch.A + DIP.10 <-> DIP.9 <-> Ge.A <-> Rct.K + DIP.11 <-> DIP.12 <-> FET.K <-> Sch.A + DIP.12 <-> DIP.13 <-> FET.K <-> Si.A + DIP.13 <-> DIP.14 <-> LED.K <-> Si.A + DIP.14 <-> DIP.15 <-> LED.K <-> Si.A + DIP.15 <-> DIP.16 <-> Si.A + DIP.2 <-> DIP.3 <-> Rct.A <-> Sch.K + DIP.3 <-> DIP.4 <-> FET.A <-> Sch.K + DIP.4 <-> DIP.5 <-> FET.A <-> Si.K + DIP.5 <-> DIP.6 <-> LED.A <-> Si.K + DIP.6 <-> DIP.7 <-> LED.A <-> Si.K + DIP.7 <-> DIP.8 <-> Si.K Drive.2 <-> R2.1 Opamp.7 <-> R2.1 <-> R3.1 - R2.2 <-> Treble.3 + R2.2 <-> Treble.1 diff --git a/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt index 00eb51b06..62b0f7b47 100644 --- a/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> SW1.2 - .3 <-> .5 <-> .6 <-> J1.Sleeve <-> SW1.4 <-> Volume.3 - C1.1 <-> SW1.3 <-> Volume.1 + C1.1 <-> SW1.3 <-> Volume.3 C1.2 <-> R1.2 + J1.Sleeve <-> SW1.4 <-> SW2.3 <-> SW2.5 <-> SW2.6 <-> Volume.1 J1.Tip <-> R1.1 <-> Volume.2 + SW1.2 <-> SW2.2 diff --git a/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt index 80eb9e0d4..c1d9260fd 100644 --- a/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [.ON1:SW1.Treble] +Switch setup: [ SW1.Treble:SW2.ON1 ] - C1.1 <-> Volume.1 + C1.1 <-> Volume.3 C1.2 <-> R1.2 - J1.Sleeve <-> Volume.3 + J1.Sleeve <-> Volume.1 J1.Tip <-> R1.1 <-> Volume.2 -Switch setup: [.ON2:SW1.Treble, .ON1:SW1.Middle, .ON2:SW1.Middle, .ON1:SW1.Rhythm, .ON2:SW1.Rhythm] +Switch setup: [ ALL ] C1.1 <-> J1.Sleeve <-> Volume.1 <-> Volume.3 C1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/247_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/247_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/247_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/247_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/247_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/247_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/247_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/247_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/248_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/248_excl_switches.txt index 56b4064cc..730689335 100644 --- a/diylc-regression-data/input/cloud/netlist/248_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/248_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> IC1.2 <-> R2.1 - .2 <-> C1.1 <-> IC1.5 <-> R3.1 - .3 <-> IC1.3 <-> R1.1 - C1.2 <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 - D1.1 <-> D2.1 <-> D3.1 <-> Q3.1 - D1.2 <-> D2.2 <-> Q1.1 - D4.2 <-> Q1.1 + C1.+ <-> IC1.5 <-> R3.1 <-> SW1.2 + C1.- <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 + D1.A <-> D2.A <-> D3.A <-> Q3.1 + D1.K <-> D2.K <-> Q1.1 + D4.K <-> Q1.1 + IC1.2 <-> R2.1 <-> SW1.1 + IC1.3 <-> R1.1 <-> SW1.3 IC1.7 <-> Q1.2 IC1.8 <-> Q1.2 Q3.3 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/248_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/248_incl_switches.txt index f0b1c3617..51cfb8089 100644 --- a/diylc-regression-data/input/cloud/netlist/248_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/248_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - C1.1 <-> IC1.2 <-> IC1.5 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 - D1.1 <-> D2.1 <-> D3.1 <-> Q3.1 - D1.2 <-> D2.2 <-> Q1.1 - D4.2 <-> Q1.1 + C1.+ <-> IC1.2 <-> IC1.5 <-> R2.1 <-> R3.1 + C1.- <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 + D1.A <-> D2.A <-> D3.A <-> Q3.1 + D1.K <-> D2.K <-> Q1.1 + D4.K <-> Q1.1 IC1.3 <-> R1.1 IC1.7 <-> Q1.2 IC1.8 <-> Q1.2 Q3.3 <-> R3.2 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - C1.1 <-> IC1.3 <-> IC1.5 <-> R1.1 <-> R3.1 - C1.2 <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 - D1.1 <-> D2.1 <-> D3.1 <-> Q3.1 - D1.2 <-> D2.2 <-> Q1.1 - D4.2 <-> Q1.1 + C1.+ <-> IC1.3 <-> IC1.5 <-> R1.1 <-> R3.1 + C1.- <-> IC1.4 <-> Q1.3 <-> Q1.3 <-> Q3.2 <-> R1.2 <-> R2.2 + D1.A <-> D2.A <-> D3.A <-> Q3.1 + D1.K <-> D2.K <-> Q1.1 + D4.K <-> Q1.1 IC1.2 <-> R2.1 IC1.7 <-> Q1.2 IC1.8 <-> Q1.2 diff --git a/diylc-regression-data/input/cloud/netlist/249_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/249_excl_switches.txt index cfe1df5f0..c06ada34e 100644 --- a/diylc-regression-data/input/cloud/netlist/249_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/249_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> R5.2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> R3.1 - .2 <-> .2 <-> Q2.1 - .2 <-> IC1.3 <-> R4.2 - .3 <-> R3.1 - C1.1 <-> IC1.2 <-> IC1.7 <-> VR1.3 - C1.2 <-> C2.2 <-> C3.2 <-> D1.2 <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 - C2.1 <-> IC1.8 - C3.1 <-> IC1.4 <-> IC1.5 <-> R1.1 <-> R2.2 - D1.1 <-> R4.1 - IC1.6 <-> R1.2 <-> VR1.1 <-> VR1.2 + .A <-> .A <-> R5.2 + .A <-> .K + .A <-> .K + .A <-> .K + .A <-> .K + .K <-> .K <-> Q2.1 + C1.+ <-> IC1.2 <-> IC1.6 <-> VR1.3 + C1.- <-> C2.2 <-> C3.2 <-> D1.K <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 + C2.1 <-> IC1.5 + C3.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R2.2 + D1.A <-> R4.1 + IC1.3 <-> R4.2 <-> SW1.2 + IC1.7 <-> R1.2 <-> VR1.1 <-> VR1.2 Q1.2 <-> R3.2 Q2.2 <-> R3.2 Q3.1 <-> R5.1 <-> R6.1 Q3.3 <-> R2.1 + R3.1 <-> SW1.1 + R3.1 <-> SW1.3 diff --git a/diylc-regression-data/input/cloud/netlist/249_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/249_incl_switches.txt index 9daf91ede..0e0193f1b 100644 --- a/diylc-regression-data/input/cloud/netlist/249_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/249_incl_switches.txt @@ -1,38 +1,38 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - .1 <-> .1 <-> R5.2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .2 <-> .2 <-> Q2.1 - C1.1 <-> IC1.2 <-> IC1.7 <-> VR1.3 - C1.2 <-> C2.2 <-> C3.2 <-> D1.2 <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 - C2.1 <-> IC1.8 - C3.1 <-> IC1.4 <-> IC1.5 <-> R1.1 <-> R2.2 - D1.1 <-> R4.1 + .A <-> .A <-> R5.2 + .A <-> .K + .A <-> .K + .A <-> .K + .A <-> .K + .K <-> .K <-> Q2.1 + C1.+ <-> IC1.2 <-> IC1.6 <-> VR1.3 + C1.- <-> C2.2 <-> C3.2 <-> D1.K <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 + C2.1 <-> IC1.5 + C3.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R2.2 + D1.A <-> R4.1 IC1.3 <-> R3.1 <-> R4.2 - IC1.6 <-> R1.2 <-> VR1.1 <-> VR1.2 + IC1.7 <-> R1.2 <-> VR1.1 <-> VR1.2 Q1.2 <-> R3.2 Q2.2 <-> R3.2 Q3.1 <-> R5.1 <-> R6.1 Q3.3 <-> R2.1 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - .1 <-> .1 <-> R5.2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .2 <-> .2 <-> Q2.1 - C1.1 <-> IC1.2 <-> IC1.7 <-> VR1.3 - C1.2 <-> C2.2 <-> C3.2 <-> D1.2 <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 - C2.1 <-> IC1.8 - C3.1 <-> IC1.4 <-> IC1.5 <-> R1.1 <-> R2.2 - D1.1 <-> R4.1 + .A <-> .A <-> R5.2 + .A <-> .K + .A <-> .K + .A <-> .K + .A <-> .K + .K <-> .K <-> Q2.1 + C1.+ <-> IC1.2 <-> IC1.6 <-> VR1.3 + C1.- <-> C2.2 <-> C3.2 <-> D1.K <-> IC1.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 + C2.1 <-> IC1.5 + C3.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R2.2 + D1.A <-> R4.1 IC1.3 <-> R3.1 <-> R4.2 - IC1.6 <-> R1.2 <-> VR1.1 <-> VR1.2 + IC1.7 <-> R1.2 <-> VR1.1 <-> VR1.2 Q1.2 <-> R3.2 Q2.2 <-> R3.2 Q3.1 <-> R5.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/250_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/250_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/250_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/250_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/250_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/250_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/250_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/250_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt index b3c9cc35f..df489c1d9 100644 --- a/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> D1.1 <-> IC1.10 <-> IC1.24 - C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C3.2 <-> IC1.18 <-> IC1.4 - C4.1 <-> D2.1 <-> D2.2 <-> Q1.1 - D1.1 <-> R2.2 - D1.2 <-> IC1.11 <-> IC1.25 <-> R3.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 + C1.1 <-> C2.2 <-> C4.- <-> C4.- <-> D1.K <-> IC1.21 <-> IC1.8 <-> Q1.2 <-> R3.1 + C1.2 <-> IC1.10 + C2.1 <-> IC1.9 + C3.1 <-> IC1.1 <-> R1.1 + C4.+ <-> D2.K <-> Q1.1 + C4.+ <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1 + D1.A <-> IC1.24 + D1.A <-> R2.2 + D1.K <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt index b3c9cc35f..df489c1d9 100644 --- a/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> D1.1 <-> IC1.10 <-> IC1.24 - C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C3.2 <-> IC1.18 <-> IC1.4 - C4.1 <-> D2.1 <-> D2.2 <-> Q1.1 - D1.1 <-> R2.2 - D1.2 <-> IC1.11 <-> IC1.25 <-> R3.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 + C1.1 <-> C2.2 <-> C4.- <-> C4.- <-> D1.K <-> IC1.21 <-> IC1.8 <-> Q1.2 <-> R3.1 + C1.2 <-> IC1.10 + C2.1 <-> IC1.9 + C3.1 <-> IC1.1 <-> R1.1 + C4.+ <-> D2.K <-> Q1.1 + C4.+ <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1 + D1.A <-> IC1.24 + D1.A <-> R2.2 + D1.K <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt index e74195df7..2b52ec166 100644 --- a/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> LED.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.10 <-> IC1.24 <-> LED.1 - C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C3.2 <-> IC1.18 <-> IC1.4 - C5.1 <-> D2.1 <-> D2.2 <-> Q1.1 - IC1.11 <-> IC1.25 <-> LED.2 <-> R3.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 - LED.1 <-> R2.2 + C1.1 <-> C2.2 <-> C4.- <-> C5.- <-> IC1.21 <-> IC1.8 <-> LED.K <-> Q1.2 <-> R3.1 + C1.2 <-> IC1.10 + C2.1 <-> IC1.9 + C3.1 <-> IC1.1 <-> R1.1 + C4.+ <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1 + C5.+ <-> D2.K <-> Q1.1 + IC1.24 <-> LED.A + LED.A <-> R2.2 + LED.K <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt index e74195df7..2b52ec166 100644 --- a/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> LED.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.10 <-> IC1.24 <-> LED.1 - C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C3.2 <-> IC1.18 <-> IC1.4 - C5.1 <-> D2.1 <-> D2.2 <-> Q1.1 - IC1.11 <-> IC1.25 <-> LED.2 <-> R3.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 - LED.1 <-> R2.2 + C1.1 <-> C2.2 <-> C4.- <-> C5.- <-> IC1.21 <-> IC1.8 <-> LED.K <-> Q1.2 <-> R3.1 + C1.2 <-> IC1.10 + C2.1 <-> IC1.9 + C3.1 <-> IC1.1 <-> R1.1 + C4.+ <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1 + C5.+ <-> D2.K <-> Q1.1 + IC1.24 <-> LED.A + LED.A <-> R2.2 + LED.K <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt index 9e8ade737..47b54ed9b 100644 --- a/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C1.2 <-> IC1.18 <-> IC1.4 - C2.1 <-> C3.1 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.2 <-> IC2.3 <-> LED2.2 <-> R1.2 <-> R2.1 <-> R3.1 - C2.2 <-> IC1.10 <-> IC1.24 <-> LED1.1 - C4.1 <-> D1.1 <-> D1.2 <-> IC2.1 - IC1.11 <-> IC1.25 <-> LED1.2 <-> R2.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 - LED2.1 <-> R3.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.21 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt index 9e8ade737..47b54ed9b 100644 --- a/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt @@ -1,17 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.1 <-> IC1.15 <-> R1.1 - C1.2 <-> IC1.18 <-> IC1.4 - C2.1 <-> C3.1 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.2 <-> IC2.3 <-> LED2.2 <-> R1.2 <-> R2.1 <-> R3.1 - C2.2 <-> IC1.10 <-> IC1.24 <-> LED1.1 - C4.1 <-> D1.1 <-> D1.2 <-> IC2.1 - IC1.11 <-> IC1.25 <-> LED1.2 <-> R2.2 - IC1.12 <-> IC1.26 - IC1.13 <-> IC1.27 - IC1.14 <-> IC1.28 - IC1.16 <-> IC1.2 - IC1.17 <-> IC1.3 - IC1.19 <-> IC1.5 - IC1.20 <-> IC1.6 - LED2.1 <-> R3.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.21 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt index b6e78e34f..369ebad6a 100644 --- a/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt @@ -1,4 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt index b6e78e34f..369ebad6a 100644 --- a/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt @@ -1,4 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt index c73e04e2c..75ecc12ef 100644 --- a/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.1 <-> 50uF.2 <-> 50uF.2 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.3 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.3 + .1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.+ <-> 50uF.- <-> 50uF.- <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.1 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.1 .2 <-> J1.2 <-> R2.1 - 2.2K.2 <-> 50uF.1 <-> V1.3 + 2.2K.2 <-> 50uF.+ <-> V1.3 2.2nf.1 <-> 2.2nf.2 <-> BASS.2 <-> R1.1 - 2.2nf.1 <-> BASS.1 - 2.2nf.2 <-> 22K.1 <-> BASS.3 - C1.2 <-> TREBLE.3 + 2.2nf.1 <-> BASS.3 + 2.2nf.2 <-> 22K.1 <-> BASS.1 + C1.2 <-> TREBLE.1 C2.1 <-> V1.7 <-> VOLUME.2 - C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.1 + C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.3 J2.2 <-> R3.2 - MID.1 <-> MID.2 + MID.2 <-> MID.3 V1.5 <-> V2.5 diff --git a/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt index c73e04e2c..75ecc12ef 100644 --- a/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.1 <-> 50uF.2 <-> 50uF.2 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.3 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.3 + .1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.+ <-> 50uF.- <-> 50uF.- <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.1 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.1 .2 <-> J1.2 <-> R2.1 - 2.2K.2 <-> 50uF.1 <-> V1.3 + 2.2K.2 <-> 50uF.+ <-> V1.3 2.2nf.1 <-> 2.2nf.2 <-> BASS.2 <-> R1.1 - 2.2nf.1 <-> BASS.1 - 2.2nf.2 <-> 22K.1 <-> BASS.3 - C1.2 <-> TREBLE.3 + 2.2nf.1 <-> BASS.3 + 2.2nf.2 <-> 22K.1 <-> BASS.1 + C1.2 <-> TREBLE.1 C2.1 <-> V1.7 <-> VOLUME.2 - C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.1 + C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.3 J2.2 <-> R3.2 - MID.1 <-> MID.2 + MID.2 <-> MID.3 V1.5 <-> V2.5 diff --git a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt index 84bf122b7..cbc59dd7f 100644 --- a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt @@ -1,52 +1,52 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 2MH.1 <-> BOOST.2 2MH.2 <-> 470nF.1 - .1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.2 <-> BOOST.3 <-> GAIN.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2 + .1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.- <-> BOOST.1 <-> GAIN.1 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2 .2 <-> J1.2 <-> R2.1 - 1,5nf.1 <-> TREBLE.3 + 1,5nf.1 <-> TREBLE.1 1,5nf.2 <-> 100K.2 <-> 68nf.1 - 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2 - 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2 - 100K 2watt.2 <-> 32uF.2 + 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.+ <-> 32uF.- + 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.+ <-> 33K.2 + 100K 2watt.2 <-> 32uF.- 100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.1 100K.1 <-> 100K.2 100K.1 <-> 1K5.1 <-> 220K.1 100K.1 <-> 2.2nf.1 <-> 2.2nf.2 <-> BASS.2 - 100K.1 <-> 2.2nf.1 <-> BASS.1 + 100K.1 <-> 2.2nf.1 <-> BASS.3 100K.1 <-> J2.1 <-> J2.2 100K.1 <-> J2.1 <-> J2.2 100K.2 <-> 100K.2 <-> 220K.2 <-> V2.2 100K.2 <-> 1K5.2 <-> 1M.2 <-> 68nF.2 100K.2 <-> 1nF.2 <-> 68nF.2 100K.2 <-> 2K4.1 <-> 2K4.1 <-> 68nF.2 - 100K.2 <-> C2.2 <-> GAIN.1 <-> TREBLE.2 - 10nf.1 <-> TREBLE.1 - 15K.1 <-> 1K5.2 <-> BOOST.1 <-> V2.3 + 100K.2 <-> C2.2 <-> GAIN.3 <-> TREBLE.2 + 10nf.1 <-> TREBLE.3 + 15K.1 <-> 1K5.2 <-> BOOST.3 <-> V2.3 15K.2 <-> 1Ohm.2 <-> J18.1 <-> J18.1 <-> J18.2 <-> J18.2 <-> J18.3 <-> J18.3 <-> J18.4 <-> J18.4 - 1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF 63v.2 <-> TREBLE.3 - 1K.2 <-> 22uf 63v.2 <-> D2.1 <-> D3.1 + 1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF 63v.- <-> TREBLE.1 + 1K.2 <-> 22uf 63v.- <-> D2.A <-> D3.A 1K5.1 <-> V2.8 1M.1 <-> 68nF.1 <-> V2.7 1nf.1 <-> 2,2nf.2 1nf.2 <-> 330pf.1 2,2nf.1 <-> 4,7nf.1 - 2.2nf.2 <-> 22K.1 <-> BASS.3 + 2.2nf.2 <-> 22K.1 <-> BASS.1 220K.1 <-> 220K.1 <-> 33K.2 220K.2 <-> 68nf.2 220K.2 <-> 68nf.2 - 22uf 63v.1 <-> 22uF 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2 + 22uF 63v.+ <-> 22uf 63v.+ <-> D1.A <-> D1.K <-> D2.K <-> D3.K <-> GND <-> TREBLE.2 <-> TREBLE.3 2K4.1 <-> 2K4.1 <-> 68nF.1 4,7nf.1 <-> 4,7nf.2 4,7nf.2 <-> 68nf.1 - 50uF.1 <-> V1.8 + 50uF.+ <-> V1.8 C2.1 <-> GAIN.2 <-> V1.7 - D1.1 <-> D1.1 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.2 <-> D1.2 + D1.A <-> D1.A + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.K <-> D1.K J2.2 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt index 84bf122b7..cbc59dd7f 100644 --- a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt @@ -1,52 +1,52 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 2MH.1 <-> BOOST.2 2MH.2 <-> 470nF.1 - .1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.2 <-> BOOST.3 <-> GAIN.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2 + .1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.- <-> BOOST.1 <-> GAIN.1 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2 .2 <-> J1.2 <-> R2.1 - 1,5nf.1 <-> TREBLE.3 + 1,5nf.1 <-> TREBLE.1 1,5nf.2 <-> 100K.2 <-> 68nf.1 - 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2 - 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2 - 100K 2watt.2 <-> 32uF.2 + 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.+ <-> 32uF.- + 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.+ <-> 33K.2 + 100K 2watt.2 <-> 32uF.- 100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.1 100K.1 <-> 100K.2 100K.1 <-> 1K5.1 <-> 220K.1 100K.1 <-> 2.2nf.1 <-> 2.2nf.2 <-> BASS.2 - 100K.1 <-> 2.2nf.1 <-> BASS.1 + 100K.1 <-> 2.2nf.1 <-> BASS.3 100K.1 <-> J2.1 <-> J2.2 100K.1 <-> J2.1 <-> J2.2 100K.2 <-> 100K.2 <-> 220K.2 <-> V2.2 100K.2 <-> 1K5.2 <-> 1M.2 <-> 68nF.2 100K.2 <-> 1nF.2 <-> 68nF.2 100K.2 <-> 2K4.1 <-> 2K4.1 <-> 68nF.2 - 100K.2 <-> C2.2 <-> GAIN.1 <-> TREBLE.2 - 10nf.1 <-> TREBLE.1 - 15K.1 <-> 1K5.2 <-> BOOST.1 <-> V2.3 + 100K.2 <-> C2.2 <-> GAIN.3 <-> TREBLE.2 + 10nf.1 <-> TREBLE.3 + 15K.1 <-> 1K5.2 <-> BOOST.3 <-> V2.3 15K.2 <-> 1Ohm.2 <-> J18.1 <-> J18.1 <-> J18.2 <-> J18.2 <-> J18.3 <-> J18.3 <-> J18.4 <-> J18.4 - 1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF 63v.2 <-> TREBLE.3 - 1K.2 <-> 22uf 63v.2 <-> D2.1 <-> D3.1 + 1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF 63v.- <-> TREBLE.1 + 1K.2 <-> 22uf 63v.- <-> D2.A <-> D3.A 1K5.1 <-> V2.8 1M.1 <-> 68nF.1 <-> V2.7 1nf.1 <-> 2,2nf.2 1nf.2 <-> 330pf.1 2,2nf.1 <-> 4,7nf.1 - 2.2nf.2 <-> 22K.1 <-> BASS.3 + 2.2nf.2 <-> 22K.1 <-> BASS.1 220K.1 <-> 220K.1 <-> 33K.2 220K.2 <-> 68nf.2 220K.2 <-> 68nf.2 - 22uf 63v.1 <-> 22uF 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2 + 22uF 63v.+ <-> 22uf 63v.+ <-> D1.A <-> D1.K <-> D2.K <-> D3.K <-> GND <-> TREBLE.2 <-> TREBLE.3 2K4.1 <-> 2K4.1 <-> 68nF.1 4,7nf.1 <-> 4,7nf.2 4,7nf.2 <-> 68nf.1 - 50uF.1 <-> V1.8 + 50uF.+ <-> V1.8 C2.1 <-> GAIN.2 <-> V1.7 - D1.1 <-> D1.1 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.2 <-> D1.2 + D1.A <-> D1.A + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.K <-> D1.K J2.2 <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt index 6cbe2981d..8b96c04d0 100644 --- a/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt @@ -1,16 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .9 <-> J1.Tip - .2 <-> C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> Q1.2 <-> R1.2 <-> R3.1 - .3 <-> .6 - .4 <-> D3.1 - .5 <-> J1.Sleeve - .7 <-> vol.2 - .8 <-> J2.Tip - C1.1 <-> R4.2 <-> R5.1 - C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3 + C1.+ <-> R4.2 <-> R5.1 + C1.- <-> C2.- <-> D1.K <-> D2.A <-> Gain.1 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.1 + C2.+ <-> Gain.2 + C3.1 <-> Q1.2 <-> R1.2 + C3.2 <-> R3.1 <-> SW1.2 C4.1 <-> Q1.3 <-> R1.1 <-> R4.1 - C4.2 <-> D1.1 <-> D2.2 <-> vol.1 - D3.2 <-> R5.2 - Gain.1 <-> Q1.1 <-> R2.1 + C4.2 <-> D1.A <-> D2.K <-> vol.3 + D3.A <-> SW1.4 + D3.K <-> R5.2 + Gain.3 <-> Q1.1 <-> R2.1 + J1.Sleeve <-> SW1.5 + J1.Tip <-> SW1.1 <-> SW1.9 + J2.Tip <-> SW1.8 + SW1.3 <-> SW1.6 + SW1.7 <-> vol.2 diff --git a/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt index 83ac7376e..1fea4d94e 100644 --- a/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt @@ -1,23 +1,27 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - C1.1 <-> R4.2 <-> R5.1 - C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3 - C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> J1.Tip <-> Q1.2 <-> R1.2 <-> R3.1 + C1.+ <-> R4.2 <-> R5.1 + C1.- <-> C2.- <-> D1.K <-> D2.A <-> Gain.1 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.1 + C2.+ <-> Gain.2 + C3.1 <-> Q1.2 <-> R1.2 + C3.2 <-> J1.Tip <-> R3.1 C4.1 <-> Q1.3 <-> R1.1 <-> R4.1 - C4.2 <-> D1.1 <-> D2.2 <-> vol.1 - D3.1 <-> J1.Sleeve - D3.2 <-> R5.2 - Gain.1 <-> Q1.1 <-> R2.1 + C4.2 <-> D1.A <-> D2.K <-> vol.3 + D3.A <-> J1.Sleeve + D3.K <-> R5.2 + Gain.3 <-> Q1.1 <-> R2.1 J2.Tip <-> vol.2 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - C1.1 <-> R4.2 <-> R5.1 - C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3 - C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> J1.Sleeve <-> Q1.2 <-> R1.2 <-> R3.1 + C1.+ <-> R4.2 <-> R5.1 + C1.- <-> C2.- <-> D1.K <-> D2.A <-> Gain.1 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.1 + C2.+ <-> Gain.2 + C3.1 <-> Q1.2 <-> R1.2 + C3.2 <-> J1.Sleeve <-> R3.1 C4.1 <-> Q1.3 <-> R1.1 <-> R4.1 - C4.2 <-> D1.1 <-> D2.2 <-> vol.1 - D3.2 <-> R5.2 - Gain.1 <-> Q1.1 <-> R2.1 + C4.2 <-> D1.A <-> D2.K <-> vol.3 + D3.K <-> R5.2 + Gain.3 <-> Q1.1 <-> R2.1 J1.Tip <-> J2.Tip diff --git a/diylc-regression-data/input/cloud/netlist/258_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/258_excl_switches.txt index 861b161fc..f9f58b89f 100644 --- a/diylc-regression-data/input/cloud/netlist/258_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/258_excl_switches.txt @@ -1,31 +1,31 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1.2K.1 <-> VR1.3 - 1.2K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100R.2 <-> 100R.2 <-> 100R.2 <-> 12nF.2 <-> 2.7K.2 <-> 33K.2 <-> 4.7K.2 <-> D2.2 <-> J8.Sleeve <-> J8.Sleeve + 1.2K.1 <-> VR1.1 + 1.2K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100R.2 <-> 100R.2 <-> 100R.2 <-> 12nF.2 <-> 2.7K.2 <-> 33K.2 <-> 4.7K.2 <-> D2.K <-> J8.Sleeve <-> J8.Sleeve 100K.1 <-> 470K.2 <-> 470nF.2 <-> Q1.2 100R.1 <-> Q1.1 100R.1 <-> Q1.1 100R.1 <-> Q1.1 12K.1 <-> 1K.1 <-> 470K.1 <-> J10.1 - 12K.2 <-> 33K.2 <-> 470K.1 <-> 4nF.2 <-> D1.1 <-> D1.2 <-> Q1.3 - 12K.2 <-> 470K.1 <-> 47nF.2 <-> D1.2 <-> Q1.3 + 12K.2 <-> 33K.2 <-> 470K.1 <-> 4nF.2 <-> D1.A <-> D1.K <-> Q1.3 + 12K.2 <-> 470K.1 <-> 47nF.2 <-> D1.K <-> Q1.3 12K.2 <-> 470K.2 <-> 470pf.1 <-> 470pf.1 <-> Q1.3 12K.2 <-> 470nF.2 <-> Q1.3 - 12nF.1 <-> 33K.1 <-> VR2.3 - 1K.2 <-> D2.1 - 2.7K.1 <-> VR3.3 + 12nF.1 <-> 33K.1 <-> VR2.1 + 1K.2 <-> D2.A + 2.7K.1 <-> VR3.1 33K.1 <-> 470nF.1 - 33K.1 <-> 4nF.1 <-> VR2.1 + 33K.1 <-> 4nF.1 <-> VR2.3 4.7K.1 <-> Q1.1 470K.1 <-> 470nF.2 <-> 470pf.2 <-> Q1.2 470K.2 <-> 7.5K.2 <-> Q1.2 470nF.1 <-> VR1.2 470nF.1 <-> VR2.2 - 470nF.1 <-> VR3.1 + 470nF.1 <-> VR3.3 470nF.2 <-> 7.5K.1 - 470nF.2 <-> D1.1 <-> D1.2 - 470pf.2 <-> VR1.1 + 470nF.2 <-> D1.A <-> D1.K + 470pf.2 <-> VR1.3 47nF.1 <-> 7.5K.2 - 47nF.2 <-> D1.1 <-> D1.2 + 47nF.2 <-> D1.A <-> D1.K 7.5K.1 <-> Q1.2 diff --git a/diylc-regression-data/input/cloud/netlist/258_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/258_incl_switches.txt index 861b161fc..f9f58b89f 100644 --- a/diylc-regression-data/input/cloud/netlist/258_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/258_incl_switches.txt @@ -1,31 +1,31 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1.2K.1 <-> VR1.3 - 1.2K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100R.2 <-> 100R.2 <-> 100R.2 <-> 12nF.2 <-> 2.7K.2 <-> 33K.2 <-> 4.7K.2 <-> D2.2 <-> J8.Sleeve <-> J8.Sleeve + 1.2K.1 <-> VR1.1 + 1.2K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100K.2 <-> 100R.2 <-> 100R.2 <-> 100R.2 <-> 12nF.2 <-> 2.7K.2 <-> 33K.2 <-> 4.7K.2 <-> D2.K <-> J8.Sleeve <-> J8.Sleeve 100K.1 <-> 470K.2 <-> 470nF.2 <-> Q1.2 100R.1 <-> Q1.1 100R.1 <-> Q1.1 100R.1 <-> Q1.1 12K.1 <-> 1K.1 <-> 470K.1 <-> J10.1 - 12K.2 <-> 33K.2 <-> 470K.1 <-> 4nF.2 <-> D1.1 <-> D1.2 <-> Q1.3 - 12K.2 <-> 470K.1 <-> 47nF.2 <-> D1.2 <-> Q1.3 + 12K.2 <-> 33K.2 <-> 470K.1 <-> 4nF.2 <-> D1.A <-> D1.K <-> Q1.3 + 12K.2 <-> 470K.1 <-> 47nF.2 <-> D1.K <-> Q1.3 12K.2 <-> 470K.2 <-> 470pf.1 <-> 470pf.1 <-> Q1.3 12K.2 <-> 470nF.2 <-> Q1.3 - 12nF.1 <-> 33K.1 <-> VR2.3 - 1K.2 <-> D2.1 - 2.7K.1 <-> VR3.3 + 12nF.1 <-> 33K.1 <-> VR2.1 + 1K.2 <-> D2.A + 2.7K.1 <-> VR3.1 33K.1 <-> 470nF.1 - 33K.1 <-> 4nF.1 <-> VR2.1 + 33K.1 <-> 4nF.1 <-> VR2.3 4.7K.1 <-> Q1.1 470K.1 <-> 470nF.2 <-> 470pf.2 <-> Q1.2 470K.2 <-> 7.5K.2 <-> Q1.2 470nF.1 <-> VR1.2 470nF.1 <-> VR2.2 - 470nF.1 <-> VR3.1 + 470nF.1 <-> VR3.3 470nF.2 <-> 7.5K.1 - 470nF.2 <-> D1.1 <-> D1.2 - 470pf.2 <-> VR1.1 + 470nF.2 <-> D1.A <-> D1.K + 470pf.2 <-> VR1.3 47nF.1 <-> 7.5K.2 - 47nF.2 <-> D1.1 <-> D1.2 + 47nF.2 <-> D1.A <-> D1.K 7.5K.1 <-> Q1.2 diff --git a/diylc-regression-data/input/cloud/netlist/259_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/259_excl_switches.txt index dcaeb77df..835624a8e 100644 --- a/diylc-regression-data/input/cloud/netlist/259_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/259_excl_switches.txt @@ -1,23 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .1 <-> C1.2 - .1 <-> D1.1 <-> D1.2 - .1 <-> D1.2 <-> R1.1 <-> R1.2 + .1 <-> D1.K <-> R1.1 <-> R1.2 .2 <-> C1.1 <-> R1.1 <-> R1.1 .2 <-> R1.1 <-> R1.2 .3 <-> C1.2 <-> R1.1 .3 <-> R1.2 - .4 <-> .5 <-> D1.1 <-> D1.2 - .4 <-> C2.1 <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 - .4 <-> C2.2 <-> C2.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 - .5 <-> C1.2 - .5 <-> D1.2 <-> R1.1 <-> R1.2 - .6 <-> C1.1 <-> R1.1 <-> R1.1 - .6 <-> R1.1 <-> R1.2 - .7 <-> C1.2 <-> R1.1 - .7 <-> R1.2 - .8 <-> C2.1 <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 - .8 <-> C2.2 <-> C2.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .4 <-> C2.+ <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 + .4 <-> C2.- <-> C2.- <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .5 <-> C2.+ <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 + .5 <-> C2.- <-> C2.- <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .6 <-> C1.2 <-> R1.1 + .6 <-> R1.2 + .7 <-> C1.1 <-> R1.1 <-> R1.1 + .7 <-> R1.1 <-> R1.2 + .8 <-> C1.2 + .8 <-> D1.K <-> R1.1 <-> R1.2 C1.1 <-> C3.1 <-> R1.2 C1.1 <-> C3.1 <-> R1.2 C1.1 <-> R1.1 @@ -28,8 +26,8 @@ Switch setup: [Default] C1.2 <-> Q2.1 C1.2 <-> Q2.3 C1.2 <-> Q2.3 - C2.1 <-> Q2.2 <-> R1.1 - C2.1 <-> Q2.2 <-> R1.1 + C2.+ <-> Q2.2 <-> R1.1 + C2.+ <-> Q2.2 <-> R1.1 C5.1 <-> C5.2 <-> R1.2 C5.1 <-> C5.2 <-> R1.2 C5.1 <-> R1.2 @@ -38,8 +36,10 @@ Switch setup: [Default] C5.2 <-> R1.1 C5.2 <-> R1.1 C5.2 <-> R1.1 - D1.1 <-> D1.2 - D1.1 <-> D1.2 + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K <-> SW1.1 + D1.A <-> D1.K <-> SW1.4 <-> SW1.5 R1.2 <-> R1.2 R1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/259_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/259_incl_switches.txt index fd942555e..743f7dae6 100644 --- a/diylc-regression-data/input/cloud/netlist/259_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/259_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] .1 <-> C1.2 - .1 <-> D1.2 <-> R1.1 <-> R1.2 + .1 <-> D1.K <-> R1.1 <-> R1.2 .2 <-> C1.1 <-> R1.1 <-> R1.1 .2 <-> R1.1 <-> R1.2 .3 <-> C1.2 <-> R1.1 .3 <-> R1.2 - .4 <-> C2.1 <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 - .4 <-> C2.2 <-> C2.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 - .5 <-> C1.2 - .5 <-> D1.2 <-> R1.1 <-> R1.2 - .6 <-> C1.1 <-> R1.1 <-> R1.1 - .6 <-> R1.1 <-> R1.2 - .7 <-> C1.2 <-> R1.1 - .7 <-> R1.2 - .8 <-> C2.1 <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 - .8 <-> C2.2 <-> C2.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .4 <-> C2.+ <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 + .4 <-> C2.- <-> C2.- <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .5 <-> C2.+ <-> C3.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R1.2 + .5 <-> C2.- <-> C2.- <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 + .6 <-> C1.2 <-> R1.1 + .6 <-> R1.2 + .7 <-> C1.1 <-> R1.1 <-> R1.1 + .7 <-> R1.1 <-> R1.2 + .8 <-> C1.2 + .8 <-> D1.K <-> R1.1 <-> R1.2 C1.1 <-> C3.1 <-> R1.2 C1.1 <-> C3.1 <-> R1.2 C1.1 <-> R1.1 @@ -26,8 +26,8 @@ Switch setup: [.ON1, .ON2] C1.2 <-> Q2.1 C1.2 <-> Q2.3 C1.2 <-> Q2.3 - C2.1 <-> Q2.2 <-> R1.1 - C2.1 <-> Q2.2 <-> R1.1 + C2.+ <-> Q2.2 <-> R1.1 + C2.+ <-> Q2.2 <-> R1.1 C5.1 <-> C5.2 <-> R1.2 C5.1 <-> C5.2 <-> R1.2 C5.1 <-> R1.2 @@ -36,10 +36,10 @@ Switch setup: [.ON1, .ON2] C5.2 <-> R1.1 C5.2 <-> R1.1 C5.2 <-> R1.1 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 - D1.1 <-> D1.2 + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K + D1.A <-> D1.K R1.2 <-> R1.2 R1.2 <-> R1.2 diff --git a/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt index e8d224715..369ebad6a 100644 --- a/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt @@ -1,6 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 - R4.1 <-> R4.2 - R5.1 <-> R5.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt index e8d224715..369ebad6a 100644 --- a/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt @@ -1,6 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 - R4.1 <-> R4.2 - R5.1 <-> R5.2 + C1.1 <-> IC1.1 <-> R1.1 + C2.1 <-> C3.2 <-> C4.- <-> C5.- <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.K <-> R2.1 + C2.2 <-> IC1.10 + C3.1 <-> IC1.9 + C4.+ <-> D1.K <-> IC2.1 + C5.+ <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1 + IC1.24 <-> LED1.A + LED1.K <-> R2.2 + LED2.A <-> R3.2 diff --git a/diylc-regression-data/input/cloud/netlist/261_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/261_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/261_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/261_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/261_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/261_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/261_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/261_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/262_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/262_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/262_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/262_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/262_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/262_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/262_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/262_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt index 6c95e4f7a..94edd25c9 100644 --- a/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt @@ -1,6 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R3.2 <-> Sensitivity.1 <-> Sensitivity.2 <-> Sensitivity.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> R3.2 C2.1 <-> Q1.3 <-> R2.1 <-> R3.1 + C2.2 <-> Q1.1 <-> Sensitivity.1 <-> Sensitivity.3 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt index 6c95e4f7a..94edd25c9 100644 --- a/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt @@ -1,6 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R3.2 <-> Sensitivity.1 <-> Sensitivity.2 <-> Sensitivity.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> R3.2 C2.1 <-> Q1.3 <-> R2.1 <-> R3.1 + C2.2 <-> Q1.1 <-> Sensitivity.1 <-> Sensitivity.3 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt index b92992362..93fbb1109 100644 --- a/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt @@ -1,6 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R6.1 <-> R6.2 - C3.1 <-> IC1.2 <-> IC1.6 <-> R2.2 - IC1.1 <-> IC1.5 <-> R1.2 <-> R3.1 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> R2.1 + C2.1 <-> R6.1 + C3.1 <-> IC1.2 <-> R2.2 + IC1.3 <-> IC1.4 + IC1.7 <-> R4.2 <-> R6.2 + R1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt index b92992362..93fbb1109 100644 --- a/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt @@ -1,6 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R6.1 <-> R6.2 - C3.1 <-> IC1.2 <-> IC1.6 <-> R2.2 - IC1.1 <-> IC1.5 <-> R1.2 <-> R3.1 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> R2.1 + C2.1 <-> R6.1 + C3.1 <-> IC1.2 <-> R2.2 + IC1.3 <-> IC1.4 + IC1.7 <-> R4.2 <-> R6.2 + R1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt index 6dd70273d..605f612f0 100644 --- a/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10K.1 <-> Bias.3 - 10K.2 <-> 50uF 150v.2 <-> D1.1 + 10K.1 <-> Bias.1 + 10K.2 <-> 50uF 150v.- <-> D1.A 56K.1 <-> 22nF.2 <-> 22nF.2 56K.2 <-> 100K.2 <-> 270pF.2 - 100K.1 <-> 100K.1 <-> 1.5M.1 <-> 270K.1 <-> 33K 1W.2 <-> 12pF.1 <-> 20uF 525v.1 + 100K.1 <-> 100K.1 <-> 1.5M.1 <-> 270K.1 <-> 33K 1W.2 <-> 12pF.1 <-> 20uF 525v.+ 100K.2 <-> 100nF.2 - 1K5.1 <-> 1K5.1 <-> 250uF.2 - 1K5.2 <-> 250uF.1 <-> V1.8 + 1K5.1 <-> 1K5.1 <-> 250uF.- + 1K5.2 <-> 250uF.+ <-> V1.8 1K5.2 <-> V1.3 68K.1 <-> 1M.1 <-> J2.Ring <-> J2.Sleeve <-> J2.Tip 68K.1 <-> J2.Tip @@ -15,29 +15,29 @@ Switch setup: [Default] 1.5M.2 <-> 1uF.1 <-> V1.7 1K.1 <-> 680R.2 <-> 12pF.1 1K.2 <-> 47R.1 <-> 680R.1 <-> 12pF.2 <-> 390pf.2 - 1M.1 <-> Contour.3 <-> Volume.3 + 1M.1 <-> Contour.1 <-> Volume.1 1M.2 <-> Treble.2 <-> V1.8 270K.2 <-> 12pF.2 <-> V1.2 - 680R.1 <-> 18K.2 <-> 47R.2 <-> 50uF 150v.1 <-> 50uF 150v.1 <-> V1.8 - 18K.1 <-> Bias.1 - 100K.1 <-> 100K.1 <-> 50uF 150v.2 <-> Bias.2 + 680R.1 <-> 18K.2 <-> 47R.2 <-> 50uF 150v.+ <-> 50uF 150v.+ <-> V1.8 + 18K.1 <-> Bias.3 + 100K.1 <-> 100K.1 <-> 50uF 150v.- <-> Bias.2 100K.2 <-> 1K.1 <-> 250nF.1 100K.2 <-> 1K.1 <-> 250nF.1 <-> V1.6 - 47K.1 <-> 15K 2W.2 <-> 33K 1W.1 <-> 20uF 525v.1 + 47K.1 <-> 15K 2W.2 <-> 33K 1W.1 <-> 20uF 525v.+ 47K.2 <-> 250nF.2 680R.2 <-> 1uF.2 - 15K 2W.1 <-> 20uF 525v.1 + 15K 2W.1 <-> 20uF 525v.+ 1M.2 <-> J2.Ring <-> J2.Sleeve 47K.1 <-> 250nF.2 <-> V1.3 - 100nF.1 <-> 470pf.1 <-> Volume.1 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 <-> 30uF 525v.2 <-> V1.8 - 22nF.1 <-> Bass.2 <-> Treble.3 + 100nF.1 <-> 470pf.1 <-> Volume.3 + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- <-> 30uF 525v.- <-> V1.8 + 22nF.1 <-> Bass.2 <-> Treble.1 22nF.1 <-> Contour.2 - 270pF.1 <-> Treble.1 + 270pF.1 <-> Treble.3 390pf.1 <-> V1.3 <-> V1.4 470pf.2 <-> V1.2 <-> Volume.2 - Bass.1 <-> Contour.1 - D1.2 <-> V1.6 + Bass.3 <-> Contour.3 + D1.K <-> V1.6 J2.Sleeve <-> J2.Sleeve J2.Tip <-> J2.Tip diff --git a/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt index 6dd70273d..605f612f0 100644 --- a/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 10K.1 <-> Bias.3 - 10K.2 <-> 50uF 150v.2 <-> D1.1 + 10K.1 <-> Bias.1 + 10K.2 <-> 50uF 150v.- <-> D1.A 56K.1 <-> 22nF.2 <-> 22nF.2 56K.2 <-> 100K.2 <-> 270pF.2 - 100K.1 <-> 100K.1 <-> 1.5M.1 <-> 270K.1 <-> 33K 1W.2 <-> 12pF.1 <-> 20uF 525v.1 + 100K.1 <-> 100K.1 <-> 1.5M.1 <-> 270K.1 <-> 33K 1W.2 <-> 12pF.1 <-> 20uF 525v.+ 100K.2 <-> 100nF.2 - 1K5.1 <-> 1K5.1 <-> 250uF.2 - 1K5.2 <-> 250uF.1 <-> V1.8 + 1K5.1 <-> 1K5.1 <-> 250uF.- + 1K5.2 <-> 250uF.+ <-> V1.8 1K5.2 <-> V1.3 68K.1 <-> 1M.1 <-> J2.Ring <-> J2.Sleeve <-> J2.Tip 68K.1 <-> J2.Tip @@ -15,29 +15,29 @@ Switch setup: [Default] 1.5M.2 <-> 1uF.1 <-> V1.7 1K.1 <-> 680R.2 <-> 12pF.1 1K.2 <-> 47R.1 <-> 680R.1 <-> 12pF.2 <-> 390pf.2 - 1M.1 <-> Contour.3 <-> Volume.3 + 1M.1 <-> Contour.1 <-> Volume.1 1M.2 <-> Treble.2 <-> V1.8 270K.2 <-> 12pF.2 <-> V1.2 - 680R.1 <-> 18K.2 <-> 47R.2 <-> 50uF 150v.1 <-> 50uF 150v.1 <-> V1.8 - 18K.1 <-> Bias.1 - 100K.1 <-> 100K.1 <-> 50uF 150v.2 <-> Bias.2 + 680R.1 <-> 18K.2 <-> 47R.2 <-> 50uF 150v.+ <-> 50uF 150v.+ <-> V1.8 + 18K.1 <-> Bias.3 + 100K.1 <-> 100K.1 <-> 50uF 150v.- <-> Bias.2 100K.2 <-> 1K.1 <-> 250nF.1 100K.2 <-> 1K.1 <-> 250nF.1 <-> V1.6 - 47K.1 <-> 15K 2W.2 <-> 33K 1W.1 <-> 20uF 525v.1 + 47K.1 <-> 15K 2W.2 <-> 33K 1W.1 <-> 20uF 525v.+ 47K.2 <-> 250nF.2 680R.2 <-> 1uF.2 - 15K 2W.1 <-> 20uF 525v.1 + 15K 2W.1 <-> 20uF 525v.+ 1M.2 <-> J2.Ring <-> J2.Sleeve 47K.1 <-> 250nF.2 <-> V1.3 - 100nF.1 <-> 470pf.1 <-> Volume.1 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 <-> 30uF 525v.2 <-> V1.8 - 22nF.1 <-> Bass.2 <-> Treble.3 + 100nF.1 <-> 470pf.1 <-> Volume.3 + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- <-> 30uF 525v.- <-> V1.8 + 22nF.1 <-> Bass.2 <-> Treble.1 22nF.1 <-> Contour.2 - 270pF.1 <-> Treble.1 + 270pF.1 <-> Treble.3 390pf.1 <-> V1.3 <-> V1.4 470pf.2 <-> V1.2 <-> Volume.2 - Bass.1 <-> Contour.1 - D1.2 <-> V1.6 + Bass.3 <-> Contour.3 + D1.K <-> V1.6 J2.Sleeve <-> J2.Sleeve J2.Tip <-> J2.Tip diff --git a/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt index a04b5e1fa..1fc686581 100644 --- a/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 - 100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 <-> Q1.2 - 100K.2 <-> 1K.1 <-> 1K.2 <-> D1.2 <-> Pitch.2 <-> Pitch.3 - 100K.2 <-> 1K.1 <-> Pitch.2 <-> Pitch.3 - 4.7uF.2 <-> D1.1 - 4.7uF.2 <-> D1.1 <-> Q1.3 + 100K.1 <-> 4.7uF.+ <-> Pitch.3 <-> Q1.1 + 100K.1 <-> 4.7uF.+ <-> Pitch.3 <-> Q1.1 <-> Q1.2 + 100K.2 <-> 1K.1 <-> D1.K <-> Pitch.1 <-> Pitch.2 + 100K.2 <-> 1K.1 <-> Pitch.1 <-> Pitch.2 + 4.7uF.- <-> D1.A + 4.7uF.- <-> D1.A <-> Q1.3 Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt index a04b5e1fa..1fc686581 100644 --- a/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 - 100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 <-> Q1.2 - 100K.2 <-> 1K.1 <-> 1K.2 <-> D1.2 <-> Pitch.2 <-> Pitch.3 - 100K.2 <-> 1K.1 <-> Pitch.2 <-> Pitch.3 - 4.7uF.2 <-> D1.1 - 4.7uF.2 <-> D1.1 <-> Q1.3 + 100K.1 <-> 4.7uF.+ <-> Pitch.3 <-> Q1.1 + 100K.1 <-> 4.7uF.+ <-> Pitch.3 <-> Q1.1 <-> Q1.2 + 100K.2 <-> 1K.1 <-> D1.K <-> Pitch.1 <-> Pitch.2 + 100K.2 <-> 1K.1 <-> Pitch.1 <-> Pitch.2 + 4.7uF.- <-> D1.A + 4.7uF.- <-> D1.A <-> Q1.3 Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt index 65a82ba7b..539c9abb6 100644 --- a/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> IC1.5 <-> Q2.3 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2 - C2.1 <-> C4.1 <-> Q2.1 <-> R1.1 + C1.+ <-> C3.1 <-> IC1.5 <-> Q2.3 + C1.- <-> C2.- <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2 + C2.+ <-> C4.1 <-> Q2.1 <-> R1.1 C5.1 <-> IC1.2 <-> R2.1 C5.2 <-> IC1.1 <-> R3.2 Q1.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt index 65a82ba7b..539c9abb6 100644 --- a/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> IC1.5 <-> Q2.3 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2 - C2.1 <-> C4.1 <-> Q2.1 <-> R1.1 + C1.+ <-> C3.1 <-> IC1.5 <-> Q2.3 + C1.- <-> C2.- <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2 + C2.+ <-> C4.1 <-> Q2.1 <-> R1.1 C5.1 <-> IC1.2 <-> R2.1 C5.2 <-> IC1.1 <-> R3.2 Q1.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/268_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/268_excl_switches.txt index 0d4055208..5e13f4d23 100644 --- a/diylc-regression-data/input/cloud/netlist/268_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/268_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 2N2.2 <-> R1.2 - 2N2.3 <-> IR+.1 - IR+.2 <-> R2.2 + 2N2.3 <-> IR+.A + IR+.K <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/268_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/268_incl_switches.txt index 0d4055208..5e13f4d23 100644 --- a/diylc-regression-data/input/cloud/netlist/268_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/268_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 2N2.2 <-> R1.2 - 2N2.3 <-> IR+.1 - IR+.2 <-> R2.2 + 2N2.3 <-> IR+.A + IR+.K <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/269_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/269_excl_switches.txt index b6949c500..b8b526a12 100644 --- a/diylc-regression-data/input/cloud/netlist/269_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/269_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.2 - C1.1 <-> R1.1 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C2.2 - D1.2 <-> D1.2 + C1.+ <-> C2.1 <-> R1.2 + C1.+ <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.2 + D1.K <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/269_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/269_incl_switches.txt index b6949c500..b8b526a12 100644 --- a/diylc-regression-data/input/cloud/netlist/269_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/269_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.2 - C1.1 <-> R1.1 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C2.2 - D1.2 <-> D1.2 + C1.+ <-> C2.1 <-> R1.2 + C1.+ <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.2 + D1.K <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/270_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/270_excl_switches.txt index b6949c500..b8b526a12 100644 --- a/diylc-regression-data/input/cloud/netlist/270_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/270_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.2 - C1.1 <-> R1.1 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C2.2 - D1.2 <-> D1.2 + C1.+ <-> C2.1 <-> R1.2 + C1.+ <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.2 + D1.K <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/270_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/270_incl_switches.txt index b6949c500..b8b526a12 100644 --- a/diylc-regression-data/input/cloud/netlist/270_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/270_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.2 - C1.1 <-> R1.1 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.1 <-> R1.1 <-> R1.2 - C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> C2.2 - D1.2 <-> D1.2 + C1.+ <-> C2.1 <-> R1.2 + C1.+ <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.2 + D1.K <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/271_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/271_excl_switches.txt index 4905917c2..0373344de 100644 --- a/diylc-regression-data/input/cloud/netlist/271_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/271_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .2 <-> C1.2 <-> R1.1 - .5 <-> D1.2 <-> D1.2 - C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C2.1 - C1.2 <-> C2.2 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 + C1.+ <-> C2.2 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> SW1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.1 + D1.K <-> D1.K <-> SW1.5 + SW1.1 <-> SW1.4 diff --git a/diylc-regression-data/input/cloud/netlist/271_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/271_incl_switches.txt index 5f550aa77..391b4aa0b 100644 --- a/diylc-regression-data/input/cloud/netlist/271_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/271_incl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C2.1 - C1.2 <-> C2.2 <-> R1.2 - C1.2 <-> D1.2 <-> D1.2 <-> R1.1 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 + C1.+ <-> C2.2 <-> R1.2 + C1.+ <-> D1.K <-> D1.K <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.1 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C2.1 - C1.2 <-> C2.2 <-> R1.2 - C1.2 <-> R1.1 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 - C1.2 <-> R1.1 <-> R1.2 - D1.2 <-> D1.2 + C1.+ <-> C2.2 <-> R1.2 + C1.+ <-> R1.1 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.+ <-> R1.1 <-> R1.2 + C1.- <-> C1.- <-> C1.- <-> C1.- <-> C1.- <-> C2.1 + D1.K <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/272_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/272_excl_switches.txt index c5bc55780..36f4e5e2d 100644 --- a/diylc-regression-data/input/cloud/netlist/272_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/272_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] IC1.2 <-> R2.2 IC1.4 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/272_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/272_incl_switches.txt index c5bc55780..36f4e5e2d 100644 --- a/diylc-regression-data/input/cloud/netlist/272_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/272_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] IC1.2 <-> R2.2 IC1.4 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/273_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/273_excl_switches.txt index e06adb094..c4a8c64f4 100644 --- a/diylc-regression-data/input/cloud/netlist/273_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/273_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 100K.1 <-> 100K.1 <-> 1nF.2 - 100K.1 <-> 10uF.2 <-> 10uF.2 <-> 130R.1 <-> 1K.2 <-> 1N4007.1 <-> 2.2nF.2 <-> 2.2nF.2 <-> 22K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47nF.1 <-> 47uF.2 - 100K.2 <-> 10uF.1 <-> 1M.1 <-> 1M.2 <-> 1M.2 <-> 62K.1 + 100K.1 <-> 10uF.- <-> 10uF.- <-> 130R.1 <-> 1K.2 <-> 1N4007.A <-> 2.2nF.2 <-> 2.2nF.2 <-> 22K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47nF.1 <-> 47uF.- + 100K.2 <-> 10uF.+ <-> 1M.1 <-> 1M.2 <-> 1M.2 <-> 62K.1 100K.2 <-> 3K3.1 <-> Q2.1 100K.2 <-> 47nF.2 <-> 47nF.2 100nF.1 <-> 47pF.2 - 100nF.2 <-> 1M.1 <-> 9V1.2 <-> Q3.1 <-> Q3.2 + 100nF.2 <-> 1M.1 <-> 9V1.K <-> Q3.1 <-> Q3.2 100nF.2 <-> 3K3.2 10K.1 <-> 2.2nF.1 10K.1 <-> 220nF.2 10K.2 <-> 10K.2 <-> 2.2nF.1 - 10uF.1 <-> 220K.2 <-> 3K3.2 <-> 9V1.1 - 10uF.1 <-> 3K3.1 <-> 9V1.1 - 10uF.2 <-> 130R.2 - 1K.1 <-> 22uF.2 - 1M.1 <-> 9V1.2 <-> Q2.2 <-> Q2.3 - 1M.2 <-> 3.3nF.1 <-> 9V1.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 - 1N4007.2 <-> 2.2K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47uF.1 <-> 62K.2 + 10uF.+ <-> 220K.2 <-> 3K3.2 <-> 9V1.A + 10uF.+ <-> 3K3.1 <-> 9V1.A + 10uF.- <-> 130R.2 + 1K.1 <-> 22uF.- + 1M.1 <-> 9V1.K <-> Q2.2 <-> Q2.3 + 1M.2 <-> 3.3nF.1 <-> 9V1.K <-> Q1.1 <-> Q1.2 <-> Q1.3 + 1N4007.K <-> 2.2K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47uF.+ <-> 62K.2 1nF.1 <-> 220K.2 <-> 220pF.1 1nF.1 <-> 22K.2 1nF.2 <-> 47nF.1 220K.1 <-> 22K.1 220K.1 <-> 680nF.1 220nF.1 <-> 3K3.1 - 22uF.1 <-> 3K3.1 <-> 9V1.1 + 22uF.+ <-> 3K3.1 <-> 9V1.A 47nF.2 <-> 47pF.1 <-> 680nF.2 diff --git a/diylc-regression-data/input/cloud/netlist/273_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/273_incl_switches.txt index e06adb094..c4a8c64f4 100644 --- a/diylc-regression-data/input/cloud/netlist/273_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/273_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 100K.1 <-> 100K.1 <-> 1nF.2 - 100K.1 <-> 10uF.2 <-> 10uF.2 <-> 130R.1 <-> 1K.2 <-> 1N4007.1 <-> 2.2nF.2 <-> 2.2nF.2 <-> 22K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47nF.1 <-> 47uF.2 - 100K.2 <-> 10uF.1 <-> 1M.1 <-> 1M.2 <-> 1M.2 <-> 62K.1 + 100K.1 <-> 10uF.- <-> 10uF.- <-> 130R.1 <-> 1K.2 <-> 1N4007.A <-> 2.2nF.2 <-> 2.2nF.2 <-> 22K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47nF.1 <-> 47uF.- + 100K.2 <-> 10uF.+ <-> 1M.1 <-> 1M.2 <-> 1M.2 <-> 62K.1 100K.2 <-> 3K3.1 <-> Q2.1 100K.2 <-> 47nF.2 <-> 47nF.2 100nF.1 <-> 47pF.2 - 100nF.2 <-> 1M.1 <-> 9V1.2 <-> Q3.1 <-> Q3.2 + 100nF.2 <-> 1M.1 <-> 9V1.K <-> Q3.1 <-> Q3.2 100nF.2 <-> 3K3.2 10K.1 <-> 2.2nF.1 10K.1 <-> 220nF.2 10K.2 <-> 10K.2 <-> 2.2nF.1 - 10uF.1 <-> 220K.2 <-> 3K3.2 <-> 9V1.1 - 10uF.1 <-> 3K3.1 <-> 9V1.1 - 10uF.2 <-> 130R.2 - 1K.1 <-> 22uF.2 - 1M.1 <-> 9V1.2 <-> Q2.2 <-> Q2.3 - 1M.2 <-> 3.3nF.1 <-> 9V1.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 - 1N4007.2 <-> 2.2K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47uF.1 <-> 62K.2 + 10uF.+ <-> 220K.2 <-> 3K3.2 <-> 9V1.A + 10uF.+ <-> 3K3.1 <-> 9V1.A + 10uF.- <-> 130R.2 + 1K.1 <-> 22uF.- + 1M.1 <-> 9V1.K <-> Q2.2 <-> Q2.3 + 1M.2 <-> 3.3nF.1 <-> 9V1.K <-> Q1.1 <-> Q1.2 <-> Q1.3 + 1N4007.K <-> 2.2K.1 <-> 3K3.1 <-> 3K3.2 <-> 3K3.2 <-> 47uF.+ <-> 62K.2 1nF.1 <-> 220K.2 <-> 220pF.1 1nF.1 <-> 22K.2 1nF.2 <-> 47nF.1 220K.1 <-> 22K.1 220K.1 <-> 680nF.1 220nF.1 <-> 3K3.1 - 22uF.1 <-> 3K3.1 <-> 9V1.1 + 22uF.+ <-> 3K3.1 <-> 9V1.A 47nF.2 <-> 47pF.1 <-> 680nF.2 diff --git a/diylc-regression-data/input/cloud/netlist/274_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/274_excl_switches.txt index cc1f9d959..d1978fe14 100644 --- a/diylc-regression-data/input/cloud/netlist/274_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/274_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1000uF.1 <-> 1000uF.1 <-> 100uH.1 <-> 1K.1 <-> 220uF.1 <-> 4K7.1 <-> 56K.1 <-> D1.2 <-> NE555.4 <-> NE555.5 - 1000uF.2 <-> 1000uF.2 <-> 100pF.2 <-> 2.2nF.1 <-> 220uF.2 <-> 4.7uF.2 <-> 4.7uF.2 <-> 470R.2 <-> D1.1 <-> IRF740.3 <-> NE555.1 + 1000uF.+ <-> 1000uF.+ <-> 100uH.1 <-> 1K.1 <-> 220uF.+ <-> 4K7.1 <-> 56K.1 <-> D1.K <-> NE555.4 <-> NE555.5 + 1000uF.- <-> 1000uF.- <-> 100pF.2 <-> 2.2nF.1 <-> 220uF.- <-> 4.7uF.- <-> 4.7uF.- <-> 470R.2 <-> D1.A <-> IRF740.3 <-> NE555.1 100pF.1 <-> 2k2.1 - 100R.1 <-> 4.7uF.1 - 100R.2 <-> 220k.1 <-> 4.7uF.1 <-> UF4007.2 - 100uH.2 <-> 2k2.2 <-> IRF740.2 <-> UF4007.1 + 100R.1 <-> 4.7uF.+ + 100R.2 <-> 220k.1 <-> 4.7uF.+ <-> UF4007.K + 100uH.2 <-> 2k2.2 <-> IRF740.2 <-> UF4007.A 10k.1 <-> 1K.2 <-> NE555.6 10k.2 <-> 2.2nF.2 <-> NE555.2 <-> NE555.7 1K.1 <-> 470R.1 diff --git a/diylc-regression-data/input/cloud/netlist/274_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/274_incl_switches.txt index cc1f9d959..d1978fe14 100644 --- a/diylc-regression-data/input/cloud/netlist/274_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/274_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1000uF.1 <-> 1000uF.1 <-> 100uH.1 <-> 1K.1 <-> 220uF.1 <-> 4K7.1 <-> 56K.1 <-> D1.2 <-> NE555.4 <-> NE555.5 - 1000uF.2 <-> 1000uF.2 <-> 100pF.2 <-> 2.2nF.1 <-> 220uF.2 <-> 4.7uF.2 <-> 4.7uF.2 <-> 470R.2 <-> D1.1 <-> IRF740.3 <-> NE555.1 + 1000uF.+ <-> 1000uF.+ <-> 100uH.1 <-> 1K.1 <-> 220uF.+ <-> 4K7.1 <-> 56K.1 <-> D1.K <-> NE555.4 <-> NE555.5 + 1000uF.- <-> 1000uF.- <-> 100pF.2 <-> 2.2nF.1 <-> 220uF.- <-> 4.7uF.- <-> 4.7uF.- <-> 470R.2 <-> D1.A <-> IRF740.3 <-> NE555.1 100pF.1 <-> 2k2.1 - 100R.1 <-> 4.7uF.1 - 100R.2 <-> 220k.1 <-> 4.7uF.1 <-> UF4007.2 - 100uH.2 <-> 2k2.2 <-> IRF740.2 <-> UF4007.1 + 100R.1 <-> 4.7uF.+ + 100R.2 <-> 220k.1 <-> 4.7uF.+ <-> UF4007.K + 100uH.2 <-> 2k2.2 <-> IRF740.2 <-> UF4007.A 10k.1 <-> 1K.2 <-> NE555.6 10k.2 <-> 2.2nF.2 <-> NE555.2 <-> NE555.7 1K.1 <-> 470R.1 diff --git a/diylc-regression-data/input/cloud/netlist/275_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/275_excl_switches.txt index c76642bbd..462e9a7d1 100644 --- a/diylc-regression-data/input/cloud/netlist/275_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/275_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> Q1.2 <-> R3.1 <-> Z1.2 - C10.1 <-> D1.2 <-> R17.1 <-> R17.2 <-> R6.2 <-> R7.2 <-> R9.1 - C10.2 <-> C11.2 <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.2 <-> D1.1 <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 - C11.1 <-> R1.2 <-> R17.2 <-> R18.2 <-> R18.2 <-> R3.2 + C1.2 <-> Q1.2 <-> R3.1 <-> Z1.K + C10.+ <-> D1.K <-> R17.1 <-> R17.2 <-> R6.2 <-> R7.2 <-> R9.1 + C10.- <-> C11.- <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.- <-> D1.A <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 + C11.+ <-> R1.2 <-> R17.2 <-> R18.2 <-> R18.2 <-> R3.2 C12.2 <-> R14.2 <-> R15.2 C13.1 <-> R15.1 C14.1 <-> R18.2 <-> R19.2 C14.2 <-> C17.1 <-> R11.1 C15.1 <-> C3.1 C15.2 <-> R10.1 - C16.1 <-> Q1.3 <-> R13.2 <-> R2.2 <-> Z3.1 - C16.2 <-> R16.2 + C16.+ <-> Q1.3 <-> R13.2 <-> R2.2 <-> Z3.A + C16.- <-> R16.2 C18.1 <-> R14.1 C18.2 <-> Q1.1 <-> R9.2 - C19.2 <-> Q1.2 <-> R18.1 <-> Z3.2 - C2.1 <-> Q1.3 <-> R4.2 <-> Z1.1 - C2.2 <-> R12.2 + C19.2 <-> Q1.2 <-> R18.1 <-> Z3.K + C2.+ <-> Q1.3 <-> R4.2 <-> Z1.A + C2.- <-> R12.2 C3.2 <-> C6.2 <-> R18.1 C4.1 <-> C5.1 <-> C8.1 - C4.2 <-> Q2.2 <-> R1.1 <-> Z2.2 + C4.2 <-> Q2.2 <-> R1.1 <-> Z2.K C5.2 <-> C7.2 C7.1 <-> Q1.1 <-> R7.1 C8.2 <-> R13.1 - C9.1 <-> Q2.3 <-> R5.2 <-> Z2.1 + C9.+ <-> Q2.3 <-> R5.2 <-> Z2.A Q2.1 <-> R19.1 <-> R6.1 R10.2 <-> R11.2 diff --git a/diylc-regression-data/input/cloud/netlist/275_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/275_incl_switches.txt index c76642bbd..462e9a7d1 100644 --- a/diylc-regression-data/input/cloud/netlist/275_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/275_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> Q1.2 <-> R3.1 <-> Z1.2 - C10.1 <-> D1.2 <-> R17.1 <-> R17.2 <-> R6.2 <-> R7.2 <-> R9.1 - C10.2 <-> C11.2 <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.2 <-> D1.1 <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 - C11.1 <-> R1.2 <-> R17.2 <-> R18.2 <-> R18.2 <-> R3.2 + C1.2 <-> Q1.2 <-> R3.1 <-> Z1.K + C10.+ <-> D1.K <-> R17.1 <-> R17.2 <-> R6.2 <-> R7.2 <-> R9.1 + C10.- <-> C11.- <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.- <-> D1.A <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 + C11.+ <-> R1.2 <-> R17.2 <-> R18.2 <-> R18.2 <-> R3.2 C12.2 <-> R14.2 <-> R15.2 C13.1 <-> R15.1 C14.1 <-> R18.2 <-> R19.2 C14.2 <-> C17.1 <-> R11.1 C15.1 <-> C3.1 C15.2 <-> R10.1 - C16.1 <-> Q1.3 <-> R13.2 <-> R2.2 <-> Z3.1 - C16.2 <-> R16.2 + C16.+ <-> Q1.3 <-> R13.2 <-> R2.2 <-> Z3.A + C16.- <-> R16.2 C18.1 <-> R14.1 C18.2 <-> Q1.1 <-> R9.2 - C19.2 <-> Q1.2 <-> R18.1 <-> Z3.2 - C2.1 <-> Q1.3 <-> R4.2 <-> Z1.1 - C2.2 <-> R12.2 + C19.2 <-> Q1.2 <-> R18.1 <-> Z3.K + C2.+ <-> Q1.3 <-> R4.2 <-> Z1.A + C2.- <-> R12.2 C3.2 <-> C6.2 <-> R18.1 C4.1 <-> C5.1 <-> C8.1 - C4.2 <-> Q2.2 <-> R1.1 <-> Z2.2 + C4.2 <-> Q2.2 <-> R1.1 <-> Z2.K C5.2 <-> C7.2 C7.1 <-> Q1.1 <-> R7.1 C8.2 <-> R13.1 - C9.1 <-> Q2.3 <-> R5.2 <-> Z2.1 + C9.+ <-> Q2.3 <-> R5.2 <-> Z2.A Q2.1 <-> R19.1 <-> R6.1 R10.2 <-> R11.2 diff --git a/diylc-regression-data/input/cloud/netlist/276_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/276_excl_switches.txt index 6b37b5cc8..7d3478390 100644 --- a/diylc-regression-data/input/cloud/netlist/276_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/276_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> Q1.2 <-> R3.1 <-> Z1.2 - C10.1 <-> D1.2 <-> R17.1 <-> R20.2 <-> R6.2 <-> R7.2 <-> R9.1 - C10.2 <-> C11.2 <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.2 <-> D1.1 <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 - C11.1 <-> R1.2 <-> R17.2 <-> R18.2 <-> R21.2 <-> R3.2 + C1.2 <-> Q1.2 <-> R3.1 <-> Z1.K + C10.+ <-> D1.K <-> R17.1 <-> R20.2 <-> R6.2 <-> R7.2 <-> R9.1 + C10.- <-> C11.- <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.- <-> D1.A <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 + C11.+ <-> R1.2 <-> R17.2 <-> R18.2 <-> R21.2 <-> R3.2 C12.2 <-> R14.2 <-> R15.2 C13.1 <-> R15.1 C14.1 <-> R19.2 <-> R22.2 C14.2 <-> C17.1 <-> R11.1 C15.1 <-> C3.1 C15.2 <-> R10.1 - C16.1 <-> Q3.3 <-> R13.2 <-> R2.2 <-> Z3.1 - C16.2 <-> R16.2 + C16.+ <-> Q3.3 <-> R13.2 <-> R2.2 <-> Z3.A + C16.- <-> R16.2 C18.1 <-> R14.1 C18.2 <-> Q3.1 <-> R9.2 - C19.2 <-> Q3.2 <-> R21.1 <-> Z3.2 - C2.1 <-> Q1.3 <-> R4.2 <-> Z1.1 - C2.2 <-> R12.2 + C19.2 <-> Q3.2 <-> R21.1 <-> Z3.K + C2.+ <-> Q1.3 <-> R4.2 <-> Z1.A + C2.- <-> R12.2 C3.2 <-> C6.2 <-> R19.1 C4.1 <-> C5.1 <-> C8.1 - C4.2 <-> Q2.2 <-> R1.1 <-> Z2.2 + C4.2 <-> Q2.2 <-> R1.1 <-> Z2.K C5.2 <-> C7.2 C7.1 <-> Q1.1 <-> R7.1 C8.2 <-> R13.1 - C9.1 <-> Q2.3 <-> R5.2 <-> Z2.1 + C9.+ <-> Q2.3 <-> R5.2 <-> Z2.A Q2.1 <-> R22.1 <-> R6.1 R10.2 <-> R11.2 diff --git a/diylc-regression-data/input/cloud/netlist/276_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/276_incl_switches.txt index 6b37b5cc8..7d3478390 100644 --- a/diylc-regression-data/input/cloud/netlist/276_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/276_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> Q1.2 <-> R3.1 <-> Z1.2 - C10.1 <-> D1.2 <-> R17.1 <-> R20.2 <-> R6.2 <-> R7.2 <-> R9.1 - C10.2 <-> C11.2 <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.2 <-> D1.1 <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 - C11.1 <-> R1.2 <-> R17.2 <-> R18.2 <-> R21.2 <-> R3.2 + C1.2 <-> Q1.2 <-> R3.1 <-> Z1.K + C10.+ <-> D1.K <-> R17.1 <-> R20.2 <-> R6.2 <-> R7.2 <-> R9.1 + C10.- <-> C11.- <-> C12.1 <-> C13.2 <-> C6.1 <-> C9.- <-> D1.A <-> R12.1 <-> R16.1 <-> R18.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.2 + C11.+ <-> R1.2 <-> R17.2 <-> R18.2 <-> R21.2 <-> R3.2 C12.2 <-> R14.2 <-> R15.2 C13.1 <-> R15.1 C14.1 <-> R19.2 <-> R22.2 C14.2 <-> C17.1 <-> R11.1 C15.1 <-> C3.1 C15.2 <-> R10.1 - C16.1 <-> Q3.3 <-> R13.2 <-> R2.2 <-> Z3.1 - C16.2 <-> R16.2 + C16.+ <-> Q3.3 <-> R13.2 <-> R2.2 <-> Z3.A + C16.- <-> R16.2 C18.1 <-> R14.1 C18.2 <-> Q3.1 <-> R9.2 - C19.2 <-> Q3.2 <-> R21.1 <-> Z3.2 - C2.1 <-> Q1.3 <-> R4.2 <-> Z1.1 - C2.2 <-> R12.2 + C19.2 <-> Q3.2 <-> R21.1 <-> Z3.K + C2.+ <-> Q1.3 <-> R4.2 <-> Z1.A + C2.- <-> R12.2 C3.2 <-> C6.2 <-> R19.1 C4.1 <-> C5.1 <-> C8.1 - C4.2 <-> Q2.2 <-> R1.1 <-> Z2.2 + C4.2 <-> Q2.2 <-> R1.1 <-> Z2.K C5.2 <-> C7.2 C7.1 <-> Q1.1 <-> R7.1 C8.2 <-> R13.1 - C9.1 <-> Q2.3 <-> R5.2 <-> Z2.1 + C9.+ <-> Q2.3 <-> R5.2 <-> Z2.A Q2.1 <-> R22.1 <-> R6.1 R10.2 <-> R11.2 diff --git a/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt index bafd47345..83ef498e6 100644 --- a/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.3 <-> C1.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.3 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 - Brilliant Volume.1 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 + Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.1 <-> C1.1 <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.1 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 Brilliant Volume.2 <-> R2.1 + Brilliant Volume.3 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 C1.2 <-> C2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> V2.6 <-> V2.7 <-> V2.8 C2.1 <-> VR8.1 - C2.2 <-> Normal Volume.1 + C2.2 <-> Normal Volume.3 C6.1 <-> C7.1 <-> R2.1 J1.3 <-> R1.1 J1.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt index bafd47345..83ef498e6 100644 --- a/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.3 <-> C1.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.3 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 - Brilliant Volume.1 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 + Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.1 <-> C1.1 <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.1 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 Brilliant Volume.2 <-> R2.1 + Brilliant Volume.3 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 C1.2 <-> C2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> V2.6 <-> V2.7 <-> V2.8 C2.1 <-> VR8.1 - C2.2 <-> Normal Volume.1 + C2.2 <-> Normal Volume.3 C6.1 <-> C7.1 <-> R2.1 J1.3 <-> R1.1 J1.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt index bafd47345..83ef498e6 100644 --- a/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.3 <-> C1.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.3 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 - Brilliant Volume.1 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 + Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.1 <-> C1.1 <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.1 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 Brilliant Volume.2 <-> R2.1 + Brilliant Volume.3 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 C1.2 <-> C2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> V2.6 <-> V2.7 <-> V2.8 C2.1 <-> VR8.1 - C2.2 <-> Normal Volume.1 + C2.2 <-> Normal Volume.3 C6.1 <-> C7.1 <-> R2.1 J1.3 <-> R1.1 J1.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt index bafd47345..83ef498e6 100644 --- a/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.3 <-> C1.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.3 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 - Brilliant Volume.1 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 + Bass.1 <-> Bass.2 <-> Bass.3 <-> Brilliant Volume.1 <-> C1.1 <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.+ <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.1 <-> C2.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.1 <-> C4.2 <-> C4.2 <-> C4.2 <-> C6.1 <-> C6.1 <-> C6.1 <-> C6.2 <-> C6.2 <-> C6.2 <-> C7.2 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.1 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.2 <-> J1.4 <-> J1.4 <-> J1.4 <-> J1.4 <-> Middle.1 <-> Middle.2 <-> Middle.3 <-> Normal Volume.1 <-> Presence.1 <-> Presence.2 <-> Presence.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> Treble.1 <-> Treble.2 <-> Treble.3 <-> V2.2 <-> V2.2 <-> V2.2 <-> V2.3 <-> V2.3 <-> V2.3 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.4 <-> V2.6 <-> V2.6 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.7 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.8 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> V2.9 <-> VR7.1 <-> VR7.2 <-> VR7.2 <-> VR7.3 <-> VR7.3 <-> VR8.3 Brilliant Volume.2 <-> R2.1 + Brilliant Volume.3 <-> C4.1 <-> R2.1 <-> R2.2 <-> R2.2 C1.2 <-> C2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> V2.6 <-> V2.7 <-> V2.8 C2.1 <-> VR8.1 - C2.2 <-> Normal Volume.1 + C2.2 <-> Normal Volume.3 C6.1 <-> C7.1 <-> R2.1 J1.3 <-> R1.1 J1.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt index 9e0a7f690..8eb40b777 100644 --- a/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R7.2 <-> V1.3 <-> V1.8 - C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3 + C1.+ <-> R7.2 <-> V1.3 <-> V1.8 + C1.- <-> C10.1 <-> C2.- <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.- <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3 C10.2 <-> C9.1 <-> R15.2 - C2.1 <-> R10.1 <-> R8.1 <-> R9.1 + C2.+ <-> R10.1 <-> R8.1 <-> R9.1 C3.1 <-> C5.1 <-> R8.2 C4.1 <-> R9.2 <-> V1.1 C5.2 <-> R11.1 <-> R12.1 <-> R13.1 C6.1 <-> V2.2 <-> VR3.2 - C7.1 <-> R20.1 <-> V2.3 + C7.+ <-> R20.1 <-> V2.3 C8.1 <-> R16.2 C8.2 <-> R14.2 C9.2 <-> R17.1 diff --git a/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt index 9e0a7f690..8eb40b777 100644 --- a/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R7.2 <-> V1.3 <-> V1.8 - C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3 + C1.+ <-> R7.2 <-> V1.3 <-> V1.8 + C1.- <-> C10.1 <-> C2.- <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.- <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3 C10.2 <-> C9.1 <-> R15.2 - C2.1 <-> R10.1 <-> R8.1 <-> R9.1 + C2.+ <-> R10.1 <-> R8.1 <-> R9.1 C3.1 <-> C5.1 <-> R8.2 C4.1 <-> R9.2 <-> V1.1 C5.2 <-> R11.1 <-> R12.1 <-> R13.1 C6.1 <-> V2.2 <-> VR3.2 - C7.1 <-> R20.1 <-> V2.3 + C7.+ <-> R20.1 <-> V2.3 C8.1 <-> R16.2 C8.2 <-> R14.2 C9.2 <-> R17.1 diff --git a/diylc-regression-data/input/cloud/netlist/280_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/280_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/280_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/280_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/280_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/280_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/280_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/280_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/281_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/281_excl_switches.txt index 085425567..01c7e4992 100644 --- a/diylc-regression-data/input/cloud/netlist/281_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/281_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D4.2 <-> IC1.11 <-> R3.1 <-> R5.2 - C1.2 <-> C2.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> IC1.10 + C1.1 <-> C5.+ <-> D4.K <-> IC1.11 <-> R3.1 <-> R5.2 + C1.2 <-> C2.2 <-> C3.2 <-> C5.- <-> D1.A <-> D2.A <-> IC1.10 C2.1 <-> IC1.4 <-> X1.2 C3.1 <-> IC1.5 <-> X1.1 - D1.2 <-> R1.2 <-> R3.2 - D2.2 <-> R2.2 - D3.2 <-> D4.1 + D1.K <-> R1.2 <-> R3.2 + D2.K <-> R2.2 + D3.K <-> D4.A IC1.1 <-> R5.1 IC1.6 <-> R1.1 IC1.8 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/281_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/281_incl_switches.txt index 085425567..01c7e4992 100644 --- a/diylc-regression-data/input/cloud/netlist/281_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/281_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D4.2 <-> IC1.11 <-> R3.1 <-> R5.2 - C1.2 <-> C2.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> IC1.10 + C1.1 <-> C5.+ <-> D4.K <-> IC1.11 <-> R3.1 <-> R5.2 + C1.2 <-> C2.2 <-> C3.2 <-> C5.- <-> D1.A <-> D2.A <-> IC1.10 C2.1 <-> IC1.4 <-> X1.2 C3.1 <-> IC1.5 <-> X1.1 - D1.2 <-> R1.2 <-> R3.2 - D2.2 <-> R2.2 - D3.2 <-> D4.1 + D1.K <-> R1.2 <-> R3.2 + D2.K <-> R2.2 + D3.K <-> D4.A IC1.1 <-> R5.1 IC1.6 <-> R1.1 IC1.8 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/282_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/282_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/282_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/282_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/282_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/282_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/282_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/282_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/283_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/283_excl_switches.txt index e1f20ac62..cc5430b1b 100644 --- a/diylc-regression-data/input/cloud/netlist/283_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/283_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1,8K.1 <-> 1,8K.2 <-> 1,8K.2 <-> 18K.1 <-> 0,047.1 <-> 0,47.1 <-> 0,47.2 <-> 0,47.2 <-> 100K.1 <-> 100K.2 <-> 100uF.1 <-> 100uF.2 <-> 1M.1 <-> 1M.2 <-> 220K.1 <-> 270pF.1 <-> 270pF.1 <-> 470K.1 <-> 470K.2 <-> 56K.1 <-> 56K.1 <-> 56K.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 + 1,8K.1 <-> 1,8K.2 <-> 1,8K.2 <-> 18K.1 <-> 0,047.1 <-> 0,47.1 <-> 0,47.2 <-> 0,47.2 <-> 100K.1 <-> 100K.2 <-> 100uF.+ <-> 100uF.- <-> 1M.1 <-> 1M.2 <-> 220K.1 <-> 270pF.1 <-> 270pF.1 <-> 470K.1 <-> 470K.2 <-> 56K.1 <-> 56K.1 <-> 56K.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 1,8K.1 <-> 18K.2 <-> 470K.1 0,0047.1 <-> 56K.2 - 0,0047.2 <-> 56K.2 + 0,0047.2 <-> 470K.2 <-> 56K.2 0,47.1 <-> 56K.1 <-> 56K.2 270pF.2 <-> 56K.1 V1.4 <-> V1.5 - VR1.1 <-> VR1.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/283_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/283_incl_switches.txt index e1f20ac62..cc5430b1b 100644 --- a/diylc-regression-data/input/cloud/netlist/283_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/283_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1,8K.1 <-> 1,8K.2 <-> 1,8K.2 <-> 18K.1 <-> 0,047.1 <-> 0,47.1 <-> 0,47.2 <-> 0,47.2 <-> 100K.1 <-> 100K.2 <-> 100uF.1 <-> 100uF.2 <-> 1M.1 <-> 1M.2 <-> 220K.1 <-> 270pF.1 <-> 270pF.1 <-> 470K.1 <-> 470K.2 <-> 56K.1 <-> 56K.1 <-> 56K.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 + 1,8K.1 <-> 1,8K.2 <-> 1,8K.2 <-> 18K.1 <-> 0,047.1 <-> 0,47.1 <-> 0,47.2 <-> 0,47.2 <-> 100K.1 <-> 100K.2 <-> 100uF.+ <-> 100uF.- <-> 1M.1 <-> 1M.2 <-> 220K.1 <-> 270pF.1 <-> 270pF.1 <-> 470K.1 <-> 470K.2 <-> 56K.1 <-> 56K.1 <-> 56K.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 1,8K.1 <-> 18K.2 <-> 470K.1 0,0047.1 <-> 56K.2 - 0,0047.2 <-> 56K.2 + 0,0047.2 <-> 470K.2 <-> 56K.2 0,47.1 <-> 56K.1 <-> 56K.2 270pF.2 <-> 56K.1 V1.4 <-> V1.5 - VR1.1 <-> VR1.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/284_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/284_excl_switches.txt index ce1b935b8..95ecb5bef 100644 --- a/diylc-regression-data/input/cloud/netlist/284_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/284_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> VR1.2 - C1.2 <-> D1.1 <-> R3.1 + C1.+ <-> C2.+ <-> VR1.2 + C1.- <-> D1.A <-> R3.1 C10.2 <-> C11.2 <-> R19.1 C12.2 <-> R19.2 <-> R20.1 C13.1 <-> R21.2 C13.2 <-> R20.2 <-> R21.1 - C14.1 <-> R22.2 - C14.2 <-> C15.1 <-> C8.2 <-> R22.1 <-> R23.1 + C14.+ <-> R22.2 + C14.- <-> C15.1 <-> C8.- <-> R22.1 <-> R23.1 C15.2 <-> R23.2 C16.1 <-> R25.1 C17.2 <-> R26.1 C18.2 <-> R27.1 - C2.2 <-> R10.2 <-> R11.2 <-> R3.2 <-> R4.1 + C2.- <-> R10.2 <-> R11.2 <-> R3.2 <-> R4.1 C3.1 <-> C4.2 <-> R8.2 C3.2 <-> C5.2 <-> R9.2 C4.1 <-> R10.1 @@ -20,9 +20,9 @@ Switch setup: [Default] C6.1 <-> R12.2 <-> R13.1 C6.2 <-> R14.1 C7.2 <-> R15.1 - C8.1 <-> R17.2 <-> R18.1 - C9.1 <-> R17.1 <-> R26.2 <-> R27.2 - D1.2 <-> R1.2 + C8.+ <-> R17.2 <-> R18.1 + C9.+ <-> R17.1 <-> R26.2 <-> R27.2 + D1.K <-> R1.2 R13.2 <-> R14.2 <-> R15.2 <-> R16.1 R18.2 <-> R6.2 <-> R8.1 <-> R9.1 R2.1 <-> R5.1 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/284_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/284_incl_switches.txt index ce1b935b8..95ecb5bef 100644 --- a/diylc-regression-data/input/cloud/netlist/284_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/284_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> VR1.2 - C1.2 <-> D1.1 <-> R3.1 + C1.+ <-> C2.+ <-> VR1.2 + C1.- <-> D1.A <-> R3.1 C10.2 <-> C11.2 <-> R19.1 C12.2 <-> R19.2 <-> R20.1 C13.1 <-> R21.2 C13.2 <-> R20.2 <-> R21.1 - C14.1 <-> R22.2 - C14.2 <-> C15.1 <-> C8.2 <-> R22.1 <-> R23.1 + C14.+ <-> R22.2 + C14.- <-> C15.1 <-> C8.- <-> R22.1 <-> R23.1 C15.2 <-> R23.2 C16.1 <-> R25.1 C17.2 <-> R26.1 C18.2 <-> R27.1 - C2.2 <-> R10.2 <-> R11.2 <-> R3.2 <-> R4.1 + C2.- <-> R10.2 <-> R11.2 <-> R3.2 <-> R4.1 C3.1 <-> C4.2 <-> R8.2 C3.2 <-> C5.2 <-> R9.2 C4.1 <-> R10.1 @@ -20,9 +20,9 @@ Switch setup: [Default] C6.1 <-> R12.2 <-> R13.1 C6.2 <-> R14.1 C7.2 <-> R15.1 - C8.1 <-> R17.2 <-> R18.1 - C9.1 <-> R17.1 <-> R26.2 <-> R27.2 - D1.2 <-> R1.2 + C8.+ <-> R17.2 <-> R18.1 + C9.+ <-> R17.1 <-> R26.2 <-> R27.2 + D1.K <-> R1.2 R13.2 <-> R14.2 <-> R15.2 <-> R16.1 R18.2 <-> R6.2 <-> R8.1 <-> R9.1 R2.1 <-> R5.1 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/285_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/285_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/285_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/285_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/285_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/285_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/285_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/285_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/286_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/286_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/286_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/286_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/286_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/286_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/286_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/286_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt index 11fa66c36..48876aaba 100644 --- a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt @@ -1,21 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 33pf.1 <-> OP07.1 33pf.2 <-> OP07.5 - C1.1 <-> R2.2 <-> R3.2 <-> R5.1 - C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C5.2 <-> C7.2 <-> C8.2 <-> D1.1 <-> D3.2 <-> D4.2 <-> OP07.4 <-> R11.2 <-> R12.2 <-> R3.1 <-> R4.1 <-> Volume.3 + C1.+ <-> R2.2 <-> R3.2 <-> R5.1 + C1.- <-> C10.1 <-> C2.- <-> C3.2 <-> C5.2 <-> C7.- <-> C8.- <-> D1.A <-> D3.K <-> D4.K <-> OP07.4 <-> R11.2 <-> R12.2 <-> R3.1 <-> R4.1 <-> Volume.1 C10.2 <-> C11.2 <-> R10.2 C11.1 <-> Q1.3 <-> R11.1 - C12.1 <-> Q1.2 <-> R12.1 - C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 + C12.+ <-> Q1.2 <-> R12.1 + C12.- <-> Volume.3 + C2.+ <-> C3.1 <-> D1.K <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 C4.1 <-> R4.2 C4.2 <-> R5.2 <-> R6.1 C5.1 <-> OP07.3 <-> R6.2 - C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1 - C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7 - C7.1 <-> R8.2 - C8.1 <-> R7.2 - C9.2 <-> R9.1 - D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 - D4.1 <-> R13.1 + C6.1 <-> Dist.2 <-> Dist.3 <-> OP07.2 <-> R7.1 <-> R8.1 + C6.2 <-> C9.+ <-> Dist.1 <-> OP07.7 + C7.+ <-> R8.2 + C8.+ <-> R7.2 + C9.- <-> R9.1 + D2.K <-> D3.A <-> R9.2 <-> Tone.2 <-> Tone.3 + D4.A <-> R13.1 + J1.1 <-> R1.1 <-> R13.2 + R10.1 <-> Tone.1 diff --git a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt index 11fa66c36..48876aaba 100644 --- a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt @@ -1,21 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 33pf.1 <-> OP07.1 33pf.2 <-> OP07.5 - C1.1 <-> R2.2 <-> R3.2 <-> R5.1 - C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C5.2 <-> C7.2 <-> C8.2 <-> D1.1 <-> D3.2 <-> D4.2 <-> OP07.4 <-> R11.2 <-> R12.2 <-> R3.1 <-> R4.1 <-> Volume.3 + C1.+ <-> R2.2 <-> R3.2 <-> R5.1 + C1.- <-> C10.1 <-> C2.- <-> C3.2 <-> C5.2 <-> C7.- <-> C8.- <-> D1.A <-> D3.K <-> D4.K <-> OP07.4 <-> R11.2 <-> R12.2 <-> R3.1 <-> R4.1 <-> Volume.1 C10.2 <-> C11.2 <-> R10.2 C11.1 <-> Q1.3 <-> R11.1 - C12.1 <-> Q1.2 <-> R12.1 - C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 + C12.+ <-> Q1.2 <-> R12.1 + C12.- <-> Volume.3 + C2.+ <-> C3.1 <-> D1.K <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 C4.1 <-> R4.2 C4.2 <-> R5.2 <-> R6.1 C5.1 <-> OP07.3 <-> R6.2 - C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1 - C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7 - C7.1 <-> R8.2 - C8.1 <-> R7.2 - C9.2 <-> R9.1 - D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 - D4.1 <-> R13.1 + C6.1 <-> Dist.2 <-> Dist.3 <-> OP07.2 <-> R7.1 <-> R8.1 + C6.2 <-> C9.+ <-> Dist.1 <-> OP07.7 + C7.+ <-> R8.2 + C8.+ <-> R7.2 + C9.- <-> R9.1 + D2.K <-> D3.A <-> R9.2 <-> Tone.2 <-> Tone.3 + D4.A <-> R13.1 + J1.1 <-> R1.1 <-> R13.2 + R10.1 <-> Tone.1 diff --git a/diylc-regression-data/input/cloud/netlist/288_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/288_excl_switches.txt index 142220cbf..dd33f5d5e 100644 --- a/diylc-regression-data/input/cloud/netlist/288_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/288_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> .2 <-> .2 + SW1.2 <-> SW2.2 <-> SW3.2 diff --git a/diylc-regression-data/input/cloud/netlist/288_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/288_incl_switches.txt index 8e861537a..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/288_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/288_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt index 277e64e9b..e82adf088 100644 --- a/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> B1.B1.+ - .2 <-> .2 <-> .2 - .2 <-> J1.Ring - B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 + B1.B1.+ <-> CTS Push/Pull.1 + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.1 + CTS Push/Pull.2 <-> J1.Ring J1.Tip <-> Volume.2 + SW1.2 <-> SW2.2 <-> SW3.2 diff --git a/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt index fe1a4f904..30863c7e6 100644 --- a/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON1] +Switch setup: [ CTS Push/Pull.ON1 ] B1.B1.+ <-> J1.Ring - B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.1 J1.Tip <-> Volume.2 -Switch setup: [.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON2] +Switch setup: [ CTS Push/Pull.ON2 ] - B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.1 J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/290_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/290_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/290_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/290_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/290_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/290_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/290_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/290_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt index 0139ca8a8..c2f082ee1 100644 --- a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 10K.1 <-> 22nF.2 10K.2 <-> 470K.2 <-> IC1.2 - 10uF.1 <-> 470K.1 - 10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND + 10uF.+ <-> 470K.1 + 10uF.- <-> 1M.2 <-> 2.2nF.2 <-> D1.K <-> GND 1M.1 <-> 2.2nF.1 <-> 22nF.1 - D1.1 <-> IC1.4 + D1.A <-> IC1.4 diff --git a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt index 0139ca8a8..c2f082ee1 100644 --- a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 10K.1 <-> 22nF.2 10K.2 <-> 470K.2 <-> IC1.2 - 10uF.1 <-> 470K.1 - 10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND + 10uF.+ <-> 470K.1 + 10uF.- <-> 1M.2 <-> 2.2nF.2 <-> D1.K <-> GND 1M.1 <-> 2.2nF.1 <-> 22nF.1 - D1.1 <-> IC1.4 + D1.A <-> IC1.4 diff --git a/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt index c42ec7516..55909230c 100644 --- a/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt @@ -1,47 +1,50 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .003µF 630V.1 <-> R1.2 - .003µF 630V.2 <-> Reverb.1 + .003µF 630V.2 <-> Reverb.3 .02µF 630V.1 <-> .02µF 630v.1 .02µF 630V.1 <-> .1µF 630v.2 <-> R1.2 .02µF 630V.1 <-> R1.2 .02µF 630V.2 <-> .02µF 630v.2 <-> R1.2 - .02µF 630V.2 <-> 25µF 50V.2 <-> R1.1 <-> R1.1 <-> R1.1 + .02µF 630V.2 <-> 25µF 50V.- <-> R1.1 <-> R1.1 <-> R1.1 .02µF 630V.2 <-> C1.1 <-> C1.2 <-> R1.1 .047µF 630V.1 <-> .1µF 630V.2 <-> R1.2 - .047µF 630V.2 <-> Bass.3 <-> R1.1 + .047µF 630V.2 <-> Bass.1 <-> R1.1 .1µF 630V.1 <-> 220K.1 .1µF 630V.1 <-> 220K.1 .1µF 630V.1 <-> 470 K.2 <-> R1.1 .1µF 630V.2 <-> R1.1 .1µF 630V.2 <-> R1.2 .1µF 630V.2 <-> R1.2 - 100K 1W 5%.2 <-> 1N4007.2 - 100uF 100v.2 <-> 1N4007.1 - 10K.1 <-> BIAS.3 - 10K.2 <-> V2.8 <-> V5.8 + .1µF 630v.1 <-> Tremolo Intensity.3 + 100K 1W 5%.2 <-> 1N4007.K + 100uF 100v.- <-> 1N4007.A <-> BIAS.3 + 10K.1 <-> BIAS.1 + 10K.2 <-> FH1.2 <-> V2.8 <-> V5.8 18K 3W.1 <-> R1.1 - 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P - 1N4007.1 <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 - 1N4007.2 <-> V2.4 - 1N4007.2 <-> V2.6 + 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P <-> V3.G <-> V3.G + 1N4007.A <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 + 1N4007.A <-> V2.3 + 1N4007.K <-> V2.4 + 1N4007.K <-> V2.6 220K.2 <-> 220K.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 <-> V1.C - 25µF 50V.1 <-> V3. C - 25µF 50V.2 <-> R1.1 <-> R1.1 - 25µF 50V.2 <-> R1.1 <-> R1.1 - 25µF 50V.2 <-> R1.1 <-> R1.2 <-> R1.2 - 25µF 50V.2 <-> R1.2 <-> R1.2 - 470 K.1 <-> V4.G + 25µF 50V.+ <-> R1.1 <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 <-> V1.C <-> V1.C + 25µF 50V.+ <-> R1.2 <-> V3.C <-> V3.C + 25µF 50V.- <-> R1.1 <-> R1.1 + 25µF 50V.- <-> R1.1 <-> R1.1 + 25µF 50V.- <-> R1.1 <-> R1.2 <-> R1.2 + 25µF 50V.- <-> R1.1 <-> R1.2 <-> R1.2 + 470 K.1 <-> R1.1 <-> V4.G <-> V4.G 470 K.1 <-> V5.4 470 K.2 <-> V5.6 - Bass.2 <-> Treble.3 - BIAS.2 <-> Tremolo Intensity.3 + Bass.2 <-> Treble.1 + BIAS.2 <-> Tremolo Intensity.1 C1.1 <-> R1.2 - C1.1 <-> Treble.1 + C1.1 <-> Treble.3 C1.2 <-> R1.1 <-> R1.2 C1.2 <-> R1.2 <-> R1.2 J1.Tip <-> R1.1 @@ -51,14 +54,24 @@ Switch setup: [Default] R1.1 <-> R1.2 R1.1 <-> Reverb.2 R1.1 <-> V2.1 - R1.1 <-> V4. G R1.1 <-> V5.1 R1.2 <-> R1.2 <-> R1.2 R1.2 <-> R1.2 <-> Volume.2 - R1.2 <-> Reverb.3 + R1.2 <-> Reverb.1 R1.2 <-> V2.5 R1.2 <-> V5.5 - Treble.2 <-> Volume.1 - V2. C <-> V2.C - V4.Fil <-> V4.Fil + Treble.2 <-> Volume.3 + Tremolo Speed.1 <-> Tremolo Speed.2 + V1.Fil <-> V1.Fil <-> V1.Fil + V1.G <-> V1.G + V1.P <-> V1.P + V2.C <-> V2.C + V2.Fil <-> V2.Fil + V2.Fil <-> V2.Fil <-> V2.Fil + V2.G <-> V2.G + V3.Fil <-> V3.Fil <-> V3.Fil + V3.P <-> V3.P + V4.C <-> V4.C + V4.Fil <-> V4.Fil <-> V4.Fil + V4.P <-> V4.P diff --git a/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt index c42ec7516..55909230c 100644 --- a/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt @@ -1,47 +1,50 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .003µF 630V.1 <-> R1.2 - .003µF 630V.2 <-> Reverb.1 + .003µF 630V.2 <-> Reverb.3 .02µF 630V.1 <-> .02µF 630v.1 .02µF 630V.1 <-> .1µF 630v.2 <-> R1.2 .02µF 630V.1 <-> R1.2 .02µF 630V.2 <-> .02µF 630v.2 <-> R1.2 - .02µF 630V.2 <-> 25µF 50V.2 <-> R1.1 <-> R1.1 <-> R1.1 + .02µF 630V.2 <-> 25µF 50V.- <-> R1.1 <-> R1.1 <-> R1.1 .02µF 630V.2 <-> C1.1 <-> C1.2 <-> R1.1 .047µF 630V.1 <-> .1µF 630V.2 <-> R1.2 - .047µF 630V.2 <-> Bass.3 <-> R1.1 + .047µF 630V.2 <-> Bass.1 <-> R1.1 .1µF 630V.1 <-> 220K.1 .1µF 630V.1 <-> 220K.1 .1µF 630V.1 <-> 470 K.2 <-> R1.1 .1µF 630V.2 <-> R1.1 .1µF 630V.2 <-> R1.2 .1µF 630V.2 <-> R1.2 - 100K 1W 5%.2 <-> 1N4007.2 - 100uF 100v.2 <-> 1N4007.1 - 10K.1 <-> BIAS.3 - 10K.2 <-> V2.8 <-> V5.8 + .1µF 630v.1 <-> Tremolo Intensity.3 + 100K 1W 5%.2 <-> 1N4007.K + 100uF 100v.- <-> 1N4007.A <-> BIAS.3 + 10K.1 <-> BIAS.1 + 10K.2 <-> FH1.2 <-> V2.8 <-> V5.8 18K 3W.1 <-> R1.1 - 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P - 1N4007.1 <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 - 1N4007.2 <-> V2.4 - 1N4007.2 <-> V2.6 + 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P <-> V3.G <-> V3.G + 1N4007.A <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 + 1N4007.A <-> V2.3 + 1N4007.K <-> V2.4 + 1N4007.K <-> V2.6 220K.2 <-> 220K.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 - 25µF 50V.1 <-> R1.2 <-> V1.C - 25µF 50V.1 <-> V3. C - 25µF 50V.2 <-> R1.1 <-> R1.1 - 25µF 50V.2 <-> R1.1 <-> R1.1 - 25µF 50V.2 <-> R1.1 <-> R1.2 <-> R1.2 - 25µF 50V.2 <-> R1.2 <-> R1.2 - 470 K.1 <-> V4.G + 25µF 50V.+ <-> R1.1 <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 + 25µF 50V.+ <-> R1.2 <-> V1.C <-> V1.C + 25µF 50V.+ <-> R1.2 <-> V3.C <-> V3.C + 25µF 50V.- <-> R1.1 <-> R1.1 + 25µF 50V.- <-> R1.1 <-> R1.1 + 25µF 50V.- <-> R1.1 <-> R1.2 <-> R1.2 + 25µF 50V.- <-> R1.1 <-> R1.2 <-> R1.2 + 470 K.1 <-> R1.1 <-> V4.G <-> V4.G 470 K.1 <-> V5.4 470 K.2 <-> V5.6 - Bass.2 <-> Treble.3 - BIAS.2 <-> Tremolo Intensity.3 + Bass.2 <-> Treble.1 + BIAS.2 <-> Tremolo Intensity.1 C1.1 <-> R1.2 - C1.1 <-> Treble.1 + C1.1 <-> Treble.3 C1.2 <-> R1.1 <-> R1.2 C1.2 <-> R1.2 <-> R1.2 J1.Tip <-> R1.1 @@ -51,14 +54,24 @@ Switch setup: [Default] R1.1 <-> R1.2 R1.1 <-> Reverb.2 R1.1 <-> V2.1 - R1.1 <-> V4. G R1.1 <-> V5.1 R1.2 <-> R1.2 <-> R1.2 R1.2 <-> R1.2 <-> Volume.2 - R1.2 <-> Reverb.3 + R1.2 <-> Reverb.1 R1.2 <-> V2.5 R1.2 <-> V5.5 - Treble.2 <-> Volume.1 - V2. C <-> V2.C - V4.Fil <-> V4.Fil + Treble.2 <-> Volume.3 + Tremolo Speed.1 <-> Tremolo Speed.2 + V1.Fil <-> V1.Fil <-> V1.Fil + V1.G <-> V1.G + V1.P <-> V1.P + V2.C <-> V2.C + V2.Fil <-> V2.Fil + V2.Fil <-> V2.Fil <-> V2.Fil + V2.G <-> V2.G + V3.Fil <-> V3.Fil <-> V3.Fil + V3.P <-> V3.P + V4.C <-> V4.C + V4.Fil <-> V4.Fil <-> V4.Fil + V4.P <-> V4.P diff --git a/diylc-regression-data/input/cloud/netlist/293_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/293_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/293_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/293_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/293_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/293_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/293_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/293_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/294_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/294_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/294_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/294_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/294_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/294_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/294_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/294_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/295_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/295_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/295_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/295_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/295_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/295_incl_switches.txt index 3d7f5dac7..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/295_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/295_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON1:.OFF, .ON2:.ON1, .ON2:.ON2, .ON2:.OFF] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/296_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/296_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/296_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/296_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/296_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/296_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/296_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/296_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/297_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/297_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/297_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/297_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/297_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/297_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/297_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/297_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt index a3d4834dc..8d067f538 100644 --- a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt @@ -1,13 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C8.2 - .2 <-> .3 - C1-B.1 <-> R1.2 - C2.1 <-> R2.2 - C3.1 <-> R2.1 + C1-B.+ <-> R1.2 + C2.+ <-> R1.1 <-> R15.2 <-> R2.2 + C3.+ <-> R2.1 <-> R5.1 <-> R8.1 + C3.1 <-> P1 Vol.1 <-> P2 Tone.2 C3.2 <-> R5.2 <-> V1.1 + C4.1 <-> P1 Vol.2 + C4.2 <-> P2 Tone.1 + C5.1 <-> P2 Tone.3 + C6.1 <-> R11.2 <-> R9.2 C6.2 <-> R8.2 <-> V1.6 - J1.1 <-> J1.4 <-> R3.1 + C7.+ <-> R10.1 + C8.+ <-> C9.1 <-> R6.2 <-> V1.3 + C8.- <-> SW2.1 + J1.1 <-> J1.2 <-> J1.4 <-> R3.1 + J1.3 <-> R4.1 R11.1 <-> V2.5 + R12.2 <-> R7.1 + R13.2 <-> R14.1 <-> SW2.2 R4.2 <-> V1.2 + SW3.3 <-> SW4.2 diff --git a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt index 64dfa0da5..16dcd84e9 100644 --- a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt @@ -1,11 +1,42 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2, .OFF:.ON1:.ON1:.ON1, .OFF:.ON1:.ON1:.ON2, .OFF:.ON1:.ON2:.ON1, .OFF:.ON1:.ON2:.ON2, .OFF:.ON2:.ON1:.ON1, .OFF:.ON2:.ON1:.ON2, .OFF:.ON2:.ON2:.ON1, .OFF:.ON2:.ON2:.ON2] +Switch setup: [ SW2.OFF,SW2.ON2 ] - C1-B.1 <-> R1.2 - C2.1 <-> R2.2 - C3.1 <-> R2.1 + C1-B.+ <-> R1.2 + C2.+ <-> R1.1 <-> R15.2 <-> R2.2 + C3.+ <-> R2.1 <-> R5.1 <-> R8.1 + C3.1 <-> P1 Vol.1 <-> P2 Tone.2 C3.2 <-> R5.2 <-> V1.1 + C4.1 <-> P1 Vol.2 + C4.2 <-> P2 Tone.1 + C5.1 <-> P2 Tone.3 + C6.1 <-> R11.2 <-> R9.2 C6.2 <-> R8.2 <-> V1.6 - J1.1 <-> J1.4 <-> R3.1 + C7.+ <-> R10.1 + C8.+ <-> C9.1 <-> R6.2 <-> V1.3 + J1.1 <-> J1.2 <-> J1.4 <-> R3.1 + J1.3 <-> R4.1 R11.1 <-> V2.5 + R12.2 <-> R7.1 + R13.2 <-> R14.1 + R4.2 <-> V1.2 + +Switch setup: [ SW2.ON1 ] + + C1-B.+ <-> R1.2 + C2.+ <-> R1.1 <-> R15.2 <-> R2.2 + C3.+ <-> R2.1 <-> R5.1 <-> R8.1 + C3.1 <-> P1 Vol.1 <-> P2 Tone.2 + C3.2 <-> R5.2 <-> V1.1 + C4.1 <-> P1 Vol.2 + C4.2 <-> P2 Tone.1 + C5.1 <-> P2 Tone.3 + C6.1 <-> R11.2 <-> R9.2 + C6.2 <-> R8.2 <-> V1.6 + C7.+ <-> R10.1 + C8.+ <-> C9.1 <-> R6.2 <-> V1.3 + C8.- <-> R13.2 <-> R14.1 + J1.1 <-> J1.2 <-> J1.4 <-> R3.1 + J1.3 <-> R4.1 + R11.1 <-> V2.5 + R12.2 <-> R7.1 R4.2 <-> V1.2 diff --git a/diylc-regression-data/input/cloud/netlist/299_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/299_excl_switches.txt index 2451762f4..60880ba1e 100644 --- a/diylc-regression-data/input/cloud/netlist/299_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/299_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .2 <-> Audio In.Tip - .3 <-> C1.2 - .5 <-> Audio Out.Tip - .6 <-> C2.2 - .8 <-> R5.2 - .9 <-> J1.1 <-> R3.1 <-> R4.2 - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 + Audio In.Tip <-> SW1.2 + Audio Out.Tip <-> SW1.5 C1.1 <-> R1.2 + C1.2 <-> SW1.3 C2.1 <-> R2.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + C2.2 <-> SW1.6 + J1.1 <-> R3.1 <-> R4.2 <-> SW1.9 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 + R5.2 <-> SW1.8 + SW1.1 <-> SW1.4 diff --git a/diylc-regression-data/input/cloud/netlist/299_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/299_incl_switches.txt index c811c132d..b989c0855 100644 --- a/diylc-regression-data/input/cloud/netlist/299_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/299_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 Audio In.Tip <-> Audio Out.Tip C1.1 <-> R1.2 C2.1 <-> R2.2 J1.1 <-> R3.1 <-> R4.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 Audio In.Tip <-> C1.2 Audio Out.Tip <-> C2.2 C1.1 <-> R1.2 C2.1 <-> R2.2 J1.1 <-> R3.1 <-> R4.2 <-> R5.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 diff --git a/diylc-regression-data/input/cloud/netlist/300_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/300_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/300_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/300_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/300_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/300_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/300_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/300_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/301_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/301_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/301_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/301_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/301_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/301_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/301_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/301_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/302_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/302_excl_switches.txt index c12a9028b..c5b396aa7 100644 --- a/diylc-regression-data/input/cloud/netlist/302_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/302_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> C3.1 <-> C4.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> D4.2 - C1.2 <-> C10.2 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.2 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.1 <-> R5.2 - C10.1 <-> C9.2 <-> R3.2 <-> R4.1 - C5.2 <-> C6.1 <-> C7.2 <-> C8.1 <-> R1.2 <-> R2.1 + C1.1 <-> C2.2 <-> C3.1 <-> C4.2 <-> D1.A <-> D2.K <-> D3.A <-> D4.K + C1.2 <-> C10.- <-> C11.+ <-> C11.- <-> C2.1 <-> C3.2 <-> C4.1 <-> C5.+ <-> C6.- <-> C7.+ <-> C8.- <-> C9.+ <-> D1.K <-> D2.A <-> D3.K <-> D4.A <-> R1.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.1 <-> R5.2 + C10.+ <-> C9.- <-> R3.2 <-> R4.1 + C5.- <-> C6.+ <-> C7.- <-> C8.+ <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/302_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/302_incl_switches.txt index c12a9028b..c5b396aa7 100644 --- a/diylc-regression-data/input/cloud/netlist/302_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/302_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> C3.1 <-> C4.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> D4.2 - C1.2 <-> C10.2 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.2 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.1 <-> R5.2 - C10.1 <-> C9.2 <-> R3.2 <-> R4.1 - C5.2 <-> C6.1 <-> C7.2 <-> C8.1 <-> R1.2 <-> R2.1 + C1.1 <-> C2.2 <-> C3.1 <-> C4.2 <-> D1.A <-> D2.K <-> D3.A <-> D4.K + C1.2 <-> C10.- <-> C11.+ <-> C11.- <-> C2.1 <-> C3.2 <-> C4.1 <-> C5.+ <-> C6.- <-> C7.+ <-> C8.- <-> C9.+ <-> D1.K <-> D2.A <-> D3.K <-> D4.A <-> R1.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.1 <-> R5.2 + C10.+ <-> C9.- <-> R3.2 <-> R4.1 + C5.- <-> C6.+ <-> C7.- <-> C8.+ <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/303_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/303_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/303_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/303_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/303_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/303_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/303_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/303_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/304_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/304_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/304_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/304_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/304_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/304_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/304_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/304_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt index 59c5d7111..758e99b7e 100644 --- a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt @@ -1,12 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 KW.1 <-> IC2.1 <-> VR5.1 + 1 KW.1 <-> IC2.1 <-> VR5.3 1 KW.2 <-> C5.2 <-> IC2.2 <-> IC2.6 - C4.1 <-> C5.1 <-> IC2.7 <-> VR6.3 - C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3 - C6.1 <-> VR6.1 - C6.2 <-> IC2.13 - C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3 - IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 + C4.1 <-> C5.1 <-> IC2.7 <-> VR6.1 + C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.1 + C6.+ <-> VR6.3 + C6.- <-> IC2.13 + C7.1 <-> IC3.10 <-> IC3.9 <-> VR7.1 + C7.2 <-> C9.2 <-> IC3.7 <-> VR9.1 + C8.+ <-> VR9.3 + C8.- <-> IC3.13 + C9.1 <-> IC3.2 <-> IC3.6 <-> R2.2 + IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.2 <-> VR4.3 <-> VR5.1 <-> VR5.2 IC2.14 <-> IC2.5 + IC3.1 <-> IC3.12 <-> IC3.4 <-> IC3.8 <-> R2.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 + IC3.14 <-> IC3.5 diff --git a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt index 59c5d7111..758e99b7e 100644 --- a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt @@ -1,12 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 KW.1 <-> IC2.1 <-> VR5.1 + 1 KW.1 <-> IC2.1 <-> VR5.3 1 KW.2 <-> C5.2 <-> IC2.2 <-> IC2.6 - C4.1 <-> C5.1 <-> IC2.7 <-> VR6.3 - C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3 - C6.1 <-> VR6.1 - C6.2 <-> IC2.13 - C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3 - IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 + C4.1 <-> C5.1 <-> IC2.7 <-> VR6.1 + C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.1 + C6.+ <-> VR6.3 + C6.- <-> IC2.13 + C7.1 <-> IC3.10 <-> IC3.9 <-> VR7.1 + C7.2 <-> C9.2 <-> IC3.7 <-> VR9.1 + C8.+ <-> VR9.3 + C8.- <-> IC3.13 + C9.1 <-> IC3.2 <-> IC3.6 <-> R2.2 + IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.2 <-> VR4.3 <-> VR5.1 <-> VR5.2 IC2.14 <-> IC2.5 + IC3.1 <-> IC3.12 <-> IC3.4 <-> IC3.8 <-> R2.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 + IC3.14 <-> IC3.5 diff --git a/diylc-regression-data/input/cloud/netlist/306_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/306_excl_switches.txt index 552a6a9d2..ecd33e991 100644 --- a/diylc-regression-data/input/cloud/netlist/306_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/306_excl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] R1.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> VR1.2 <-> VR2.2 <-> VR3.2 <-> VR4.2 - VR1.1 <-> VR2.1 <-> VR3.1 <-> VR4.1 + VR1.3 <-> VR2.3 <-> VR3.3 <-> VR4.3 diff --git a/diylc-regression-data/input/cloud/netlist/306_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/306_incl_switches.txt index 552a6a9d2..ecd33e991 100644 --- a/diylc-regression-data/input/cloud/netlist/306_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/306_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] R1.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> VR1.2 <-> VR2.2 <-> VR3.2 <-> VR4.2 - VR1.1 <-> VR2.1 <-> VR3.1 <-> VR4.1 + VR1.3 <-> VR2.3 <-> VR3.3 <-> VR4.3 diff --git a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt index 98db3e4f2..10edc9438 100644 --- a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 100 K.1 <-> C3.1 <-> Q1.1 - .2 <-> .3 <-> R1.1 - C3.2 <-> D1.1 + .1 <-> .2 <-> R1.1 + .3 <-> 100 K.1 <-> C3.+ <-> Q1.1 + C3.- <-> D1.A Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt index 98db3e4f2..10edc9438 100644 --- a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 100 K.1 <-> C3.1 <-> Q1.1 - .2 <-> .3 <-> R1.1 - C3.2 <-> D1.1 + .1 <-> .2 <-> R1.1 + .3 <-> 100 K.1 <-> C3.+ <-> Q1.1 + C3.- <-> D1.A Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt index 135793e9b..df2035836 100644 --- a/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .6 <-> Volume.1 - .1 <-> .2 <-> Volume.3 - .2 <-> .3 <-> .4 - .2 <-> .5 - .2 <-> Volume.2 - .3 <-> .3 - .3 <-> .6 - .5 <-> J1.Tip GND <-> J1.Sleeve + J1.Tip <-> SW3.5 + SW1.1 <-> SW1.6 <-> SW3.1 <-> Volume.3 + SW1.2 <-> SW1.5 + SW1.3 <-> SW1.4 <-> SW2.2 + SW2.1 <-> SW3.2 <-> Volume.1 + SW2.3 <-> SW3.3 + SW3.2 <-> Volume.2 + SW3.3 <-> SW3.6 diff --git a/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt index d04e13f74..bb565b204 100644 --- a/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2] +Switch setup: [ SW3.ON1 ] GND <-> J1.Sleeve Volume.1 <-> Volume.3 -Switch setup: [.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] +Switch setup: [ SW3.ON2 ] GND <-> J1.Sleeve J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt index 14dc69f20..5c7816c7f 100644 --- a/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .2 <-> .6 - .1 <-> .2 <-> Volume.3 - .1 <-> .4 <-> .5 <-> Volume.1 - .2 <-> .5 - .2 <-> Volume.2 - .3 <-> .3 - .3 <-> .4 <-> .5 - .3 <-> .6 - .5 <-> J1.Tip - .6 <-> .6 GND <-> J1.Sleeve + J1.Tip <-> SW3.5 + SW1.1 <-> SW1.6 <-> SW2.2 + SW1.2 <-> SW1.5 + SW1.3 <-> SW1.4 <-> SW2.5 + SW2.1 <-> SW3.2 <-> Volume.1 + SW2.3 <-> SW3.3 + SW2.4 <-> SW3.1 <-> SW3.5 <-> Volume.3 + SW2.6 <-> SW3.6 + SW3.2 <-> Volume.2 + SW3.3 <-> SW3.6 diff --git a/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt index d04e13f74..bb565b204 100644 --- a/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2] +Switch setup: [ SW3.ON1 ] GND <-> J1.Sleeve Volume.1 <-> Volume.3 -Switch setup: [.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] +Switch setup: [ SW3.ON2 ] GND <-> J1.Sleeve J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt index f67f55ec2..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt @@ -1,18 +1 @@ -Switch setup: [Default] - - .1 <-> .2 <-> .6 - .1 <-> .2 <-> Volume.3 - .1 <-> .4 <-> .5 <-> Volume.1 - .1 <-> .7 <-> Bridge: South.South Finish - .2 <-> .3 <-> .3 <-> .4 <-> Bridge: North.North Start <-> Bridge: South.South Start - .2 <-> .5 - .2 <-> .8 - .2 <-> Volume.2 - .3 <-> .3 - .3 <-> .4 <-> .5 - .3 <-> .6 - .4 <-> .6 - .5 <-> J1.Tip - .6 <-> .6 - GND <-> J1.Sleeve - +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt index 964ea3093..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt @@ -1 +1 @@ -org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 144 \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt index 3d2f7966d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt @@ -1,20 +1 @@ -Switch setup: [Default] - - .1 <-> .1 <-> .2 <-> GND <-> J1.Sleeve <-> VOL / TONE.3 - .1 <-> .2 <-> .4 <-> .5 - .1 <-> .2 <-> .4 <-> .5 - .1 <-> .2 <-> .7 - .1 <-> .2 <-> .8 <-> Bridge: South.South Finish - .1 <-> VOL / TONE.1 - .2 <-> .3 <-> .4 <-> .6 <-> Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 - .2 <-> .5 - .3 <-> .3 - .3 <-> .3 - .3 <-> .5 <-> .5 - .3 <-> .5 <-> J1.Tip - .4 <-> C1.2 - .4 <-> C2.1 <-> VOL / TONE.2 - .6 <-> .6 - .6 <-> .6 - .6 <-> C2.2 - +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt index ce26032b6..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt @@ -1 +1 @@ -org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 288 \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/312_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/312_excl_switches.txt index 2451762f4..60880ba1e 100644 --- a/diylc-regression-data/input/cloud/netlist/312_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/312_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .4 - .2 <-> Audio In.Tip - .3 <-> C1.2 - .5 <-> Audio Out.Tip - .6 <-> C2.2 - .8 <-> R5.2 - .9 <-> J1.1 <-> R3.1 <-> R4.2 - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 + Audio In.Tip <-> SW1.2 + Audio Out.Tip <-> SW1.5 C1.1 <-> R1.2 + C1.2 <-> SW1.3 C2.1 <-> R2.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + C2.2 <-> SW1.6 + J1.1 <-> R3.1 <-> R4.2 <-> SW1.9 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 + R5.2 <-> SW1.8 + SW1.1 <-> SW1.4 diff --git a/diylc-regression-data/input/cloud/netlist/312_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/312_incl_switches.txt index c811c132d..b989c0855 100644 --- a/diylc-regression-data/input/cloud/netlist/312_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/312_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [.ON1] +Switch setup: [ SW1.ON1 ] - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 Audio In.Tip <-> Audio Out.Tip C1.1 <-> R1.2 C2.1 <-> R2.2 J1.1 <-> R3.1 <-> R4.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 -Switch setup: [.ON2] +Switch setup: [ SW1.ON2 ] - Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.2 <-> R2.3 + Audio In.Sleeve <-> Audio Out.Sleeve <-> J1.3 <-> LED.K <-> R2.1 Audio In.Tip <-> C1.2 Audio Out.Tip <-> C2.2 C1.1 <-> R1.2 C2.1 <-> R2.2 J1.1 <-> R3.1 <-> R4.2 <-> R5.2 - LED.1 <-> R5.1 - R1.1 <-> R3.2 - R2.1 <-> V1.8 + LED.A <-> R5.1 + R1.3 <-> R3.2 + R2.3 <-> V1.8 R4.1 <-> V1.7 diff --git a/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt index a9f968ee3..ff19cc5f9 100644 --- a/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt @@ -1,16 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .3 <-> .3 <-> C10.1 <-> C12.1 <-> C14.1 <-> C5.1 <-> C7.1 <-> C9.1 <-> R10.1 <-> R13.1 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.1 <-> R20.1 <-> R23.1 <-> R24.1 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.2 <-> R8.1 <-> R8.2 - .1 <-> .1 <-> .2 <-> .2 <-> .2 <-> C11.1 <-> C16.1 <-> C2.1 <-> C4.1 <-> R11.1 <-> R2.1 <-> R21.1 <-> R25.1 <-> R8.2 - .1 <-> .2 <-> C1.1 <-> C11.2 <-> C14.2 <-> C15.2 <-> R15.2 <-> R18.2 <-> R5.1 - .1 <-> .2 <-> C12.2 <-> C16.2 <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2 - .3 <-> .3 <-> C15.1 <-> C2.2 <-> R22.1 - C1.2 <-> C13.1 <-> C4.2 <-> R13.2 <-> R15.1 - C10.2 <-> C7.2 - C13.2 <-> C5.2 <-> R6.1 <-> R8.1 - C17.1 <-> R12.1 <-> R9.2 - C17.2 <-> C3.2 <-> C6.2 <-> C8.2 <-> D3.1 - C3.1 <-> D3.2 <-> R1.1 <-> R9.1 - C6.1 <-> C8.1 <-> R1.2 + .1 <-> .1 <-> C16.+ <-> R21.1 + .1 <-> C12.+ <-> R3.1 + .1 <-> C14.+ <-> R10.1 + .1 <-> R2.1 + .2 <-> C11.+ <-> R8.2 + .2 <-> C2.+ <-> R2.1 <-> R25.1 + .2 <-> C4.+ <-> R11.1 + .2 <-> R18.1 <-> R23.1 <-> R24.1 + .2 <-> R19.1 <-> R20.1 <-> R6.2 + .3 <-> .3 <-> C15.+ <-> R22.1 + .3 <-> C10.+ <-> R14.2 + .3 <-> C5.+ <-> R7.2 <-> R8.1 + .3 <-> C7.+ <-> R4.2 + .A <-> .K <-> C1.+ <-> C15.- + .A <-> .K <-> C12.- <-> C16.- <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2 + C1.- <-> C13.1 <-> R13.2 <-> R15.1 + C13.2 <-> R8.1 + C14.- <-> R18.2 + C17.+ <-> R12.1 <-> R9.2 + C17.- <-> C3.- <-> C6.- <-> C8.2 + C3.+ <-> D3.K <-> R1.1 <-> R9.1 + C5.- <-> R6.1 + C6.+ <-> C8.1 <-> R1.2 + C9.1 <-> R13.1 <-> R8.2 R14.1 <-> R19.2 <-> R22.2 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.1 + R15.2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt index a9f968ee3..ff19cc5f9 100644 --- a/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt @@ -1,16 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .3 <-> .3 <-> C10.1 <-> C12.1 <-> C14.1 <-> C5.1 <-> C7.1 <-> C9.1 <-> R10.1 <-> R13.1 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.1 <-> R20.1 <-> R23.1 <-> R24.1 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.2 <-> R8.1 <-> R8.2 - .1 <-> .1 <-> .2 <-> .2 <-> .2 <-> C11.1 <-> C16.1 <-> C2.1 <-> C4.1 <-> R11.1 <-> R2.1 <-> R21.1 <-> R25.1 <-> R8.2 - .1 <-> .2 <-> C1.1 <-> C11.2 <-> C14.2 <-> C15.2 <-> R15.2 <-> R18.2 <-> R5.1 - .1 <-> .2 <-> C12.2 <-> C16.2 <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2 - .3 <-> .3 <-> C15.1 <-> C2.2 <-> R22.1 - C1.2 <-> C13.1 <-> C4.2 <-> R13.2 <-> R15.1 - C10.2 <-> C7.2 - C13.2 <-> C5.2 <-> R6.1 <-> R8.1 - C17.1 <-> R12.1 <-> R9.2 - C17.2 <-> C3.2 <-> C6.2 <-> C8.2 <-> D3.1 - C3.1 <-> D3.2 <-> R1.1 <-> R9.1 - C6.1 <-> C8.1 <-> R1.2 + .1 <-> .1 <-> C16.+ <-> R21.1 + .1 <-> C12.+ <-> R3.1 + .1 <-> C14.+ <-> R10.1 + .1 <-> R2.1 + .2 <-> C11.+ <-> R8.2 + .2 <-> C2.+ <-> R2.1 <-> R25.1 + .2 <-> C4.+ <-> R11.1 + .2 <-> R18.1 <-> R23.1 <-> R24.1 + .2 <-> R19.1 <-> R20.1 <-> R6.2 + .3 <-> .3 <-> C15.+ <-> R22.1 + .3 <-> C10.+ <-> R14.2 + .3 <-> C5.+ <-> R7.2 <-> R8.1 + .3 <-> C7.+ <-> R4.2 + .A <-> .K <-> C1.+ <-> C15.- + .A <-> .K <-> C12.- <-> C16.- <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2 + C1.- <-> C13.1 <-> R13.2 <-> R15.1 + C13.2 <-> R8.1 + C14.- <-> R18.2 + C17.+ <-> R12.1 <-> R9.2 + C17.- <-> C3.- <-> C6.- <-> C8.2 + C3.+ <-> D3.K <-> R1.1 <-> R9.1 + C5.- <-> R6.1 + C6.+ <-> C8.1 <-> R1.2 + C9.1 <-> R13.1 <-> R8.2 R14.1 <-> R19.2 <-> R22.2 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.1 + R15.2 <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt index c1a4122ce..27a99e4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt @@ -1,13 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C12.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R17.1 <-> R23.2 <-> R7.2 <-> R8.1 <-> R9.1 <-> R9.2 - C1.2 <-> C9.1 <-> Q1.2 <-> Q3.1 <-> Q4.3 <-> R14.1 <-> R15.2 <-> R16.1 <-> R2.1 <-> R22.1 <-> R3.1 - C10.1 <-> C6.2 <-> C9.2 <-> D4.1 <-> Q3.3 <-> R13.1 <-> R17.2 <-> R18.1 <-> R19.1 - C10.2 <-> C13.2 <-> C14.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2 - C11.1 <-> C12.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D3.2 <-> R20.2 <-> R21.1 - C11.2 <-> C14.1 <-> D1.2 <-> Q5.1 <-> R10.2 <-> R14.2 <-> R20.1 <-> R21.2 <-> R3.2 <-> R5.2 - C13.1 <-> C7.2 <-> C8.1 - C2.1 <-> D4.2 <-> Q1.1 <-> Q2.3 <-> Q4.2 <-> R11.1 <-> R19.2 <-> R5.1 - C3.1 <-> R23.1 <-> R7.1 - C7.1 <-> Q1.3 <-> Q3.2 <-> R12.1 <-> R15.1 <-> R4.1 <-> R6.2 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> R2.1 <-> R3.1 + C10.+ <-> R17.2 <-> R18.1 <-> R19.1 + C10.- <-> C13.2 <-> C14.- <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2 + C11.1 <-> C12.2 <-> R20.2 <-> R21.1 + C11.2 <-> C14.+ <-> D1.K <-> R10.2 <-> R14.2 <-> R21.2 <-> R3.2 <-> R5.2 + C2.1 <-> Q1.1 <-> R5.1 + C3.+ <-> R7.1 + C4.1 <-> D2.K <-> D3.A <-> Q2.2 <-> R7.2 <-> R8.1 <-> R9.1 + C4.2 <-> C5.2 <-> C6.1 <-> Q2.1 <-> R10.1 <-> R9.2 + C5.1 <-> D2.A <-> D3.K + C7.+ <-> Q3.2 <-> R12.1 <-> R15.1 + C7.- <-> C8.1 + C9.1 <-> Q3.1 <-> R14.1 <-> R15.2 + C9.2 <-> D4.A + D4.K <-> Q4.2 <-> R19.2 + Q1.3 <-> R4.1 + Q2.3 <-> R11.1 + Q3.3 <-> R13.1 + Q4.1 <-> Q5.2 <-> R23.2 + Q4.3 <-> R16.1 + Q5.1 <-> R20.1 + Q5.3 <-> R17.1 diff --git a/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt index c1a4122ce..27a99e4c1 100644 --- a/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt @@ -1,13 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C12.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R17.1 <-> R23.2 <-> R7.2 <-> R8.1 <-> R9.1 <-> R9.2 - C1.2 <-> C9.1 <-> Q1.2 <-> Q3.1 <-> Q4.3 <-> R14.1 <-> R15.2 <-> R16.1 <-> R2.1 <-> R22.1 <-> R3.1 - C10.1 <-> C6.2 <-> C9.2 <-> D4.1 <-> Q3.3 <-> R13.1 <-> R17.2 <-> R18.1 <-> R19.1 - C10.2 <-> C13.2 <-> C14.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2 - C11.1 <-> C12.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D3.2 <-> R20.2 <-> R21.1 - C11.2 <-> C14.1 <-> D1.2 <-> Q5.1 <-> R10.2 <-> R14.2 <-> R20.1 <-> R21.2 <-> R3.2 <-> R5.2 - C13.1 <-> C7.2 <-> C8.1 - C2.1 <-> D4.2 <-> Q1.1 <-> Q2.3 <-> Q4.2 <-> R11.1 <-> R19.2 <-> R5.1 - C3.1 <-> R23.1 <-> R7.1 - C7.1 <-> Q1.3 <-> Q3.2 <-> R12.1 <-> R15.1 <-> R4.1 <-> R6.2 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> R2.1 <-> R3.1 + C10.+ <-> R17.2 <-> R18.1 <-> R19.1 + C10.- <-> C13.2 <-> C14.- <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2 + C11.1 <-> C12.2 <-> R20.2 <-> R21.1 + C11.2 <-> C14.+ <-> D1.K <-> R10.2 <-> R14.2 <-> R21.2 <-> R3.2 <-> R5.2 + C2.1 <-> Q1.1 <-> R5.1 + C3.+ <-> R7.1 + C4.1 <-> D2.K <-> D3.A <-> Q2.2 <-> R7.2 <-> R8.1 <-> R9.1 + C4.2 <-> C5.2 <-> C6.1 <-> Q2.1 <-> R10.1 <-> R9.2 + C5.1 <-> D2.A <-> D3.K + C7.+ <-> Q3.2 <-> R12.1 <-> R15.1 + C7.- <-> C8.1 + C9.1 <-> Q3.1 <-> R14.1 <-> R15.2 + C9.2 <-> D4.A + D4.K <-> Q4.2 <-> R19.2 + Q1.3 <-> R4.1 + Q2.3 <-> R11.1 + Q3.3 <-> R13.1 + Q4.1 <-> Q5.2 <-> R23.2 + Q4.3 <-> R16.1 + Q5.1 <-> R20.1 + Q5.3 <-> R17.1 diff --git a/diylc-regression-data/input/cloud/netlist/315_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/315_excl_switches.txt index 7003f5bba..93799bb41 100644 --- a/diylc-regression-data/input/cloud/netlist/315_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/315_excl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 100k.1 <-> J1.Tip 68k.1 <-> J2.Tip Output.2 <-> TR1.6 <-> V1.2 <-> V1.8 TR1.5 <-> V1.4 <-> V1.6 + V2.H <-> V2.H + V2.n/c <-> V2.n/c <-> V2.n/c <-> V2.n/c + V2.P <-> V2.P + V3.A <-> V3.A + V3.C <-> V3.C + V3.G <-> V3.G + V3.H <-> V3.H diff --git a/diylc-regression-data/input/cloud/netlist/315_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/315_incl_switches.txt index 7003f5bba..93799bb41 100644 --- a/diylc-regression-data/input/cloud/netlist/315_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/315_incl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 100k.1 <-> J1.Tip 68k.1 <-> J2.Tip Output.2 <-> TR1.6 <-> V1.2 <-> V1.8 TR1.5 <-> V1.4 <-> V1.6 + V2.H <-> V2.H + V2.n/c <-> V2.n/c <-> V2.n/c <-> V2.n/c + V2.P <-> V2.P + V3.A <-> V3.A + V3.C <-> V3.C + V3.G <-> V3.G + V3.H <-> V3.H diff --git a/diylc-regression-data/input/cloud/netlist/316_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/316_excl_switches.txt index 5ffafe48e..beedf184f 100644 --- a/diylc-regression-data/input/cloud/netlist/316_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/316_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.2 <-> Q1.2 <-> R1.1 <-> R3.1 - C2.1 <-> Q1.1 <-> R3.2 <-> R4.1 - C2.2 <-> R2.1 - C3.1 <-> R4.2 - C3.2 <-> R1.2 <-> R2.2 - D1.1 <-> Q1.3 + C1.2 <-> D1.K <-> Q1.2 <-> R1.1 <-> R3.1 + C2.+ <-> Q1.1 <-> R3.2 <-> R4.1 + C2.- <-> R2.1 + C3.+ <-> R4.2 + C3.- <-> R1.2 <-> R2.2 + D1.A <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/316_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/316_incl_switches.txt index 5ffafe48e..beedf184f 100644 --- a/diylc-regression-data/input/cloud/netlist/316_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/316_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.2 <-> Q1.2 <-> R1.1 <-> R3.1 - C2.1 <-> Q1.1 <-> R3.2 <-> R4.1 - C2.2 <-> R2.1 - C3.1 <-> R4.2 - C3.2 <-> R1.2 <-> R2.2 - D1.1 <-> Q1.3 + C1.2 <-> D1.K <-> Q1.2 <-> R1.1 <-> R3.1 + C2.+ <-> Q1.1 <-> R3.2 <-> R4.1 + C2.- <-> R2.1 + C3.+ <-> R4.2 + C3.- <-> R1.2 <-> R2.2 + D1.A <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt index 9325a5c94..32f832e5d 100644 --- a/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt @@ -1,12 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 + Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.3 Presence.2 <-> GND <-> Presence-Poly.1 - .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.1 <-> Bass.2 <-> Treble.1 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 + .022uF 630v Coupling.1 <-> Input 2.Shunt + .022uF 630v Coupling.1 <-> Type-3 MV.1 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> Type-3 MV.2 <-> V4A Grid Stopper.1 - .022uF 630v Coupling.1 <-> Type-3 MV.3 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> V3A Grid Leak.1 .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 @@ -15,33 +16,33 @@ Switch setup: [Default] .022uF 630v Coupling.2 <-> V3B Plate Load.2 <-> V6.6 .022uF 630v Mid.1 <-> Mid.2 .1uF 200v AC Shunt.2 <-> V3B Grid Leak.1 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> Hammond 125B.2 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> Hammond 125B.2 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 100K 1W.1 <-> 10K 2W.2 <-> V7.6 100K 1W.2 <-> V7.1 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> D1.2 <-> D2.2 - 40uF 500V.2 <-> Bypass.2 <-> High Input Jack.Shunt <-> Input.1 <-> Preamp Volume.3 <-> V1A Cathode.1 <-> V1B Cathode.1 + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> D1.K <-> D2.K + 40uF 500V.- <-> Bypass.- <-> High Input Jack.Shunt <-> High Input Jack.Sleeve <-> Input.1 <-> Preamp Volume.1 <-> V1A Cathode.1 <-> V1B Cathode.1 Attenuator.1 <-> Input 2.Tip <-> Treble Peak.2 - Attenuator.2 <-> Bright.2 <-> Preamp Volume.1 <-> Treble Peak.1 - Bass.3 <-> Mid.1 + Attenuator.2 <-> Bright.2 <-> Preamp Volume.3 <-> Treble Peak.1 + Bass.1 <-> Mid.3 Bleeder/Divider.1 <-> R1.1 Bleeder/Divider.2 <-> R1.2 Bright.1 <-> Preamp Volume.2 - Bypass.1 <-> V1A Cathode.2 + Bypass.+ <-> V1A Cathode.2 C5.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 - D1.1 <-> Rectifier.2 - D2.1 <-> D3.2 - D3.1 <-> Rectifier.1 + D1.A <-> Rectifier.K + D2.A <-> D3.K + D3.A <-> Rectifier.A Hammond 125B.1 <-> V5.1 Hammond 125B.3 <-> V5.6 Hammond 125B.4 <-> Hammond 125B.5 <-> NFB.1 High Input Jack.Tip <-> Input.2 <-> V1A Grid Stopper.1 - Mid.3 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 - Presence-Poly.2 <-> Presence.2 <-> Presence.3 + Mid.1 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 + Presence-Poly.2 <-> Presence.1 <-> Presence.2 Tone Slope.1 <-> Treble.1 <-> V2B Cathode.2 - Treble.1 <-> Treble.2 + Treble.2 <-> Treble.3 V2A Cathode.1 <-> V2A Grid Leak.2 <-> V2B Cathode.1 V4A Grid Leak.1 <-> V4A Grid Stopper.2 V4B Grid Leak.1 <-> V4B Grid Stopper.2 <-> V5.7 diff --git a/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt index 7cc9a337f..32f832e5d 100644 --- a/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt @@ -1,12 +1,13 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] - Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 + Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.3 Presence.2 <-> GND <-> Presence-Poly.1 - .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.1 <-> Bass.2 <-> Treble.1 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 + .022uF 630v Coupling.1 <-> Input 2.Shunt + .022uF 630v Coupling.1 <-> Type-3 MV.1 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> Type-3 MV.2 <-> V4A Grid Stopper.1 - .022uF 630v Coupling.1 <-> Type-3 MV.3 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> V3A Grid Leak.1 .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 @@ -15,33 +16,33 @@ Switch setup: [.ON1, .ON2] .022uF 630v Coupling.2 <-> V3B Plate Load.2 <-> V6.6 .022uF 630v Mid.1 <-> Mid.2 .1uF 200v AC Shunt.2 <-> V3B Grid Leak.1 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> Hammond 125B.2 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> Hammond 125B.2 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 100K 1W.1 <-> 10K 2W.2 <-> V7.6 100K 1W.2 <-> V7.1 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> D1.2 <-> D2.2 - 40uF 500V.2 <-> Bypass.2 <-> High Input Jack.Shunt <-> Input.1 <-> Preamp Volume.3 <-> V1A Cathode.1 <-> V1B Cathode.1 + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> D1.K <-> D2.K + 40uF 500V.- <-> Bypass.- <-> High Input Jack.Shunt <-> High Input Jack.Sleeve <-> Input.1 <-> Preamp Volume.1 <-> V1A Cathode.1 <-> V1B Cathode.1 Attenuator.1 <-> Input 2.Tip <-> Treble Peak.2 - Attenuator.2 <-> Bright.2 <-> Preamp Volume.1 <-> Treble Peak.1 - Bass.3 <-> Mid.1 + Attenuator.2 <-> Bright.2 <-> Preamp Volume.3 <-> Treble Peak.1 + Bass.1 <-> Mid.3 Bleeder/Divider.1 <-> R1.1 Bleeder/Divider.2 <-> R1.2 Bright.1 <-> Preamp Volume.2 - Bypass.1 <-> V1A Cathode.2 + Bypass.+ <-> V1A Cathode.2 C5.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 - D1.1 <-> Rectifier.2 - D2.1 <-> D3.2 - D3.1 <-> Rectifier.1 + D1.A <-> Rectifier.K + D2.A <-> D3.K + D3.A <-> Rectifier.A Hammond 125B.1 <-> V5.1 Hammond 125B.3 <-> V5.6 Hammond 125B.4 <-> Hammond 125B.5 <-> NFB.1 High Input Jack.Tip <-> Input.2 <-> V1A Grid Stopper.1 - Mid.3 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 - Presence-Poly.2 <-> Presence.2 <-> Presence.3 + Mid.1 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 + Presence-Poly.2 <-> Presence.1 <-> Presence.2 Tone Slope.1 <-> Treble.1 <-> V2B Cathode.2 - Treble.1 <-> Treble.2 + Treble.2 <-> Treble.3 V2A Cathode.1 <-> V2A Grid Leak.2 <-> V2B Cathode.1 V4A Grid Leak.1 <-> V4A Grid Stopper.2 V4B Grid Leak.1 <-> V4B Grid Stopper.2 <-> V5.7 diff --git a/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt index 147b28c94..bc99b4eac 100644 --- a/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 + Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.3 Presence.2 <-> GND <-> Presence-Poly.1 - .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.1 <-> Bass.2 <-> Treble.1 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 .022uF 630v Coupling.1 <-> Input 2.Shunt + .022uF 630v Coupling.1 <-> Type-3 MV.1 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> Type-3 MV.2 <-> V4A Grid Stopper.1 - .022uF 630v Coupling.1 <-> Type-3 MV.3 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> V3A Grid Leak.1 .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 @@ -16,33 +16,33 @@ Switch setup: [Default] .022uF 630v Coupling.2 <-> V3B Plate Load.2 <-> V6.6 .022uF 630v Mid.1 <-> Mid.2 .1uF 200v AC Shunt.2 <-> V3B Grid Leak.1 <-> V6.7 - .2 <-> Power Transformer.1 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> Hammond 125B.2 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> Hammond 125B.2 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 100K 1W.1 <-> 10K 2W.2 <-> V7.6 100K 1W.2 <-> V7.1 <-> V7.7 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 - 20uF 500V.2 <-> 510 3W.2 <-> Bleeder/Divider.2 <-> IEC1.1 <-> Power Transformer.5 <-> R1.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> D1.2 <-> D2.2 - 40uF 500V.2 <-> Bypass.2 <-> Input.1 <-> Preamp Volume.3 <-> V1A Cathode.1 <-> V1B Cathode.1 + 20uF 500V.- <-> 510 3W.2 <-> Bleeder/Divider.2 <-> IEC1.1 <-> Power Transformer.5 <-> R1.2 + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> D1.K <-> D2.K + 40uF 500V.- <-> Bypass.- <-> High Input Jack.Shunt <-> High Input Jack.Sleeve <-> Input.1 <-> Preamp Volume.1 <-> V1A Cathode.1 <-> V1B Cathode.1 Attenuator.1 <-> Input 2.Tip <-> Treble Peak.2 - Attenuator.2 <-> Bright.2 <-> Preamp Volume.1 <-> Treble Peak.1 - Bass.3 <-> Mid.1 + Attenuator.2 <-> Bright.2 <-> Preamp Volume.3 <-> Treble Peak.1 + Bass.1 <-> Mid.3 Bleeder/Divider.1 <-> Power Transformer.6 <-> R1.1 Bright.1 <-> Preamp Volume.2 <-> V1.7 - Bypass.1 <-> V1A Cathode.2 + Bypass.+ <-> V1A Cathode.2 C5.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 - D1.1 <-> Rectifier.2 - D2.1 <-> D3.2 - D3.1 <-> Rectifier.1 + D1.A <-> Rectifier.K + D2.A <-> D3.K + D3.A <-> Rectifier.A Hammond 125B.1 <-> Hammond 125B.3 <-> V5.1 <-> V5.6 Hammond 125B.4 <-> Hammond 125B.5 <-> NFB.1 High Input Jack.Tip <-> Input.2 <-> V1A Grid Stopper.1 - Mid.3 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 - Presence-Poly.2 <-> Presence.2 <-> Presence.3 + Mid.1 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 + Power DPST.2 <-> Power Transformer.1 + Presence-Poly.2 <-> Presence.1 <-> Presence.2 Tone Slope.1 <-> Treble.1 <-> V2B Cathode.2 - Treble.1 <-> Treble.2 + Treble.2 <-> Treble.3 V2A Cathode.1 <-> V2A Grid Leak.2 <-> V2B Cathode.1 V4A Grid Leak.1 <-> V4A Grid Stopper.2 V4B Grid Leak.1 <-> V4B Grid Stopper.2 <-> V5.7 diff --git a/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt index a1ccbdc59..6eaae7d8a 100644 --- a/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [.ON1, .ON2] +Switch setup: [ ALL ] - Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 + Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.3 Presence.2 <-> GND <-> Presence-Poly.1 - .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.1 <-> Bass.2 <-> Treble.1 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 .022uF 630v Coupling.1 <-> Input 2.Shunt + .022uF 630v Coupling.1 <-> Type-3 MV.1 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> Type-3 MV.2 <-> V4A Grid Stopper.1 - .022uF 630v Coupling.1 <-> Type-3 MV.3 <-> V4B Grid Stopper.1 .022uF 630v Coupling.1 <-> V3A Grid Leak.1 .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 @@ -16,32 +16,32 @@ Switch setup: [.ON1, .ON2] .022uF 630v Coupling.2 <-> V3B Plate Load.2 <-> V6.6 .022uF 630v Mid.1 <-> Mid.2 .1uF 200v AC Shunt.2 <-> V3B Grid Leak.1 <-> V6.7 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> Hammond 125B.2 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> Hammond 125B.2 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 100K 1W.1 <-> 10K 2W.2 <-> V7.6 100K 1W.2 <-> V7.1 <-> V7.7 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 - 20uF 500V.2 <-> 510 3W.2 <-> Bleeder/Divider.2 <-> IEC1.1 <-> Power Transformer.5 <-> R1.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> D1.2 <-> D2.2 - 40uF 500V.2 <-> Bypass.2 <-> Input.1 <-> Preamp Volume.3 <-> V1A Cathode.1 <-> V1B Cathode.1 + 20uF 500V.- <-> 510 3W.2 <-> Bleeder/Divider.2 <-> IEC1.1 <-> Power Transformer.5 <-> R1.2 + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> D1.K <-> D2.K + 40uF 500V.- <-> Bypass.- <-> High Input Jack.Shunt <-> High Input Jack.Sleeve <-> Input.1 <-> Preamp Volume.1 <-> V1A Cathode.1 <-> V1B Cathode.1 Attenuator.1 <-> Input 2.Tip <-> Treble Peak.2 - Attenuator.2 <-> Bright.2 <-> Preamp Volume.1 <-> Treble Peak.1 - Bass.3 <-> Mid.1 + Attenuator.2 <-> Bright.2 <-> Preamp Volume.3 <-> Treble Peak.1 + Bass.1 <-> Mid.3 Bleeder/Divider.1 <-> Power Transformer.6 <-> R1.1 Bright.1 <-> Preamp Volume.2 <-> V1.7 - Bypass.1 <-> V1A Cathode.2 + Bypass.+ <-> V1A Cathode.2 C5.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 - D1.1 <-> Rectifier.2 - D2.1 <-> D3.2 - D3.1 <-> Rectifier.1 + D1.A <-> Rectifier.K + D2.A <-> D3.K + D3.A <-> Rectifier.A Hammond 125B.1 <-> Hammond 125B.3 <-> V5.1 <-> V5.6 Hammond 125B.4 <-> Hammond 125B.5 <-> NFB.1 High Input Jack.Tip <-> Input.2 <-> V1A Grid Stopper.1 - Mid.3 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 - Presence-Poly.2 <-> Presence.2 <-> Presence.3 + Mid.1 <-> V4A Grid Leak.2 <-> V4B Grid Leak.2 + Presence-Poly.2 <-> Presence.1 <-> Presence.2 Tone Slope.1 <-> Treble.1 <-> V2B Cathode.2 - Treble.1 <-> Treble.2 + Treble.2 <-> Treble.3 V2A Cathode.1 <-> V2A Grid Leak.2 <-> V2B Cathode.1 V4A Grid Leak.1 <-> V4A Grid Stopper.2 V4B Grid Leak.1 <-> V4B Grid Stopper.2 <-> V5.7 diff --git a/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt index aab9f6cce..d831fda4e 100644 --- a/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt @@ -1,35 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Presence.1 <-> Presence.1 - Presence.2 <-> Middle.3 <-> Poly.1 - Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 - Bass.2 <-> Tone Bass.2 <-> Treble.3 - Bass.3 <-> Middle.1 - Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Presence.1 <-> Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Presence.3 <-> Tail Load PI.1 + Presence.2 <-> Middle.1 <-> Poly.1 + Backup1.A <-> Backup2.A <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.- <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 + Bass.1 <-> Middle.3 + Bass.2 <-> Tone Bass.2 <-> Treble.1 + Bright Volume.1 <-> Preamp Master Volume.1 Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 - Bright Volume.3 <-> Preamp Master Volume.3 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 - Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 + Bright Volume.3 <-> Brite Mica.1 <-> Coupling V1B.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 + Bypass V1.- <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.- <-> Grid Stopper.1 <-> Input.1 <-> Input.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.3 Cathode V2B.2 <-> Tone Slope.1 <-> Tone Treble Mica.2 Coupling PI.1 <-> PI Load 5% V3A.2 <-> PI Stability.1 Coupling PI.1 <-> PI Load 5% V3B.2 <-> PI Stability.2 Coupling PI.2 <-> Grid Leak V4.1 <-> Grid Stopper V4A.1 <-> PI Master Volume.2 - Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.3 + Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 <-> PI Master Volume.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 Coupling.2 <-> Preamp Master Volume.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V1B.1 <-> Load V2A.1 - Dropping B+4.2 <-> Filter Cap B+1.1 <-> Filter Cap B+2.1 <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V1B.1 <-> Load V2A.1 + Dropping B+4.2 <-> Filter Cap B+1.+ <-> Filter Cap B+2.+ <-> PI Load 5% V3A.1 <-> PI Load 5% V3B.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 - Grid AC Ground V3B.2 <-> Negative Feedback.2 <-> Tail Load PI.1 Grid Stopper.2 <-> V1.2 Line Out.1 <-> Line Out.2 <-> Line Out.2 Line Out.1 <-> Negative Feedback.1 Middle.2 <-> Tone Middle.2 - Poly.2 <-> Presence.2 <-> Presence.3 - Preamp Master Volume.1 <-> Treble.2 + Poly.2 <-> Presence.1 <-> Presence.2 + Preamp Master Volume.3 <-> Treble.2 Tone Bass.1 <-> Tone Middle.1 <-> Tone Slope.2 - Tone Treble Mica.1 <-> Treble.1 + Tone Treble Mica.1 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/322_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/322_excl_switches.txt index e4de735f1..8bc7ff70b 100644 --- a/diylc-regression-data/input/cloud/netlist/322_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/322_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 <-> V1.8 - Bypass V1.2 <-> Cathode V1.1 <-> Power Tube Cathode.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 <-> V1.8 + Bypass V1.- <-> Cathode V1.1 <-> Power Tube Cathode.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.8 Cathode V2A.1 <-> Cathode V2B.1 @@ -12,7 +12,7 @@ Switch setup: [Default] Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V2A.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V2A.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 Grid AC Ground V3B.2 <-> Tail Load PI.1 Grid Leak V4.2 <-> Grid Leak V5.2 diff --git a/diylc-regression-data/input/cloud/netlist/322_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/322_incl_switches.txt index e4de735f1..8bc7ff70b 100644 --- a/diylc-regression-data/input/cloud/netlist/322_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/322_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 <-> V1.8 - Bypass V1.2 <-> Cathode V1.1 <-> Power Tube Cathode.2 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 <-> V1.8 + Bypass V1.- <-> Cathode V1.1 <-> Power Tube Cathode.2 Cathode PI.1 <-> Grid Leak PI.1 <-> Grid Leak PI.1 <-> Tail Load PI.2 Cathode PI.2 <-> V3.8 Cathode V2A.1 <-> Cathode V2B.1 @@ -12,7 +12,7 @@ Switch setup: [Default] Coupling PI.2 <-> Grid Leak V5.1 <-> Grid Stopper V4B.1 Coupling V1B.1 <-> Load V1B.2 Coupling.1 <-> Grid Leak PI.2 - Dropping B+4.1 <-> Filter B+4.1 <-> Load V2A.1 + Dropping B+4.1 <-> Filter B+4.+ <-> Load V2A.1 Grid AC Ground V3B.1 <-> Grid Leak PI.2 Grid AC Ground V3B.2 <-> Tail Load PI.1 Grid Leak V4.2 <-> Grid Leak V5.2 diff --git a/diylc-regression-data/input/cloud/netlist/323_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/323_excl_switches.txt index acc302672..e970e5b2a 100644 --- a/diylc-regression-data/input/cloud/netlist/323_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/323_excl_switches.txt @@ -1,32 +1,32 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> Bright Cap Mica.2 - Backup1.1 <-> Backup2.1 <-> Cathode Bypass V2.1 <-> Cathode Bypass V2.2 <-> Cathode V2.1 <-> Cathode V2.2 <-> Filter Cap B+1.2 <-> Filter Cap B+1.2 <-> Pilot Light.1 <-> Rectifier3.1 <-> Rectifier4.1 <-> V2.3 - Bass.1 <-> C2.2 <-> R1.1 + Backup1.A <-> Backup2.A <-> Cathode Bypass V2.+ <-> Cathode Bypass V2.- <-> Cathode V2.1 <-> Cathode V2.2 <-> Filter Cap B+1.- <-> Filter Cap B+1.- <-> Pilot Light.1 <-> Rectifier3.A <-> Rectifier4.A <-> V2.3 <-> V2.8 + Bass.1 <-> C3.1 <-> R3.1 Bass.2 <-> C2.1 <-> C3.2 <-> R2.1 - Bass.3 <-> C3.1 <-> R3.1 + Bass.3 <-> C2.2 <-> R1.1 + Bright Cap Mica.2 <-> Channel.2 C1.1 <-> Coupling V1A.2 <-> R1.2 <-> R2.2 <-> Treble.2 <-> Volume Pot.2 - C1.2 <-> Treble.1 - C4.1 <-> Treble.3 - C4.2 <-> Cathode Bypass V1A.2 <-> Cathode V1A.1 <-> Filter Cap B+2.2 <-> Input Jack.Shunt <-> Input.1 <-> Master Volume Pot.3 <-> R3.2 - Cathode Bypass V1A.1 <-> Cathode V1A.2 <-> V1.3 - Cathode Bypass V1B.1 <-> Cathode V1B.2 <-> V1.8 - Cathode Bypass V1B.2 <-> Cathode V1B.1 + C1.2 <-> Treble.3 + C4.1 <-> Treble.1 + C4.2 <-> Cathode Bypass V1A.- <-> Cathode V1A.1 <-> Filter Cap B+2.- <-> Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 <-> Master Volume Pot.1 <-> R3.2 + Cathode Bypass V1A.+ <-> Cathode V1A.2 <-> V1.3 + Cathode Bypass V1B.+ <-> Cathode V1B.2 <-> V1.8 + Cathode Bypass V1B.- <-> Cathode V1B.1 Coupling V1A.1 <-> V1.1 <-> V1A Load.2 Coupling V1B.1 <-> V1.6 <-> V1B Load.2 Coupling V1B.2 <-> Grid Stopper V2.2 - Filter Cap B+1.1 <-> Rectifier1.2 <-> Rectifier2.2 <-> Voltage Dropping.1 - Filter Cap B+1.1 <-> V2.1 <-> V2.6 <-> Voltage Dropping.1 <-> Voltage Dropping.2 - Filter Cap B+2.1 <-> V1A Load.1 <-> V1B Load.1 <-> Voltage Dropping.2 + Filter Cap B+1.+ <-> Rectifier1.K <-> Rectifier2.K <-> Voltage Dropping.1 + Filter Cap B+1.+ <-> V2.1 <-> V2.6 <-> Voltage Dropping.1 <-> Voltage Dropping.2 + Filter Cap B+2.+ <-> V1A Load.1 <-> V1B Load.1 <-> Voltage Dropping.2 Grid Stopper V1A.1 <-> Input Jack.Tip <-> Input.2 Grid Stopper V1A.2 <-> V1.2 - Grid Stopper V2.1 <-> Master Volume Pot.1 + Grid Stopper V2.1 <-> Master Volume Pot.3 Headphone Resistor.1 <-> Input Jack.Shunt - Headphone Resistor.2 <-> Input Jack.Tip <-> Input Jack.Tip - Master Volume Pot.2 <-> V2.2 - Rectifier1.1 <-> Rectifier3.2 - Rectifier2.1 <-> Rectifier4.2 + Headphone Resistor.2 <-> Input Jack.Ring <-> Input Jack.Sleeve <-> Input Jack.Sleeve <-> Input Jack.Tip <-> Input Jack.Tip + Master Volume Pot.2 <-> V2.2 <-> V2.7 + Rectifier1.A <-> Rectifier3.K + Rectifier2.A <-> Rectifier4.K V1.4 <-> V1.5 - V1.7 <-> Volume Pot.1 + V1.7 <-> Volume Pot.3 V2.4 <-> V2.5 diff --git a/diylc-regression-data/input/cloud/netlist/323_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/323_incl_switches.txt index 7ae0d0ab4..fa58846c0 100644 --- a/diylc-regression-data/input/cloud/netlist/323_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/323_incl_switches.txt @@ -1,31 +1,31 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] +Switch setup: [ ALL ] - Backup1.1 <-> Backup2.1 <-> Cathode Bypass V2.1 <-> Cathode Bypass V2.2 <-> Cathode V2.1 <-> Cathode V2.2 <-> Filter Cap B+1.2 <-> Filter Cap B+1.2 <-> Pilot Light.1 <-> Rectifier3.1 <-> Rectifier4.1 <-> V2.3 - Bass.1 <-> C2.2 <-> R1.1 + Backup1.A <-> Backup2.A <-> Cathode Bypass V2.+ <-> Cathode Bypass V2.- <-> Cathode V2.1 <-> Cathode V2.2 <-> Filter Cap B+1.- <-> Filter Cap B+1.- <-> Pilot Light.1 <-> Rectifier3.A <-> Rectifier4.A <-> V2.3 <-> V2.8 + Bass.1 <-> C3.1 <-> R3.1 Bass.2 <-> C2.1 <-> C3.2 <-> R2.1 - Bass.3 <-> C3.1 <-> R3.1 + Bass.3 <-> C2.2 <-> R1.1 C1.1 <-> Coupling V1A.2 <-> R1.2 <-> R2.2 <-> Treble.2 <-> Volume Pot.2 - C1.2 <-> Treble.1 - C4.1 <-> Treble.3 - C4.2 <-> Cathode Bypass V1A.2 <-> Cathode V1A.1 <-> Filter Cap B+2.2 <-> Input Jack.Shunt <-> Input.1 <-> Master Volume Pot.3 <-> R3.2 - Cathode Bypass V1A.1 <-> Cathode V1A.2 <-> V1.3 - Cathode Bypass V1B.1 <-> Cathode V1B.2 <-> V1.8 - Cathode Bypass V1B.2 <-> Cathode V1B.1 + C1.2 <-> Treble.3 + C4.1 <-> Treble.1 + C4.2 <-> Cathode Bypass V1A.- <-> Cathode V1A.1 <-> Filter Cap B+2.- <-> Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 <-> Master Volume Pot.1 <-> R3.2 + Cathode Bypass V1A.+ <-> Cathode V1A.2 <-> V1.3 + Cathode Bypass V1B.+ <-> Cathode V1B.2 <-> V1.8 + Cathode Bypass V1B.- <-> Cathode V1B.1 Coupling V1A.1 <-> V1.1 <-> V1A Load.2 Coupling V1B.1 <-> V1.6 <-> V1B Load.2 Coupling V1B.2 <-> Grid Stopper V2.2 - Filter Cap B+1.1 <-> Rectifier1.2 <-> Rectifier2.2 <-> Voltage Dropping.1 - Filter Cap B+1.1 <-> V2.1 <-> V2.6 <-> Voltage Dropping.1 <-> Voltage Dropping.2 - Filter Cap B+2.1 <-> V1A Load.1 <-> V1B Load.1 <-> Voltage Dropping.2 + Filter Cap B+1.+ <-> Rectifier1.K <-> Rectifier2.K <-> Voltage Dropping.1 + Filter Cap B+1.+ <-> V2.1 <-> V2.6 <-> Voltage Dropping.1 <-> Voltage Dropping.2 + Filter Cap B+2.+ <-> V1A Load.1 <-> V1B Load.1 <-> Voltage Dropping.2 Grid Stopper V1A.1 <-> Input Jack.Tip <-> Input.2 Grid Stopper V1A.2 <-> V1.2 - Grid Stopper V2.1 <-> Master Volume Pot.1 + Grid Stopper V2.1 <-> Master Volume Pot.3 Headphone Resistor.1 <-> Input Jack.Shunt - Headphone Resistor.2 <-> Input Jack.Tip <-> Input Jack.Tip - Master Volume Pot.2 <-> V2.2 - Rectifier1.1 <-> Rectifier3.2 - Rectifier2.1 <-> Rectifier4.2 + Headphone Resistor.2 <-> Input Jack.Ring <-> Input Jack.Sleeve <-> Input Jack.Sleeve <-> Input Jack.Tip <-> Input Jack.Tip + Master Volume Pot.2 <-> V2.2 <-> V2.7 + Rectifier1.A <-> Rectifier3.K + Rectifier2.A <-> Rectifier4.K V1.4 <-> V1.5 - V1.7 <-> Volume Pot.1 + V1.7 <-> Volume Pot.3 V2.4 <-> V2.5 diff --git a/diylc-regression-data/input/cloud/netlist/324_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/324_excl_switches.txt index ffc2a8170..0cec629b8 100644 --- a/diylc-regression-data/input/cloud/netlist/324_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/324_excl_switches.txt @@ -1,37 +1,39 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C2.2 <-> Treble Peaker.2 - .022uF 630v Coupling.1 <-> V3A Grid Leak.1 + .022uF 630v Coupling.1 <-> V3.2 <-> V3A Grid Leak.1 .022uF 630v Coupling.1 <-> V4A Grid Stopper.1 .022uF 630v Coupling.1 <-> V4B Grid Stopper.1 - .022uF 630v Coupling.2 <-> 100K 1W.1 - .022uF 630v Coupling.2 <-> 100K 1W.2 + .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 + .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 .022uF 630v Coupling.2 <-> V3.1 <-> V3A Plate Load.2 - .022uF 630v Coupling.2 <-> V3B Plate Load.2 + .022uF 630v Coupling.2 <-> V3.6 <-> V3B Plate Load.2 .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 .1uF 200v AC Shunt.2 <-> V3.7 <-> V3B Grid Leak.1 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> V4.1 <-> V4.6 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> V4.1 <-> V4.6 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 1.2K 2W.2 <-> 4.7K 2W.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 10K 2W.2 <-> R3.1 <-> V2.6 - 10uF 100V.1 <-> Bleeder/Divider.1 - 10uF 100V.2 <-> 510 3W.2 <-> Bleeder/Divider.2 - 20uF 500V.2 <-> 20uF 500V.2 <-> 20uF 500V.2 <-> 40uF 500V.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> Rectifier.2 <-> Rectifier.2 - 510 3W.1 <-> V4.8 - Bypass.1 <-> V1A Cathode.2 - Bypass.2 <-> V1A Cathode.1 <-> V1B Cathode.1 <-> V4B Grid Leak.2 - C1.1 <-> Tone Slope.1 <-> V2B Cathode.2 - C2.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 + 10uF 100V.+ <-> Bleeder/Divider.1 + 10uF 100V.- <-> 510 3W.2 <-> Bleeder/Divider.2 + 20uF 500V.- <-> 20uF 500V.- <-> 20uF 500V.- <-> 40uF 500V.- + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> Rectifier.K <-> Rectifier.K + 510 3W.1 <-> V4.3 <-> V4.8 + Bypass.+ <-> V1.3 <-> V1A Cathode.2 + Bypass.- <-> V1A Cathode.1 <-> V1B Cathode.1 <-> V4B Grid Leak.2 + C1.1 <-> Tone Slope.1 <-> V2.8 <-> V2B Cathode.2 + C2.1 <-> Treble Peaker.1 <-> V2.2 <-> V2A Grid Leak.1 Preamp Volume.2 <-> V1.7 - Rectifier.1 <-> Rectifier.1 - Rectifier.1 <-> Rectifier.2 - Rectifier.1 <-> Rectifier.2 + R3.2 <-> V2.1 <-> V2.7 + Rectifier.A <-> Rectifier.A + Rectifier.A <-> Rectifier.K + Rectifier.A <-> Rectifier.K V1.2 <-> V1A Grid Stopper.2 V1.8 <-> V1B Cathode.2 + V2.3 <-> V2A Cathode.2 V2A Grid Leak.2 <-> V2B Cathode.1 V3 Cathode.2 <-> V3.3 <-> V3.8 V4.2 <-> V4A Grid Leak.1 <-> V4A Grid Stopper.2 diff --git a/diylc-regression-data/input/cloud/netlist/324_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/324_incl_switches.txt index ffc2a8170..0cec629b8 100644 --- a/diylc-regression-data/input/cloud/netlist/324_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/324_incl_switches.txt @@ -1,37 +1,39 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 + .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.+ <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C2.2 <-> Treble Peaker.2 - .022uF 630v Coupling.1 <-> V3A Grid Leak.1 + .022uF 630v Coupling.1 <-> V3.2 <-> V3A Grid Leak.1 .022uF 630v Coupling.1 <-> V4A Grid Stopper.1 .022uF 630v Coupling.1 <-> V4B Grid Stopper.1 - .022uF 630v Coupling.2 <-> 100K 1W.1 - .022uF 630v Coupling.2 <-> 100K 1W.2 + .022uF 630v Coupling.2 <-> 100K 1W.1 <-> V1.6 + .022uF 630v Coupling.2 <-> 100K 1W.2 <-> V1.1 .022uF 630v Coupling.2 <-> V3.1 <-> V3A Plate Load.2 - .022uF 630v Coupling.2 <-> V3B Plate Load.2 + .022uF 630v Coupling.2 <-> V3.6 <-> V3B Plate Load.2 .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 .1uF 200v AC Shunt.2 <-> V3.7 <-> V3B Grid Leak.1 - 1.2K 2W.1 <-> 20uF 500V.1 <-> Choke 4H 50ma.1 <-> V4.1 <-> V4.6 - 1.2K 2W.2 <-> 20uF 500V.1 <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 + 1.2K 2W.1 <-> 20uF 500V.+ <-> Choke 4H 50ma.1 <-> V4.1 <-> V4.6 + 1.2K 2W.2 <-> 20uF 500V.+ <-> 4.7K 2W.1 <-> V3A Plate Load.1 <-> V3B Plate Load.1 1.2K 2W.2 <-> 4.7K 2W.1 - 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.1 + 100K 1W.1 <-> 100K 1W.2 <-> 10K 2W.1 <-> 22uF 500V.+ 10K 1W.2 <-> V3 Cathode.1 <-> V3A Grid Leak.2 <-> V3B Grid Leak.2 10K 2W.2 <-> R3.1 <-> V2.6 - 10uF 100V.1 <-> Bleeder/Divider.1 - 10uF 100V.2 <-> 510 3W.2 <-> Bleeder/Divider.2 - 20uF 500V.2 <-> 20uF 500V.2 <-> 20uF 500V.2 <-> 40uF 500V.2 - 40uF 500V.1 <-> Choke 4H 50ma.2 <-> Rectifier.2 <-> Rectifier.2 - 510 3W.1 <-> V4.8 - Bypass.1 <-> V1A Cathode.2 - Bypass.2 <-> V1A Cathode.1 <-> V1B Cathode.1 <-> V4B Grid Leak.2 - C1.1 <-> Tone Slope.1 <-> V2B Cathode.2 - C2.1 <-> Treble Peaker.1 <-> V2A Grid Leak.1 + 10uF 100V.+ <-> Bleeder/Divider.1 + 10uF 100V.- <-> 510 3W.2 <-> Bleeder/Divider.2 + 20uF 500V.- <-> 20uF 500V.- <-> 20uF 500V.- <-> 40uF 500V.- + 40uF 500V.+ <-> Choke 4H 50ma.2 <-> Rectifier.K <-> Rectifier.K + 510 3W.1 <-> V4.3 <-> V4.8 + Bypass.+ <-> V1.3 <-> V1A Cathode.2 + Bypass.- <-> V1A Cathode.1 <-> V1B Cathode.1 <-> V4B Grid Leak.2 + C1.1 <-> Tone Slope.1 <-> V2.8 <-> V2B Cathode.2 + C2.1 <-> Treble Peaker.1 <-> V2.2 <-> V2A Grid Leak.1 Preamp Volume.2 <-> V1.7 - Rectifier.1 <-> Rectifier.1 - Rectifier.1 <-> Rectifier.2 - Rectifier.1 <-> Rectifier.2 + R3.2 <-> V2.1 <-> V2.7 + Rectifier.A <-> Rectifier.A + Rectifier.A <-> Rectifier.K + Rectifier.A <-> Rectifier.K V1.2 <-> V1A Grid Stopper.2 V1.8 <-> V1B Cathode.2 + V2.3 <-> V2A Cathode.2 V2A Grid Leak.2 <-> V2B Cathode.1 V3 Cathode.2 <-> V3.3 <-> V3.8 V4.2 <-> V4A Grid Leak.1 <-> V4A Grid Stopper.2 diff --git a/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt index a6441cecf..8b2a77751 100644 --- a/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt @@ -1,9 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1*.1 <-> C2*.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1*.2 <-> R14.1 <-> R5.2 <-> R8.1 <-> R9.1 <-> R9.2 - C1*.2 <-> C2*.1 <-> R2*.2 - C3.1 <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2 - C4.1 <-> C5.1 <-> C6.1 <-> C8.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> IC2.1 <-> IC2.5 <-> R10.2 <-> R13.2 <-> R3.1 <-> R5.1 <-> R6.1 <-> R8.2 - C5.2 <-> IC1.3 <-> IC1.7 <-> R4.1 <-> R6.2 <-> R7.1 - IC2.2 <-> IC2.3 <-> IC2.6 <-> IC2.7 <-> R1*.1 <-> R10.1 <-> R2*.1 <-> R3.2 + C2*.1 <-> R2*.2 + C2*.2 <-> IC2.8 <-> R1*.2 + C3.+ <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2 + C3.- <-> C6.- <-> C8.2 <-> IC1.4 <-> IC2.4 <-> R14.1 <-> R5.2 <-> R9.2 + C4.1 <-> IC1.6 <-> R6.1 + C5.1 <-> R5.1 + C5.2 <-> IC1.3 <-> R4.1 + C6.+ <-> C8.1 <-> IC1.5 <-> IC2.5 <-> R13.2 + IC1.1 <-> IC1.2 <-> R3.1 + IC1.7 <-> R6.2 <-> R7.1 + IC1.8 <-> R8.1 <-> R9.1 + IC2.1 <-> R10.2 <-> R8.2 + IC2.2 <-> R10.1 + IC2.3 <-> R3.2 + IC2.6 <-> IC2.7 <-> R2*.1 diff --git a/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt index a6441cecf..8b2a77751 100644 --- a/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt @@ -1,9 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1*.1 <-> C2*.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1*.2 <-> R14.1 <-> R5.2 <-> R8.1 <-> R9.1 <-> R9.2 - C1*.2 <-> C2*.1 <-> R2*.2 - C3.1 <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2 - C4.1 <-> C5.1 <-> C6.1 <-> C8.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> IC2.1 <-> IC2.5 <-> R10.2 <-> R13.2 <-> R3.1 <-> R5.1 <-> R6.1 <-> R8.2 - C5.2 <-> IC1.3 <-> IC1.7 <-> R4.1 <-> R6.2 <-> R7.1 - IC2.2 <-> IC2.3 <-> IC2.6 <-> IC2.7 <-> R1*.1 <-> R10.1 <-> R2*.1 <-> R3.2 + C2*.1 <-> R2*.2 + C2*.2 <-> IC2.8 <-> R1*.2 + C3.+ <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2 + C3.- <-> C6.- <-> C8.2 <-> IC1.4 <-> IC2.4 <-> R14.1 <-> R5.2 <-> R9.2 + C4.1 <-> IC1.6 <-> R6.1 + C5.1 <-> R5.1 + C5.2 <-> IC1.3 <-> R4.1 + C6.+ <-> C8.1 <-> IC1.5 <-> IC2.5 <-> R13.2 + IC1.1 <-> IC1.2 <-> R3.1 + IC1.7 <-> R6.2 <-> R7.1 + IC1.8 <-> R8.1 <-> R9.1 + IC2.1 <-> R10.2 <-> R8.2 + IC2.2 <-> R10.1 + IC2.3 <-> R3.2 + IC2.6 <-> IC2.7 <-> R2*.1 diff --git a/diylc-regression-data/input/cloud/netlist/326_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/326_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/326_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/326_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/326_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/326_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/326_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/326_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/327_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/327_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/327_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/327_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/327_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/327_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/327_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/327_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/328_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/328_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/328_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/328_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/328_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/328_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/328_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/328_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt index 9ef54a6c2..abb072912 100644 --- a/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1N4007.1 <-> C3.2 - 1N4007.1 <-> L3.2 - 1N4007.2 <-> C3.1 <-> C3.2 <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 - 1N4007.2 <-> C3.1 <-> R2.2 - C1.1 <-> D1.2 - C1.2 <-> C2.1 - C2.2 <-> D2.1 <-> VR1.3 + 1N4007.A <-> C3.- + 1N4007.A <-> L3.2 + 1N4007.K <-> C3.+ <-> C3.- <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 + 1N4007.K <-> C3.+ <-> R2.2 + C1.+ <-> D1.K + C1.- <-> C2.+ + C2.- <-> D2.A <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt index 9ef54a6c2..abb072912 100644 --- a/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1N4007.1 <-> C3.2 - 1N4007.1 <-> L3.2 - 1N4007.2 <-> C3.1 <-> C3.2 <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 - 1N4007.2 <-> C3.1 <-> R2.2 - C1.1 <-> D1.2 - C1.2 <-> C2.1 - C2.2 <-> D2.1 <-> VR1.3 + 1N4007.A <-> C3.- + 1N4007.A <-> L3.2 + 1N4007.K <-> C3.+ <-> C3.- <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 + 1N4007.K <-> C3.+ <-> R2.2 + C1.+ <-> D1.K + C1.- <-> C2.+ + C2.- <-> D2.A <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt index 10c4df533..e10798834 100644 --- a/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP1.North Start <-> SW1.5 PKP2.North Start <-> SW1.3 PKP3.North Start <-> SW1.1 - SW1.2 <-> SW1.7 <-> VR3.1 - SW1.6 <-> VR2.3 + SW1.2 <-> SW1.7 <-> VR3.3 + SW1.6 <-> VR2.1 SW1.8 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt index 56ef4aeaf..642423997 100644 --- a/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt @@ -1,35 +1,35 @@ -Switch setup: [SW1.1] +Switch setup: [ SW1.1 ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 - PKP3.North Start <-> VR3.1 + PKP3.North Start <-> VR3.3 -Switch setup: [SW1.2] +Switch setup: [ SW1.2 ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 - PKP2.North Start <-> PKP3.North Start <-> VR2.3 <-> VR3.1 + PKP2.North Start <-> PKP3.North Start <-> VR2.1 <-> VR3.3 -Switch setup: [SW1.3] +Switch setup: [ SW1.3 ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 - PKP2.North Start <-> VR2.3 <-> VR3.1 + PKP2.North Start <-> VR2.1 <-> VR3.3 -Switch setup: [SW1.4] +Switch setup: [ SW1.4 ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 - PKP1.North Start <-> PKP2.North Start <-> VR1.2 <-> VR2.3 <-> VR3.1 + PKP1.North Start <-> PKP2.North Start <-> VR1.2 <-> VR2.1 <-> VR3.3 -Switch setup: [SW1.5] +Switch setup: [ SW1.5 ] - C1.1 <-> VR1.3 <-> VR2.2 + C1.1 <-> VR1.1 <-> VR2.2 C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 - PKP1.North Start <-> VR1.2 <-> VR3.1 + PKP1.North Start <-> VR1.2 <-> VR3.3 diff --git a/diylc-regression-data/input/cloud/netlist/331_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/331_excl_switches.txt index f4a378703..cec2e464f 100644 --- a/diylc-regression-data/input/cloud/netlist/331_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/331_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.1 C1.2 <-> C4.2 <-> R3.1 <-> volume module.11 diff --git a/diylc-regression-data/input/cloud/netlist/331_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/331_incl_switches.txt index f4a378703..cec2e464f 100644 --- a/diylc-regression-data/input/cloud/netlist/331_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/331_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.1 C1.2 <-> C4.2 <-> R3.1 <-> volume module.11 diff --git a/diylc-regression-data/input/cloud/netlist/332_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/332_excl_switches.txt index daadeddef..d5db882e6 100644 --- a/diylc-regression-data/input/cloud/netlist/332_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/332_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 + .+ <-> .- + .+ <-> .- + .+ <-> .1 + .+ <-> .2 + .- <-> .- <-> .1 <-> .2 <-> .2 .1 <-> .2 .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 <-> .2 <-> .2 <-> .2 diff --git a/diylc-regression-data/input/cloud/netlist/332_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/332_incl_switches.txt index daadeddef..d5db882e6 100644 --- a/diylc-regression-data/input/cloud/netlist/332_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/332_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 + .+ <-> .- + .+ <-> .- + .+ <-> .1 + .+ <-> .2 + .- <-> .- <-> .1 <-> .2 <-> .2 .1 <-> .2 .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 <-> .2 <-> .2 <-> .2 diff --git a/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt index 5d1a41340..325a18f31 100644 --- a/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 10 K.1 <-> 100 nF 400 V.1 <-> 680 K.1 100 nF .2 <-> 680 K.1 100 nF 400 V.2 <-> 330 K.2 - 120 5 W.1 <-> 47uF30 V.1 + 120 5 W.1 <-> 47uF30 V.+ 33 nF 400 V.1 <-> 330 K.2 33 nF 400 V.2 <-> 680 K.1 330 K.1 <-> 330 K.1 diff --git a/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt index 5d1a41340..325a18f31 100644 --- a/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 10 K.1 <-> 100 nF 400 V.1 <-> 680 K.1 100 nF .2 <-> 680 K.1 100 nF 400 V.2 <-> 330 K.2 - 120 5 W.1 <-> 47uF30 V.1 + 120 5 W.1 <-> 47uF30 V.+ 33 nF 400 V.1 <-> 330 K.2 33 nF 400 V.2 <-> 680 K.1 330 K.1 <-> 330 K.1 diff --git a/diylc-regression-data/input/cloud/netlist/334_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/334_excl_switches.txt index bbd2debc8..9e5ca57bf 100644 --- a/diylc-regression-data/input/cloud/netlist/334_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/334_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 470 uF 450 V.1 <-> C1.2 <-> C2.2 <-> D1.2 <-> D2.2 <-> MKP 10 100 nF 630 V.2 <-> R1.1 <-> R2.1 <-> R4.2 - 470 uF 450 V.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> D3.1 <-> D4.1 <-> MKP 10 100 nF 630 V.1 <-> R1.2 <-> R5.2 <-> ZD 3.1 - C1.1 <-> C4.1 <-> D1.1 <-> D4.2 - C2.1 <-> C3.1 <-> D2.1 <-> D3.2 - C5.1 <-> R2.2 <-> R3.2 <-> ZD1.2 - R3.1 <-> ZD 4.2 - R5.1 <-> ZD 4.1 - ZD 2.1 <-> ZD 3.2 - ZD 2.2 <-> ZD1.1 + 470 uF 450 V.+ <-> C1.2 <-> C2.2 <-> D1.K <-> D2.K <-> MKP 10 100 nF 630 V.2 <-> R1.1 <-> R2.1 <-> R4.2 + 470 uF 450 V.- <-> C3.2 <-> C4.2 <-> C5.- <-> D3.A <-> D4.A <-> MKP 10 100 nF 630 V.1 <-> R1.2 <-> R5.2 <-> ZD 3.A + C1.1 <-> C4.1 <-> D1.A <-> D4.K + C2.1 <-> C3.1 <-> D2.A <-> D3.K + C5.+ <-> R2.2 <-> R3.2 <-> ZD1.K + R3.1 <-> ZD 4.K + R5.1 <-> ZD 4.A + ZD 2.A <-> ZD 3.K + ZD 2.K <-> ZD1.A diff --git a/diylc-regression-data/input/cloud/netlist/334_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/334_incl_switches.txt index bbd2debc8..9e5ca57bf 100644 --- a/diylc-regression-data/input/cloud/netlist/334_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/334_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 470 uF 450 V.1 <-> C1.2 <-> C2.2 <-> D1.2 <-> D2.2 <-> MKP 10 100 nF 630 V.2 <-> R1.1 <-> R2.1 <-> R4.2 - 470 uF 450 V.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> D3.1 <-> D4.1 <-> MKP 10 100 nF 630 V.1 <-> R1.2 <-> R5.2 <-> ZD 3.1 - C1.1 <-> C4.1 <-> D1.1 <-> D4.2 - C2.1 <-> C3.1 <-> D2.1 <-> D3.2 - C5.1 <-> R2.2 <-> R3.2 <-> ZD1.2 - R3.1 <-> ZD 4.2 - R5.1 <-> ZD 4.1 - ZD 2.1 <-> ZD 3.2 - ZD 2.2 <-> ZD1.1 + 470 uF 450 V.+ <-> C1.2 <-> C2.2 <-> D1.K <-> D2.K <-> MKP 10 100 nF 630 V.2 <-> R1.1 <-> R2.1 <-> R4.2 + 470 uF 450 V.- <-> C3.2 <-> C4.2 <-> C5.- <-> D3.A <-> D4.A <-> MKP 10 100 nF 630 V.1 <-> R1.2 <-> R5.2 <-> ZD 3.A + C1.1 <-> C4.1 <-> D1.A <-> D4.K + C2.1 <-> C3.1 <-> D2.A <-> D3.K + C5.+ <-> R2.2 <-> R3.2 <-> ZD1.K + R3.1 <-> ZD 4.K + R5.1 <-> ZD 4.A + ZD 2.A <-> ZD 3.K + ZD 2.K <-> ZD1.A diff --git a/diylc-regression-data/input/cloud/netlist/335_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/335_excl_switches.txt index 529033806..d59164d02 100644 --- a/diylc-regression-data/input/cloud/netlist/335_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/335_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 C3.1 <-> C4.2 - C7.1 <-> R4.1 - C8.1 <-> D8.1 - D1.1 <-> D2.2 - D3.1 <-> D4.2 - D5.2 <-> D6.1 - D6.2 <-> D7.1 + C7.+ <-> R4.1 + C8.+ <-> D8.A + D1.A <-> D2.K + D3.A <-> D4.K + D5.K <-> D6.A + D6.K <-> D7.A R1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/335_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/335_incl_switches.txt index 529033806..d59164d02 100644 --- a/diylc-regression-data/input/cloud/netlist/335_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/335_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 C3.1 <-> C4.2 - C7.1 <-> R4.1 - C8.1 <-> D8.1 - D1.1 <-> D2.2 - D3.1 <-> D4.2 - D5.2 <-> D6.1 - D6.2 <-> D7.1 + C7.+ <-> R4.1 + C8.+ <-> D8.A + D1.A <-> D2.K + D3.A <-> D4.K + D5.K <-> D6.A + D6.K <-> D7.A R1.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/336_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/336_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/336_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/336_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/336_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/336_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/336_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/336_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/337_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/337_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/337_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/337_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/337_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/337_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/337_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/337_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/338_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/338_excl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/338_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/338_excl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/338_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/338_incl_switches.txt index 53e17a239..8b4129250 100644 --- a/diylc-regression-data/input/cloud/netlist/338_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/338_incl_switches.txt @@ -1,3 +1,3 @@ -Switch setup: [Default] +Switch setup: [ ALL ] diff --git a/diylc-regression-data/input/cloud/netlist/339_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/339_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/339_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/339_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/339_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/339_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/339_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/339_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/340_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/340_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/340_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/340_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/340_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/340_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/340_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/340_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/341_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/341_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/341_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/341_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/341_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/341_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/341_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/341_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/342_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/342_excl_switches.txt index 226ec6b1a..1bcaaceef 100644 --- a/diylc-regression-data/input/cloud/netlist/342_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/342_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 220V AC --> 11V AC.3 <-> BR1.3 220V AC --> 11V AC.4 <-> BR1.2 - BR1.1 <-> C1.1 <-> C5.2 <-> D1.2 <-> Q1.3 - BR1.4 <-> C1.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> R1.1 - C2.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.1 - C3.1 <-> C4.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> R2.2 + BR1.1 <-> C1.+ <-> C5.2 <-> D1.K <-> Q1.3 + BR1.4 <-> C1.- <-> C2.- <-> C3.- <-> C4.1 <-> C5.1 <-> R1.1 + C2.+ <-> D2.A <-> Q1.1 <-> R1.2 <-> R2.1 + C3.+ <-> C4.2 <-> D1.A <-> D2.K <-> Q1.2 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/342_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/342_incl_switches.txt index 226ec6b1a..1bcaaceef 100644 --- a/diylc-regression-data/input/cloud/netlist/342_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/342_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 220V AC --> 11V AC.3 <-> BR1.3 220V AC --> 11V AC.4 <-> BR1.2 - BR1.1 <-> C1.1 <-> C5.2 <-> D1.2 <-> Q1.3 - BR1.4 <-> C1.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> R1.1 - C2.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.1 - C3.1 <-> C4.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> R2.2 + BR1.1 <-> C1.+ <-> C5.2 <-> D1.K <-> Q1.3 + BR1.4 <-> C1.- <-> C2.- <-> C3.- <-> C4.1 <-> C5.1 <-> R1.1 + C2.+ <-> D2.A <-> Q1.1 <-> R1.2 <-> R2.1 + C3.+ <-> C4.2 <-> D1.A <-> D2.K <-> Q1.2 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/343_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/343_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/343_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/343_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/343_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/343_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/343_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/343_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/344_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/344_excl_switches.txt index 81267a426..49f46baaa 100644 --- a/diylc-regression-data/input/cloud/netlist/344_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/344_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C14.1 <-> R18.2 C15.1 <-> R19.2 diff --git a/diylc-regression-data/input/cloud/netlist/344_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/344_incl_switches.txt index 81267a426..49f46baaa 100644 --- a/diylc-regression-data/input/cloud/netlist/344_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/344_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C14.1 <-> R18.2 C15.1 <-> R19.2 diff --git a/diylc-regression-data/input/cloud/netlist/345_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/345_excl_switches.txt index 083abea0f..0968ccb7f 100644 --- a/diylc-regression-data/input/cloud/netlist/345_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/345_excl_switches.txt @@ -1,19 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C10.2 <-> C6.2 <-> C7.2 <-> R1.2 <-> R12.2 <-> R16.2 <-> R2.2 <-> R20.2 <-> R8.2 - C11.2 <-> R15.2 <-> R17.2 + C10.+ <-> R16.1 + C10.- <-> C11.- <-> C4.2 <-> C6.2 <-> C7.- <-> R1.2 <-> R12.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R2.2 <-> R20.2 <-> R4.2 <-> R8.2 + C11.+ <-> R17.1 + C12.1 <-> C13.1 <-> C7.+ <-> R10.1 <-> R11.1 <-> R9.2 C14.1 <-> R18.1 - C14.2 <-> R6.2 <-> R7.1 <-> R8.1 + C14.2 <-> C5.- <-> R6.2 <-> R7.1 <-> R8.1 C15.1 <-> R19.1 - C15.2 <-> R3.2 <-> R4.1 <-> R5.1 + C15.2 <-> C3.- <-> R3.2 <-> R4.1 <-> R5.1 C2.2 <-> R2.1 + C3.+ <-> R3.1 C4.1 <-> R5.2 - C4.2 <-> R4.2 - C5.1 <-> R6.1 + C5.+ <-> R6.1 C6.1 <-> R7.2 - C7.1 <-> R10.1 <-> R11.1 <-> R9.2 + C8.1 <-> R14.1 <-> R15.1 + C8.2 <-> R11.2 C9.1 <-> R10.2 R12.1 <-> R13.1 - R14.1 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/345_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/345_incl_switches.txt index 083abea0f..0968ccb7f 100644 --- a/diylc-regression-data/input/cloud/netlist/345_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/345_incl_switches.txt @@ -1,19 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C10.2 <-> C6.2 <-> C7.2 <-> R1.2 <-> R12.2 <-> R16.2 <-> R2.2 <-> R20.2 <-> R8.2 - C11.2 <-> R15.2 <-> R17.2 + C10.+ <-> R16.1 + C10.- <-> C11.- <-> C4.2 <-> C6.2 <-> C7.- <-> R1.2 <-> R12.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R2.2 <-> R20.2 <-> R4.2 <-> R8.2 + C11.+ <-> R17.1 + C12.1 <-> C13.1 <-> C7.+ <-> R10.1 <-> R11.1 <-> R9.2 C14.1 <-> R18.1 - C14.2 <-> R6.2 <-> R7.1 <-> R8.1 + C14.2 <-> C5.- <-> R6.2 <-> R7.1 <-> R8.1 C15.1 <-> R19.1 - C15.2 <-> R3.2 <-> R4.1 <-> R5.1 + C15.2 <-> C3.- <-> R3.2 <-> R4.1 <-> R5.1 C2.2 <-> R2.1 + C3.+ <-> R3.1 C4.1 <-> R5.2 - C4.2 <-> R4.2 - C5.1 <-> R6.1 + C5.+ <-> R6.1 C6.1 <-> R7.2 - C7.1 <-> R10.1 <-> R11.1 <-> R9.2 + C8.1 <-> R14.1 <-> R15.1 + C8.2 <-> R11.2 C9.1 <-> R10.2 R12.1 <-> R13.1 - R14.1 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/346_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/346_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/346_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/346_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/346_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/346_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/346_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/346_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/347_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/347_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/347_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/347_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/347_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/347_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/347_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/347_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/348_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/348_excl_switches.txt index a92e73121..0ddc6a770 100644 --- a/diylc-regression-data/input/cloud/netlist/348_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/348_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 <-> R1.2 - C1.2 <-> C3.2 <-> C4.2 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> Gain.2 <-> Gain.3 <-> IC1.4 <-> R1.1 <-> R5.2 <-> Volume.3 + C1.2 <-> C3.- <-> C4.- <-> C8.2 <-> D1.A <-> D2.K <-> D3.A <-> Gain.1 <-> Gain.2 <-> IC1.4 <-> R1.1 <-> R5.2 <-> Volume.1 C2.1 <-> R2.1 - C3.1 <-> R3.2 <-> R4.1 <-> R5.1 - C4.1 <-> D1.2 <-> IC1.6 <-> R4.2 <-> R9.1 + C3.+ <-> R3.2 <-> R4.1 <-> R5.1 + C4.+ <-> D1.K <-> IC1.6 <-> R4.2 <-> R9.1 C5.1 <-> R6.2 C5.2 <-> C6.2 <-> IC1.2 <-> R7.2 C6.1 <-> C7.2 <-> IC1.7 <-> R7.1 C7.1 <-> R8.2 - C8.1 <-> D2.1 <-> D3.2 <-> R8.1 <-> Volume.1 - Gain.1 <-> R6.1 + C8.1 <-> D2.A <-> D3.K <-> R8.1 <-> Volume.3 + Gain.3 <-> R6.1 IC1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/348_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/348_incl_switches.txt index a92e73121..0ddc6a770 100644 --- a/diylc-regression-data/input/cloud/netlist/348_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/348_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 <-> R1.2 - C1.2 <-> C3.2 <-> C4.2 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> Gain.2 <-> Gain.3 <-> IC1.4 <-> R1.1 <-> R5.2 <-> Volume.3 + C1.2 <-> C3.- <-> C4.- <-> C8.2 <-> D1.A <-> D2.K <-> D3.A <-> Gain.1 <-> Gain.2 <-> IC1.4 <-> R1.1 <-> R5.2 <-> Volume.1 C2.1 <-> R2.1 - C3.1 <-> R3.2 <-> R4.1 <-> R5.1 - C4.1 <-> D1.2 <-> IC1.6 <-> R4.2 <-> R9.1 + C3.+ <-> R3.2 <-> R4.1 <-> R5.1 + C4.+ <-> D1.K <-> IC1.6 <-> R4.2 <-> R9.1 C5.1 <-> R6.2 C5.2 <-> C6.2 <-> IC1.2 <-> R7.2 C6.1 <-> C7.2 <-> IC1.7 <-> R7.1 C7.1 <-> R8.2 - C8.1 <-> D2.1 <-> D3.2 <-> R8.1 <-> Volume.1 - Gain.1 <-> R6.1 + C8.1 <-> D2.A <-> D3.K <-> R8.1 <-> Volume.3 + Gain.3 <-> R6.1 IC1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/349_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/349_excl_switches.txt index 3269a7e40..2e09f8ba2 100644 --- a/diylc-regression-data/input/cloud/netlist/349_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/349_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] J2.Sleeve <-> J3.Sleeve <-> J4.Sleeve J2.Tip <-> J3.Tip <-> J4.Tip diff --git a/diylc-regression-data/input/cloud/netlist/349_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/349_incl_switches.txt index ff2fb012e..d515b338c 100644 --- a/diylc-regression-data/input/cloud/netlist/349_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/349_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [SW1.ON1, SW1.ON2] +Switch setup: [ ALL ] J2.Sleeve <-> J3.Sleeve <-> J4.Sleeve J2.Tip <-> J3.Tip <-> J4.Tip diff --git a/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt index 072d2f6ae..f59506f6a 100644 --- a/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C4.2 <-> D1.1 <-> D2.2 <-> GND <-> R4.2 <-> VR2.3 - C6.2 <-> D1.2 + C1.2 <-> C4.- <-> D1.A <-> D2.K <-> GND <-> R4.2 <-> VR2.3 + C6.2 <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt index 072d2f6ae..f59506f6a 100644 --- a/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C4.2 <-> D1.1 <-> D2.2 <-> GND <-> R4.2 <-> VR2.3 - C6.2 <-> D1.2 + C1.2 <-> C4.- <-> D1.A <-> D2.K <-> GND <-> R4.2 <-> VR2.3 + C6.2 <-> D1.K diff --git a/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt index a8c7fc379..9bfc82040 100644 --- a/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BIAS.1 <-> C6.1 <-> D1.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2 - BIAS.2 <-> C2.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 <-> R1.2 <-> R4.1 <-> R6.1 <-> R8.1 + BIAS.2 <-> R8.1 BIAS.3 <-> C4.1 <-> Q3.3 - C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> C4.2 <-> Q1.2 <-> Q2.2 <-> Q3.1 <-> R1.1 <-> R2.1 <-> R7.1 <-> R7.2 - C3.2 <-> C5.2 <-> C6.2 <-> R2.2 <-> R3.2 <-> R5.2 - Q1.1 <-> Q2.1 <-> R3.1 <-> R5.1 - TOP.2 <-> TOP.3 + C1.+ <-> Q1.2 <-> R1.1 <-> R2.1 + C2.1 <-> Q1.3 <-> R1.2 <-> R4.1 + C2.2 <-> Q2.2 <-> R7.2 + C3.- <-> C5.2 <-> C6.- <-> R2.2 <-> R3.2 <-> R5.2 + C6.+ <-> D1.K <-> R4.2 <-> R6.2 <-> R8.2 + Q1.1 <-> R3.1 + Q2.1 <-> R5.1 + Q2.3 <-> Q3.2 <-> R6.1 + Q3.1 <-> R7.1 + TOP.1 <-> TOP.2 diff --git a/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt index a8c7fc379..9bfc82040 100644 --- a/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BIAS.1 <-> C6.1 <-> D1.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2 - BIAS.2 <-> C2.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 <-> R1.2 <-> R4.1 <-> R6.1 <-> R8.1 + BIAS.2 <-> R8.1 BIAS.3 <-> C4.1 <-> Q3.3 - C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> C4.2 <-> Q1.2 <-> Q2.2 <-> Q3.1 <-> R1.1 <-> R2.1 <-> R7.1 <-> R7.2 - C3.2 <-> C5.2 <-> C6.2 <-> R2.2 <-> R3.2 <-> R5.2 - Q1.1 <-> Q2.1 <-> R3.1 <-> R5.1 - TOP.2 <-> TOP.3 + C1.+ <-> Q1.2 <-> R1.1 <-> R2.1 + C2.1 <-> Q1.3 <-> R1.2 <-> R4.1 + C2.2 <-> Q2.2 <-> R7.2 + C3.- <-> C5.2 <-> C6.- <-> R2.2 <-> R3.2 <-> R5.2 + C6.+ <-> D1.K <-> R4.2 <-> R6.2 <-> R8.2 + Q1.1 <-> R3.1 + Q2.1 <-> R5.1 + Q2.3 <-> Q3.2 <-> R6.1 + Q3.1 <-> R7.1 + TOP.1 <-> TOP.2 diff --git a/diylc-regression-data/input/cloud/netlist/352_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/352_excl_switches.txt index e1f574f4d..ee95deecf 100644 --- a/diylc-regression-data/input/cloud/netlist/352_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/352_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 + C1.+ <-> C1.- <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.+ <-> C4.- <-> C5.+ <-> C5.- <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/352_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/352_incl_switches.txt index e1f574f4d..ee95deecf 100644 --- a/diylc-regression-data/input/cloud/netlist/352_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/352_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 + C1.+ <-> C1.- <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.+ <-> C4.- <-> C5.+ <-> C5.- <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt index cd2a25a39..83d03feff 100644 --- a/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1nf.1 <-> CRL Switch.2 <-> CRL Switch.7 <-> Volume.1 + 1nf.1 <-> CRL Switch.2 <-> CRL Switch.7 <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> CRL Switch.3 <-> Tone 2.1 - 1nf.2 <-> CRL Switch.5 <-> Tone 1.1 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> CRL Switch.3 <-> Tone 2.3 + 1nf.2 <-> CRL Switch.5 <-> Tone 1.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish Bridge.North Start <-> CRL Switch.4 CRL Switch.6 <-> Middle.North Start CRL Switch.8 <-> Neck.North Start - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 diff --git a/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt index 5226321ec..9cb74cd40 100644 --- a/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt @@ -1,75 +1,75 @@ -Switch setup: [CRL Switch.1] +Switch setup: [ CRL Switch.1 ] - 1nf.1 <-> Bridge.North Start <-> Volume.1 + 1nf.1 <-> Bridge.North Start <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 - 1nf.2 <-> Tone 1.1 - 1nf.2 <-> Tone 2.1 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 + 1nf.2 <-> Tone 1.3 + 1nf.2 <-> Tone 2.3 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 -Switch setup: [CRL Switch.2] +Switch setup: [ CRL Switch.2 ] - 1nf.1 <-> 1nf.2 <-> Bridge.North Start <-> Middle.North Start <-> Tone 2.1 <-> Volume.1 + 1nf.1 <-> 1nf.2 <-> Bridge.North Start <-> Middle.North Start <-> Tone 2.3 <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 - 1nf.2 <-> Tone 1.1 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 + 1nf.2 <-> Tone 1.3 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 -Switch setup: [CRL Switch.3] +Switch setup: [ CRL Switch.3 ] - 1nf.1 <-> 1nf.2 <-> Middle.North Start <-> Tone 2.1 <-> Volume.1 + 1nf.1 <-> 1nf.2 <-> Middle.North Start <-> Tone 2.3 <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 - 1nf.2 <-> Tone 1.1 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 + 1nf.2 <-> Tone 1.3 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 -Switch setup: [CRL Switch.4] +Switch setup: [ CRL Switch.4 ] - 1nf.1 <-> 1nf.2 <-> 1nf.2 <-> Middle.North Start <-> Neck.North Start <-> Tone 1.1 <-> Tone 2.1 <-> Volume.1 + 1nf.1 <-> 1nf.2 <-> 1nf.2 <-> Middle.North Start <-> Neck.North Start <-> Tone 1.3 <-> Tone 2.3 <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 -Switch setup: [CRL Switch.5] +Switch setup: [ CRL Switch.5 ] - 1nf.1 <-> 1nf.2 <-> Neck.North Start <-> Tone 1.1 <-> Volume.1 + 1nf.1 <-> 1nf.2 <-> Neck.North Start <-> Tone 1.3 <-> Volume.3 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 - 1nf.2 <-> Tone 2.1 + 1nf.2 <-> Plug Jack.3 <-> Volume.1 <-> Volume.2 + 1nf.2 <-> Tone 2.3 22nf.1 <-> 4.7k.1 - 22nf.2 <-> Tone 2.3 + 22nf.2 <-> Tone 2.1 33nf.1 <-> 4.7k.1 - 33nf.2 <-> Tone 1.3 + 33nf.2 <-> Tone 1.1 Br Plug Fem.4 <-> GND Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish - J1.Tip <-> Plug Jill.3 + J1.Sleeve <-> J1.Tip <-> Plug Jill.3 diff --git a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt index 15e714dd7..c27134b34 100644 --- a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt @@ -1,4 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3 + .1 <-> GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3 <-> SW2.3 <-> SW4.3 + .2 <-> J1.Tip diff --git a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt index 5b621b746..6ab7570ce 100644 --- a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt @@ -1,4 +1,5 @@ -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2] +Switch setup: [ ALL ] - GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start + .1 <-> GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start + .2 <-> J1.Tip diff --git a/diylc-regression-data/input/cloud/netlist/356_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/356_excl_switches.txt index df7b0c257..285c5c1fe 100644 --- a/diylc-regression-data/input/cloud/netlist/356_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/356_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> C11.1 <-> R24.1 C10.1 <-> R18.1 C10.2 <-> R17.2 C11.1 <-> C11.2 <-> R25.1 C11.2 <-> R19.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R21.1 <-> R24.2 <-> R25.2 <-> R30.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R21.1 <-> R24.2 <-> R25.2 <-> R30.2 C2.1 <-> R3.2 C3.1 <-> R4.2 C7.1 <-> R14.1 <-> R15.2 C8.1 <-> C9.1 <-> R15.1 C9.1 <-> R22.1 C9.2 <-> R21.2 - D1.1 <-> R29.2 + D1.A <-> R29.2 R1.2 <-> R2.2 R10.1 <-> R11.1 R13.2 <-> R14.2 diff --git a/diylc-regression-data/input/cloud/netlist/356_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/356_incl_switches.txt index df7b0c257..285c5c1fe 100644 --- a/diylc-regression-data/input/cloud/netlist/356_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/356_incl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> C11.1 <-> R24.1 C10.1 <-> R18.1 C10.2 <-> R17.2 C11.1 <-> C11.2 <-> R25.1 C11.2 <-> R19.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R21.1 <-> R24.2 <-> R25.2 <-> R30.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R21.1 <-> R24.2 <-> R25.2 <-> R30.2 C2.1 <-> R3.2 C3.1 <-> R4.2 C7.1 <-> R14.1 <-> R15.2 C8.1 <-> C9.1 <-> R15.1 C9.1 <-> R22.1 C9.2 <-> R21.2 - D1.1 <-> R29.2 + D1.A <-> R29.2 R1.2 <-> R2.2 R10.1 <-> R11.1 R13.2 <-> R14.2 diff --git a/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt index 7bebcb90f..4373e3fc0 100644 --- a/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt @@ -1,63 +1,61 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 + D1.A <-> R29.2 FH1.1 <-> SW1.2 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G PL1.1 <-> SW1.1 PL1.2 <-> SW1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G R7.1 <-> R8.2 R7.2 <-> V4.S R8.1 <-> V5.S SW3.1 <-> SW3.4 SW3.2 <-> SW3.5 + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H + V6.H <-> V6.H diff --git a/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt index e29aac389..2c9ab0c5d 100644 --- a/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt @@ -1,117 +1,113 @@ -Switch setup: [SW1.ON1:SW3.ON1, SW1.ON1:SW3.ON2] +Switch setup: [ SW1.ON1 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 + D1.A <-> R29.2 FH1.1 <-> PL1.1 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G R7.1 <-> R8.2 R7.2 <-> V4.S R8.1 <-> V5.S + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H + V6.H <-> V6.H -Switch setup: [SW1.ON2:SW3.ON1, SW1.ON2:SW3.ON2] +Switch setup: [ SW1.ON2 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 + D1.A <-> R29.2 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G R7.1 <-> R8.2 R7.2 <-> V4.S R8.1 <-> V5.S + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H + V6.H <-> V6.H diff --git a/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt index 95751b91c..7ba57850b 100644 --- a/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt @@ -1,50 +1,46 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.1 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> V6.NC - D2.2 <-> V6.P - D3.1 <-> V6.NC - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P + D3.A <-> V6.NC FH1.1 <-> SW1.2 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve IEC1.3 <-> SW1.5 - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> Not Original.2 <-> R32.2 @@ -54,18 +50,18 @@ Switch setup: [Default] Not Original.2 <-> V4.S PL1.1 <-> SW1.1 PL1.2 <-> SW1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt index 9339f8f77..a74d3c28c 100644 --- a/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt @@ -1,268 +1,252 @@ -Switch setup: [SW1.ON1:SW3.ON1] +Switch setup: [ SW1.ON1:SW3.ON1 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.1 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> V6.NC - D2.2 <-> V6.P - D3.1 <-> V6.NC - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P + D3.A <-> V6.NC FH1.1 <-> PL1.1 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve IEC1.3 <-> PL1.2 - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> Not Original.2 <-> R32.2 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON1:SW3.ON2] +Switch setup: [ SW1.ON1:SW3.ON2 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.1 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> V6.NC - D2.2 <-> V6.P - D3.1 <-> V6.NC - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P + D3.A <-> V6.NC FH1.1 <-> PL1.1 FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve IEC1.3 <-> PL1.2 - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> Not Original.2 <-> R32.2 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON1] +Switch setup: [ SW1.ON2:SW3.ON1 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.1 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> V6.NC - D2.2 <-> V6.P - D3.1 <-> V6.NC - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P + D3.A <-> V6.NC FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> Not Original.2 <-> R32.2 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON2] +Switch setup: [ SW1.ON2:SW3.ON2 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.1 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> V6.NC - D2.2 <-> V6.P - D3.1 <-> V6.NC - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P + D3.A <-> V6.NC FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> Not Original.2 <-> R32.2 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt index 2dbe1fc67..8084077f7 100644 --- a/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt @@ -1,47 +1,43 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> SW1.2 <-> SW1.5 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> SW3.2 <-> SW3.5 @@ -51,18 +47,18 @@ Switch setup: [Default] Not Original2.2 <-> V4.S PL1.1 <-> SW1.1 PL1.2 <-> PL1.4 <-> SW1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt index c72a8cf8e..476bb993e 100644 --- a/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt @@ -1,177 +1,165 @@ -Switch setup: [SW1.ON1:SW3.ON1] +Switch setup: [ SW1.ON1:SW3.ON1 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> Not Original2.1 <-> R32.1 Not Original2.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON1:SW3.ON2] +Switch setup: [ SW1.ON1:SW3.ON2 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G Not Original.1 <-> V5.S Not Original.2 <-> Not Original2.1 <-> R32.1 Not Original2.2 <-> V4.S - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON1] +Switch setup: [ SW1.ON2:SW3.ON1 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G @@ -179,65 +167,61 @@ Switch setup: [SW1.ON2:SW3.ON1] Not Original.2 <-> Not Original2.1 <-> R32.1 Not Original2.2 <-> V4.S PL1.2 <-> PL1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON2] +Switch setup: [ SW1.ON2:SW3.ON2 ] Not Original.1 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> C6.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.2 <-> R16.1 C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 J16.3 <-> J17.4 Not Original.1 <-> V4.G @@ -245,18 +229,18 @@ Switch setup: [SW1.ON2:SW3.ON2] Not Original.2 <-> Not Original2.1 <-> R32.1 Not Original2.2 <-> V4.S PL1.2 <-> PL1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R22.1 <-> V3.G - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/360_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/360_excl_switches.txt index 998bd864a..c99cb9967 100644 --- a/diylc-regression-data/input/cloud/netlist/360_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/360_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 C3.1 <-> R2.1 @@ -6,6 +6,6 @@ Switch setup: [Default] C6.1 <-> R11.1 C7.1 <-> R10.1 C7.2 <-> C8.1 - LED .2 <-> R12.2 + LED .K <-> R12.2 R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/360_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/360_incl_switches.txt index 998bd864a..c99cb9967 100644 --- a/diylc-regression-data/input/cloud/netlist/360_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/360_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 C3.1 <-> R2.1 @@ -6,6 +6,6 @@ Switch setup: [Default] C6.1 <-> R11.1 C7.1 <-> R10.1 C7.2 <-> C8.1 - LED .2 <-> R12.2 + LED .K <-> R12.2 R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt index 76c0a0757..794edda82 100644 --- a/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt @@ -1,66 +1,62 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Not Original.1 <-> J16.3 <-> J17.4 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C 5W.1 <-> 5W.2 <-> R32.1 5W.1 <-> V5.S 5W.2 <-> V4.S - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> C6.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.1 <-> R22.1 <-> V3.G - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.3 <-> Not Original.1 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D1.2 <-> D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D1.K <-> D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> SW1.2 <-> SW1.5 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 Not Original.1 <-> SW3.2 <-> SW3.5 Not Original.1 <-> V4.G PL1.1 <-> SW1.1 PL1.2 <-> PL1.4 <-> SW1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt index ee4a46f8f..971db70b9 100644 --- a/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt @@ -1,254 +1,238 @@ -Switch setup: [SW1.ON1:SW3.ON1] +Switch setup: [ SW1.ON1:SW3.ON1 ] Not Original.1 <-> J16.3 <-> J17.4 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C 5W.1 <-> 5W.2 <-> R32.1 5W.1 <-> V5.S 5W.2 <-> V4.S - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> C6.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.1 <-> R22.1 <-> V3.G - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.3 <-> Not Original.1 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D1.2 <-> D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D1.K <-> D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 Not Original.1 <-> V4.G - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON1:SW3.ON2] +Switch setup: [ SW1.ON1:SW3.ON2 ] Not Original.1 <-> J16.3 <-> J17.4 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C 5W.1 <-> 5W.2 <-> R32.1 5W.1 <-> V5.S 5W.2 <-> V4.S - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> C6.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.1 <-> R22.1 <-> V3.G - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.3 <-> Not Original.1 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D1.2 <-> D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D1.K <-> D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 Not Original.1 <-> V4.G - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON1] +Switch setup: [ SW1.ON2:SW3.ON1 ] Not Original.1 <-> J16.3 <-> J17.4 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C 5W.1 <-> 5W.2 <-> R32.1 5W.1 <-> V5.S 5W.2 <-> V4.S - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> C6.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.1 <-> R22.1 <-> V3.G - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.3 <-> Not Original.1 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D1.2 <-> D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D1.K <-> D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 Not Original.1 <-> V4.G PL1.2 <-> PL1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H -Switch setup: [SW1.ON2:SW3.ON2] +Switch setup: [ SW1.ON2:SW3.ON2 ] Not Original.1 <-> J16.3 <-> J17.4 <-> J9.J9Sleeve <-> R17.1 Not Original.2 <-> V4.C 5W.1 <-> 5W.2 <-> R32.1 5W.1 <-> V5.S 5W.2 <-> V4.S - Bass.1 <-> C8.2 <-> Treble.3 - Bass.3 <-> Middle.1 - C1.1 <-> V1.C <-> V1.C - C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3 - C10.1 <-> R18.1 <-> V3.G + Bass.1 <-> Middle.3 + Bass.2 <-> Bass.3 <-> C8.2 <-> Treble.1 + C1.+ <-> V1.C <-> V1.C + C1.- <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J1.4 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> J2.1 <-> J2.4 <-> Not Original.1 <-> Not Original.2 <-> Presence.1 <-> R3.2 + C10.1 <-> C6.1 <-> R18.1 <-> R22.1 <-> V3.G <-> V3.G C10.2 <-> Treble.2 - C11.1 <-> C11.2 <-> R20.1 <-> V3.P - C11.1 <-> C4.1 <-> R19.1 <-> V3.P + C11.1 <-> C11.1 <-> C11.2 <-> C4.1 <-> R19.1 <-> R20.1 <-> V3.P <-> V3.P C11.2 <-> R16.1 <-> R25.2 C12.1 <-> Presence.2 C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C C16/C17.3 <-> R23.2 <-> R32.2 - C18.2 <-> R29.1 <-> R30.1 - C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 - C2.1 <-> R3.2 <-> V1.P - C2.2 <-> Volume II.1 - C3.1 <-> R4.2 <-> V1.P - C3.2 <-> Volume I.1 - C4.1 <-> Volume I.2 + C18.- <-> R29.1 <-> R30.1 + C19.- <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1 + C2.1 <-> C3.1 <-> R3.2 <-> R4.2 <-> V1.P <-> V1.P + C2.2 <-> Volume II.3 + C3.2 <-> C4.2 <-> Volume I.3 + C4.1 <-> R11.2 <-> Volume I.2 C4.2 <-> Not Original.2 <-> R24.2 - C6.1 <-> R22.1 <-> V3.G - C6.2 <-> Presence.1 <-> R21.2 <-> R22.2 + C6.2 <-> Presence.3 <-> R21.2 <-> R22.2 C6.3 <-> Not Original.1 <-> R23.1 - C7.1 <-> R14.1 <-> R15.2 <-> V2.C - C7.2 <-> Treble.1 + C7.1 <-> R13.1 <-> R14.1 <-> R15.2 <-> V2.C <-> V2.C + C7.2 <-> Treble.3 C8.1 <-> C9.1 <-> R15.1 C9.2 <-> Middle.2 - D1.1 <-> R29.2 - D1.2 <-> D2.1 <-> D3.1 <-> V6.NC <-> V6.NC - D2.2 <-> V6.P - D3.2 <-> V6.P + D1.A <-> R29.2 + D1.K <-> D2.A <-> D3.A <-> V6.NC <-> V6.NC + D2.K <-> D3.K <-> V6.P <-> V6.P FH1.1 <-> FH1.2 <-> IEC1.2 IEC1.1 <-> J15.J15Sleeve - Impedance.Common <-> J17.2 - J1.1 <-> J2.2 <-> R2.1 + Impedance.Common <-> J16.1 <-> J17.2 + J1.1 <-> J2.2 <-> R2.1 <-> R3.1 J1.2 <-> R1.1 - J1.4 <-> J2.1 <-> J2.4 <-> R3.2 - J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip - J11.1 <-> J11.4 <-> J12.4 - J11.2 <-> J12.1 <-> R5.2 + J10.J10Tip <-> J13.J13Tip <-> J14.J14Tip <-> J9.J9Tip + J11.1 <-> J11.4 <-> J12.4 <-> R6.2 + J11.2 <-> J12.1 <-> R5.2 <-> R6.1 J12.2 <-> R4.2 Not Original.1 <-> V4.G PL1.2 <-> PL1.4 - R1.2 <-> R2.2 <-> V1.G - R10.1 <-> R11.1 <-> V2.G + R1.2 <-> R2.2 <-> R4.1 <-> R5.1 <-> V1.G <-> V1.G + R10.1 <-> R11.1 <-> R12.1 <-> R12.2 <-> R3.1 <-> R4.1 <-> V2.G <-> V2.G <-> V2.P <-> V2.P R10.2 <-> Volume II.2 - R12.1 <-> V2.G <-> V2.P - R12.2 <-> R3.1 <-> R4.1 <-> V2.P - R13.1 <-> V2.C R13.2 <-> R14.2 R16.2 <-> V5.G R17.2 <-> V5.C R18.2 <-> R20.2 <-> R21.1 <-> R22.2 R19.2 <-> R20.2 R20.1 <-> V3.C <-> V3.C - R4.1 <-> R5.1 <-> V1.G + V1.H <-> V1.H + V2.H <-> V2.H + V3.H <-> V3.H + V4.H <-> V4.H + V5.H <-> V5.H diff --git a/diylc-regression-data/input/cloud/netlist/362_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/362_excl_switches.txt index ae3515524..90542566f 100644 --- a/diylc-regression-data/input/cloud/netlist/362_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/362_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C4.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/362_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/362_incl_switches.txt index ae3515524..90542566f 100644 --- a/diylc-regression-data/input/cloud/netlist/362_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/362_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C4.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt index b21d7ce83..604ae6e72 100644 --- a/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt @@ -1,12 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .5M.1 <-> .5M.1 <-> 741.1 <-> 741.5 - .5M.2 <-> .5M.2 <-> .5M.3 <-> .5M.3 <-> 100K.1 <-> 100K.1 <-> 100K.2 <-> 100K.2 <-> 10K.1 <-> 10K.2 <-> 10K.2 <-> 1M.1 <-> 1M.1 <-> 741.2 <-> 741.3 <-> 741.6 <-> 741.7 <-> C1.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 + .5M.3 <-> .5M.3 <-> 100K.1 + 100K.1 <-> 100K.2 <-> 10K.2 <-> 10K.2 <-> 741.3 <-> 741.7 <-> D1.K <-> D2.A + 100K.2 <-> 741.2 <-> 741.6 <-> C1.1 10K.1 <-> C1.2 - 1M.1 <-> 1M.1 - 1M.2 <-> 1M.2 - 1M.2 <-> 1M.2 - 1M.3 <-> 1M.3 - 1M.3 <-> 1M.3 + 1M.1 <-> D1.A + 741.1 <-> 741.5 741.4 <-> 741.8 diff --git a/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt index b21d7ce83..604ae6e72 100644 --- a/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt @@ -1,12 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .5M.1 <-> .5M.1 <-> 741.1 <-> 741.5 - .5M.2 <-> .5M.2 <-> .5M.3 <-> .5M.3 <-> 100K.1 <-> 100K.1 <-> 100K.2 <-> 100K.2 <-> 10K.1 <-> 10K.2 <-> 10K.2 <-> 1M.1 <-> 1M.1 <-> 741.2 <-> 741.3 <-> 741.6 <-> 741.7 <-> C1.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 + .5M.3 <-> .5M.3 <-> 100K.1 + 100K.1 <-> 100K.2 <-> 10K.2 <-> 10K.2 <-> 741.3 <-> 741.7 <-> D1.K <-> D2.A + 100K.2 <-> 741.2 <-> 741.6 <-> C1.1 10K.1 <-> C1.2 - 1M.1 <-> 1M.1 - 1M.2 <-> 1M.2 - 1M.2 <-> 1M.2 - 1M.3 <-> 1M.3 - 1M.3 <-> 1M.3 + 1M.1 <-> D1.A + 741.1 <-> 741.5 741.4 <-> 741.8 diff --git a/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt index b603f392b..9b8baf864 100644 --- a/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt @@ -1,8 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R7.2 - C1.2 <-> R1.1 <-> R9.1 - C2.1 <-> R2.1 - C2.2 <-> C7.2 <-> R1.2 <-> R10.2 <-> R2.2 - C7.1 <-> R10.1 + C1.+ <-> R7.2 + C2.2 <-> R2.2 + C7.2 <-> R1.2 <-> R10.2 + R1.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt index b603f392b..9b8baf864 100644 --- a/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt @@ -1,8 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R7.2 - C1.2 <-> R1.1 <-> R9.1 - C2.1 <-> R2.1 - C2.2 <-> C7.2 <-> R1.2 <-> R10.2 <-> R2.2 - C7.1 <-> R10.1 + C1.+ <-> R7.2 + C2.2 <-> R2.2 + C7.2 <-> R1.2 <-> R10.2 + R1.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt index 164123876..a2b4e14ef 100644 --- a/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt @@ -1,9 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 <-> R6.2 <-> R7.2 - C1.2 <-> R3.1 - C5.1 <-> C7.1 <-> C9.1 <-> R5.1 <-> R6.1 <-> R8.1 <-> R9.1 - C5.2 <-> C7.2 <-> C9.2 <-> R1.2 <-> R4.2 + C1.+ <-> R2.2 <-> R7.2 + C1.- <-> R3.1 + C5.1 <-> R9.1 + C7.1 <-> R8.1 + C7.2 <-> R1.2 + C9.1 <-> R5.1 <-> R6.1 + C9.2 <-> R4.2 R1.1 <-> R2.1 <-> R4.1 R3.2 <-> R5.2 <-> R8.2 <-> R9.2 diff --git a/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt index 164123876..a2b4e14ef 100644 --- a/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt @@ -1,9 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 <-> R6.2 <-> R7.2 - C1.2 <-> R3.1 - C5.1 <-> C7.1 <-> C9.1 <-> R5.1 <-> R6.1 <-> R8.1 <-> R9.1 - C5.2 <-> C7.2 <-> C9.2 <-> R1.2 <-> R4.2 + C1.+ <-> R2.2 <-> R7.2 + C1.- <-> R3.1 + C5.1 <-> R9.1 + C7.1 <-> R8.1 + C7.2 <-> R1.2 + C9.1 <-> R5.1 <-> R6.1 + C9.2 <-> R4.2 R1.1 <-> R2.1 <-> R4.1 R3.2 <-> R5.2 <-> R8.2 <-> R9.2 diff --git a/diylc-regression-data/input/cloud/netlist/366_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/366_excl_switches.txt index e3b124f0c..ca447acf5 100644 --- a/diylc-regression-data/input/cloud/netlist/366_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/366_excl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .1 <-> .2 - .1 <-> .2 + .1 <-> .K diff --git a/diylc-regression-data/input/cloud/netlist/366_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/366_incl_switches.txt index e3b124f0c..ca447acf5 100644 --- a/diylc-regression-data/input/cloud/netlist/366_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/366_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .1 <-> .2 - .1 <-> .2 + .1 <-> .K diff --git a/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt index a269fbde9..1128814ec 100644 --- a/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt @@ -1,5 +1,49 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2 - C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1 + C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1 + C1.2 <-> IC1.16 <-> IC3.27 <-> PH1.18 + C2.2 <-> IC1.18 + C3.1 <-> IC1.31 <-> IC1.40 <-> IC2.20 <-> IC3.28 <-> PH1.1 <-> PH1.21 + C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1 + IC1.1 <-> PH1.3 + IC1.10 <-> PH1.12 + IC1.11 <-> PH1.13 + IC1.12 <-> PH1.14 + IC1.13 <-> PH1.15 + IC1.14 <-> PH1.16 + IC1.15 <-> PH1.17 + IC1.17 <-> PH1.19 + IC1.19 <-> X1.2 + IC1.2 <-> PH1.4 + IC1.21 <-> IC3.25 + IC1.22 <-> IC3.24 + IC1.23 <-> IC3.21 + IC1.24 <-> IC3.23 + IC1.25 <-> IC3.2 + IC1.26 <-> IC3.26 + IC1.27 <-> IC3.1 + IC1.29 <-> IC3.22 + IC1.3 <-> PH1.5 + IC1.30 <-> IC2.11 + IC1.32 <-> IC2.9 <-> IC3.13 + IC1.33 <-> IC2.8 <-> IC3.15 + IC1.34 <-> IC2.7 <-> IC3.12 + IC1.35 <-> IC2.6 <-> IC3.16 + IC1.36 <-> IC2.5 <-> IC3.11 + IC1.37 <-> IC2.4 <-> IC3.17 + IC1.38 <-> IC2.3 <-> IC3.18 + IC1.39 <-> IC2.2 <-> IC3.19 + IC1.4 <-> PH1.6 + IC1.5 <-> PH1.7 + IC1.6 <-> PH1.8 + IC1.7 <-> PH1.9 + IC1.8 <-> PH1.10 + IC2.12 <-> IC3.10 + IC2.13 <-> IC3.9 + IC2.14 <-> IC3.8 + IC2.15 <-> IC3.7 + IC2.16 <-> IC3.6 + IC2.17 <-> IC3.5 + IC2.18 <-> IC3.4 + IC2.19 <-> IC3.3 diff --git a/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt index a269fbde9..1128814ec 100644 --- a/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt @@ -1,5 +1,49 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2 - C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1 + C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1 + C1.2 <-> IC1.16 <-> IC3.27 <-> PH1.18 + C2.2 <-> IC1.18 + C3.1 <-> IC1.31 <-> IC1.40 <-> IC2.20 <-> IC3.28 <-> PH1.1 <-> PH1.21 + C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1 + IC1.1 <-> PH1.3 + IC1.10 <-> PH1.12 + IC1.11 <-> PH1.13 + IC1.12 <-> PH1.14 + IC1.13 <-> PH1.15 + IC1.14 <-> PH1.16 + IC1.15 <-> PH1.17 + IC1.17 <-> PH1.19 + IC1.19 <-> X1.2 + IC1.2 <-> PH1.4 + IC1.21 <-> IC3.25 + IC1.22 <-> IC3.24 + IC1.23 <-> IC3.21 + IC1.24 <-> IC3.23 + IC1.25 <-> IC3.2 + IC1.26 <-> IC3.26 + IC1.27 <-> IC3.1 + IC1.29 <-> IC3.22 + IC1.3 <-> PH1.5 + IC1.30 <-> IC2.11 + IC1.32 <-> IC2.9 <-> IC3.13 + IC1.33 <-> IC2.8 <-> IC3.15 + IC1.34 <-> IC2.7 <-> IC3.12 + IC1.35 <-> IC2.6 <-> IC3.16 + IC1.36 <-> IC2.5 <-> IC3.11 + IC1.37 <-> IC2.4 <-> IC3.17 + IC1.38 <-> IC2.3 <-> IC3.18 + IC1.39 <-> IC2.2 <-> IC3.19 + IC1.4 <-> PH1.6 + IC1.5 <-> PH1.7 + IC1.6 <-> PH1.8 + IC1.7 <-> PH1.9 + IC1.8 <-> PH1.10 + IC2.12 <-> IC3.10 + IC2.13 <-> IC3.9 + IC2.14 <-> IC3.8 + IC2.15 <-> IC3.7 + IC2.16 <-> IC3.6 + IC2.17 <-> IC3.5 + IC2.18 <-> IC3.4 + IC2.19 <-> IC3.3 diff --git a/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt index a269fbde9..1128814ec 100644 --- a/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt @@ -1,5 +1,49 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2 - C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1 + C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1 + C1.2 <-> IC1.16 <-> IC3.27 <-> PH1.18 + C2.2 <-> IC1.18 + C3.1 <-> IC1.31 <-> IC1.40 <-> IC2.20 <-> IC3.28 <-> PH1.1 <-> PH1.21 + C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1 + IC1.1 <-> PH1.3 + IC1.10 <-> PH1.12 + IC1.11 <-> PH1.13 + IC1.12 <-> PH1.14 + IC1.13 <-> PH1.15 + IC1.14 <-> PH1.16 + IC1.15 <-> PH1.17 + IC1.17 <-> PH1.19 + IC1.19 <-> X1.2 + IC1.2 <-> PH1.4 + IC1.21 <-> IC3.25 + IC1.22 <-> IC3.24 + IC1.23 <-> IC3.21 + IC1.24 <-> IC3.23 + IC1.25 <-> IC3.2 + IC1.26 <-> IC3.26 + IC1.27 <-> IC3.1 + IC1.29 <-> IC3.22 + IC1.3 <-> PH1.5 + IC1.30 <-> IC2.11 + IC1.32 <-> IC2.9 <-> IC3.13 + IC1.33 <-> IC2.8 <-> IC3.15 + IC1.34 <-> IC2.7 <-> IC3.12 + IC1.35 <-> IC2.6 <-> IC3.16 + IC1.36 <-> IC2.5 <-> IC3.11 + IC1.37 <-> IC2.4 <-> IC3.17 + IC1.38 <-> IC2.3 <-> IC3.18 + IC1.39 <-> IC2.2 <-> IC3.19 + IC1.4 <-> PH1.6 + IC1.5 <-> PH1.7 + IC1.6 <-> PH1.8 + IC1.7 <-> PH1.9 + IC1.8 <-> PH1.10 + IC2.12 <-> IC3.10 + IC2.13 <-> IC3.9 + IC2.14 <-> IC3.8 + IC2.15 <-> IC3.7 + IC2.16 <-> IC3.6 + IC2.17 <-> IC3.5 + IC2.18 <-> IC3.4 + IC2.19 <-> IC3.3 diff --git a/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt index a269fbde9..1128814ec 100644 --- a/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt @@ -1,5 +1,49 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2 - C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1 + C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1 + C1.2 <-> IC1.16 <-> IC3.27 <-> PH1.18 + C2.2 <-> IC1.18 + C3.1 <-> IC1.31 <-> IC1.40 <-> IC2.20 <-> IC3.28 <-> PH1.1 <-> PH1.21 + C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1 + IC1.1 <-> PH1.3 + IC1.10 <-> PH1.12 + IC1.11 <-> PH1.13 + IC1.12 <-> PH1.14 + IC1.13 <-> PH1.15 + IC1.14 <-> PH1.16 + IC1.15 <-> PH1.17 + IC1.17 <-> PH1.19 + IC1.19 <-> X1.2 + IC1.2 <-> PH1.4 + IC1.21 <-> IC3.25 + IC1.22 <-> IC3.24 + IC1.23 <-> IC3.21 + IC1.24 <-> IC3.23 + IC1.25 <-> IC3.2 + IC1.26 <-> IC3.26 + IC1.27 <-> IC3.1 + IC1.29 <-> IC3.22 + IC1.3 <-> PH1.5 + IC1.30 <-> IC2.11 + IC1.32 <-> IC2.9 <-> IC3.13 + IC1.33 <-> IC2.8 <-> IC3.15 + IC1.34 <-> IC2.7 <-> IC3.12 + IC1.35 <-> IC2.6 <-> IC3.16 + IC1.36 <-> IC2.5 <-> IC3.11 + IC1.37 <-> IC2.4 <-> IC3.17 + IC1.38 <-> IC2.3 <-> IC3.18 + IC1.39 <-> IC2.2 <-> IC3.19 + IC1.4 <-> PH1.6 + IC1.5 <-> PH1.7 + IC1.6 <-> PH1.8 + IC1.7 <-> PH1.9 + IC1.8 <-> PH1.10 + IC2.12 <-> IC3.10 + IC2.13 <-> IC3.9 + IC2.14 <-> IC3.8 + IC2.15 <-> IC3.7 + IC2.16 <-> IC3.6 + IC2.17 <-> IC3.5 + IC2.18 <-> IC3.4 + IC2.19 <-> IC3.3 diff --git a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt index cfa75ebb4..63cfef7bc 100644 --- a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt @@ -1,20 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> PLC86.5 - .1 <-> R11.1 <-> R6.1 - .2 <-> PLC86.4 - .2 <-> PLC86.6 C1.2 <-> PLC86.9 <-> R2.1 - C2.1 <-> R3.1 <-> R6.2 - C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.3 <-> R4.1 <-> R5.1 + C2.+ <-> R3.1 <-> R6.2 + C2.- <-> C5.- <-> R7.2 + C3.+ <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.- <-> PLC86.8 <-> R4.2 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 - C3.2 <-> PLC86.8 <-> R4.2 - C5.1 <-> PLC86.3 <-> R9.1 - C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 + C5.+ <-> PLC86.3 <-> R9.1 + C6.+ <-> PLC86.7 <-> R11.2 + C6.- <-> R10.1 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 <-> R9.2 + Fire.1 <-> PLC86.5 + Fire.2 <-> PLC86.6 + out.1 <-> R11.1 <-> R6.1 + out.2 <-> PLC86.4 PLC86.2 <-> R8.2 - R10.1 <-> R9.2 - R12.1 <-> R12.2 diff --git a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt index f26e988eb..809b939a3 100644 --- a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt @@ -1,70 +1,62 @@ -Switch setup: [.ON1:.ON1] +Switch setup: [ Fire.ON1:out.ON1 ] C1.2 <-> PLC86.9 <-> R2.1 - C2.1 <-> R3.1 <-> R6.2 - C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.3 <-> R4.1 <-> R5.1 + C2.+ <-> R3.1 <-> R6.2 + C2.- <-> C5.- <-> R7.2 + C3.+ <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.- <-> PLC86.8 <-> R4.2 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 - C3.2 <-> PLC86.8 <-> R4.2 - C5.1 <-> PLC86.3 <-> R9.1 - C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 + C5.+ <-> PLC86.3 <-> R9.1 + C6.+ <-> PLC86.7 <-> R11.2 + C6.- <-> R10.1 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 <-> R9.2 PLC86.2 <-> R8.2 PLC86.4 <-> R11.1 <-> R6.1 PLC86.5 <-> PLC86.6 - R10.1 <-> R9.2 - R12.1 <-> R12.2 -Switch setup: [.ON1:.ON2] +Switch setup: [ Fire.ON1:out.ON2 ] C1.2 <-> PLC86.9 <-> R2.1 - C2.1 <-> R3.1 <-> R6.2 - C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.3 <-> R4.1 <-> R5.1 + C2.+ <-> R3.1 <-> R6.2 + C2.- <-> C5.- <-> R7.2 + C3.+ <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.- <-> PLC86.8 <-> R4.2 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 - C3.2 <-> PLC86.8 <-> R4.2 - C5.1 <-> PLC86.3 <-> R9.1 - C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 - PLC86.2 <-> R8.2 - PLC86.4 <-> R11.1 <-> R6.1 - R10.1 <-> R9.2 - R12.1 <-> R12.2 - -Switch setup: [.ON2:.ON1] - - C1.2 <-> PLC86.9 <-> R2.1 - C2.1 <-> R3.1 <-> R6.2 - C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.3 <-> R4.1 <-> R5.1 - C3.1 <-> R7.1 <-> R8.1 - C3.2 <-> PLC86.1 <-> R3.2 - C3.2 <-> PLC86.8 <-> R4.2 - C5.1 <-> PLC86.3 <-> R9.1 - C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 + C5.+ <-> PLC86.3 <-> R9.1 + C6.+ <-> PLC86.7 <-> R11.2 + C6.- <-> R10.1 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 <-> R9.2 PLC86.2 <-> R8.2 PLC86.5 <-> PLC86.6 - R10.1 <-> R9.2 R11.1 <-> R6.1 - R12.1 <-> R12.2 -Switch setup: [.ON2:.ON2] +Switch setup: [ Fire.ON2:out.ON1 ] C1.2 <-> PLC86.9 <-> R2.1 - C2.1 <-> R3.1 <-> R6.2 - C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.3 <-> R4.1 <-> R5.1 + C2.+ <-> R3.1 <-> R6.2 + C2.- <-> C5.- <-> R7.2 + C3.+ <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.- <-> PLC86.8 <-> R4.2 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 - C3.2 <-> PLC86.8 <-> R4.2 - C5.1 <-> PLC86.3 <-> R9.1 - C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 + C5.+ <-> PLC86.3 <-> R9.1 + C6.+ <-> PLC86.7 <-> R11.2 + C6.- <-> R10.1 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 <-> R9.2 PLC86.2 <-> R8.2 - R10.1 <-> R9.2 - R11.1 <-> R6.1 - R12.1 <-> R12.2 + PLC86.4 <-> R11.1 <-> R6.1 + +Switch setup: [ Fire.ON2:out.ON2 ] + + C1.2 <-> PLC86.9 <-> R2.1 + C2.+ <-> R3.1 <-> R6.2 + C2.- <-> C5.- <-> R7.2 + C3.+ <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.- <-> PLC86.8 <-> R4.2 + C3.1 <-> R7.1 <-> R8.1 + C3.2 <-> PLC86.1 <-> R3.2 + C5.+ <-> PLC86.3 <-> R9.1 + C6.+ <-> PLC86.7 <-> R11.2 + C6.- <-> R10.1 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 <-> R9.2 + PLC86.2 <-> R8.2 + R11.1 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/370_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/370_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/370_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/370_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/370_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/370_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/370_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/370_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/371_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/371_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/371_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/371_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/371_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/371_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/371_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/371_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt index 628d11fd7..c19cf9cb9 100644 --- a/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 0,1 uF 400 V.1 <-> R5.1 0,1 uF 400 V.2 <-> R4.1 10 nF 100 V.2 <-> R1.1 10 nF 250 V.2 <-> R2.2 3,3 nF 100 V.1 <-> R1.2 - 3,3 nF 100 V.2 <-> C1.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2 - C1.1 <-> R5.2 <-> R8.1 - C2.1 <-> R7.1 + 3,3 nF 100 V.2 <-> C1.- <-> C2.- <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2 + C1.+ <-> R5.2 <-> R8.1 + C2.+ <-> R7.1 R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt index 628d11fd7..c19cf9cb9 100644 --- a/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 0,1 uF 400 V.1 <-> R5.1 0,1 uF 400 V.2 <-> R4.1 10 nF 100 V.2 <-> R1.1 10 nF 250 V.2 <-> R2.2 3,3 nF 100 V.1 <-> R1.2 - 3,3 nF 100 V.2 <-> C1.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2 - C1.1 <-> R5.2 <-> R8.1 - C2.1 <-> R7.1 + 3,3 nF 100 V.2 <-> C1.- <-> C2.- <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2 + C1.+ <-> R5.2 <-> R8.1 + C2.+ <-> R7.1 R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/373_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/373_excl_switches.txt index db0568e53..c30af063e 100644 --- a/diylc-regression-data/input/cloud/netlist/373_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/373_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 5W.2 <-> V1.4 5W.2 <-> V4.4 - Bass.1 <-> PEC.2 + Bass.1 <-> PEC.1 <-> PEC.2 Bass.2 <-> PEC.1 <-> PEC.1 <-> R17.1 - Bass.3 <-> PEC.1 <-> PEC.2 - C1.1 <-> R15.2 <-> R37.1 <-> R7.2 - C1.2 <-> C15.1 <-> C2.1 <-> C5.2 <-> C8.1 <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> SW1.2 + Bass.3 <-> PEC.2 + C1.+ <-> R15.2 <-> R37.1 <-> R7.2 + C1.- <-> C15.+ <-> C2.1 <-> C5.- <-> C8.+ <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> SW1.2 C10.1 <-> PEC.1 <-> PEC.2 <-> PEC.2 C10.2 <-> R15.1 <-> V2.5 C11.1 <-> R28.1 <-> R29.1 @@ -15,23 +15,23 @@ Switch setup: [Default] C13.2 <-> Grid .2 <-> R30.1 C14.1 <-> R27.1 <-> R29.2 <-> V3.5 C14.2 <-> R31.1 - C15.2 <-> R36.1 <-> R42.2 - C19.1 <-> C9.2 <-> Volume.1 + C15.- <-> R36.1 <-> R42.2 + C19.1 <-> C9.2 <-> Volume.3 C19.2 <-> C3.1 <-> C4.1 - C2.2 <-> Treble.3 + C2.2 <-> Treble.1 C3.2 <-> R7.1 <-> V2.2 C4.2 <-> R9.1 - C5.1 <-> R26.1 <-> R27.2 <-> R38.2 - C8.2 <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 + C5.+ <-> R26.1 <-> R27.2 <-> R38.2 + C8.- <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 C9.1 <-> SW2.1 - D1.2 <-> R36.2 - D2.1 <-> D4.2 - D2.2 <-> D3.2 - D3.1 <-> D5.2 - D4.1 <-> D5.1 + D1.K <-> R36.2 + D2.A <-> D4.K + D2.K <-> D3.K + D3.A <-> D5.K + D4.A <-> D5.A Grid .1 <-> V1.5 Grid.1 <-> V4.5 - PEC.1 <-> Treble.1 + PEC.1 <-> Treble.3 R1.1 <-> R2.1 <-> R5.1 <-> V1 grid.2 R10.1 <-> R9.2 <-> SW1.1 R16.1 <-> V2.6 @@ -41,7 +41,7 @@ Switch setup: [Default] R25.1 <-> R40.1 <-> V3.3 R37.2 <-> R38.1 R8.1 <-> V2.3 - R8.2 <-> Volume.3 + R8.2 <-> Volume.1 SW2.2 <-> V1 grid.2 <-> Volume.2 V1 grid.1 <-> V2.1 V1 grid.1 <-> V2.4 diff --git a/diylc-regression-data/input/cloud/netlist/373_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/373_incl_switches.txt index d0b8449bd..63d37562d 100644 --- a/diylc-regression-data/input/cloud/netlist/373_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/373_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [SW1.ON1:SW2.ON1] +Switch setup: [ SW1.ON1:SW2.ON1 ] 5W.2 <-> V1.4 5W.2 <-> V4.4 - Bass.1 <-> PEC.2 + Bass.1 <-> PEC.1 <-> PEC.2 Bass.2 <-> PEC.1 <-> PEC.1 <-> R17.1 - Bass.3 <-> PEC.1 <-> PEC.2 - C1.1 <-> R15.2 <-> R37.1 <-> R7.2 - C1.2 <-> C15.1 <-> C2.1 <-> C5.2 <-> C8.1 <-> PEC.2 <-> R10.1 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> R9.2 + Bass.3 <-> PEC.2 + C1.+ <-> R15.2 <-> R37.1 <-> R7.2 + C1.- <-> C15.+ <-> C2.1 <-> C5.- <-> C8.+ <-> PEC.2 <-> R10.1 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> R9.2 C10.1 <-> PEC.1 <-> PEC.2 <-> PEC.2 C10.2 <-> R15.1 <-> V2.5 C11.1 <-> R28.1 <-> R29.1 @@ -15,23 +15,23 @@ Switch setup: [SW1.ON1:SW2.ON1] C13.2 <-> Grid .2 <-> R30.1 C14.1 <-> R27.1 <-> R29.2 <-> V3.5 C14.2 <-> R31.1 - C15.2 <-> R36.1 <-> R42.2 - C19.1 <-> C9.2 <-> Volume.1 + C15.- <-> R36.1 <-> R42.2 + C19.1 <-> C9.2 <-> Volume.3 C19.2 <-> C3.1 <-> C4.1 - C2.2 <-> Treble.3 + C2.2 <-> Treble.1 C3.2 <-> R7.1 <-> V2.2 C4.2 <-> R9.1 - C5.1 <-> R26.1 <-> R27.2 <-> R38.2 - C8.2 <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 + C5.+ <-> R26.1 <-> R27.2 <-> R38.2 + C8.- <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 C9.1 <-> V1 grid.2 <-> Volume.2 - D1.2 <-> R36.2 - D2.1 <-> D4.2 - D2.2 <-> D3.2 - D3.1 <-> D5.2 - D4.1 <-> D5.1 + D1.K <-> R36.2 + D2.A <-> D4.K + D2.K <-> D3.K + D3.A <-> D5.K + D4.A <-> D5.A Grid .1 <-> V1.5 Grid.1 <-> V4.5 - PEC.1 <-> Treble.1 + PEC.1 <-> Treble.3 R1.1 <-> R2.1 <-> R5.1 <-> V1 grid.2 R16.1 <-> V2.6 R17.2 <-> R18.2 <-> Treble.2 @@ -40,19 +40,19 @@ Switch setup: [SW1.ON1:SW2.ON1] R25.1 <-> R40.1 <-> V3.3 R37.2 <-> R38.1 R8.1 <-> V2.3 - R8.2 <-> Volume.3 + R8.2 <-> Volume.1 V1 grid.1 <-> V2.1 V1 grid.1 <-> V2.4 -Switch setup: [SW1.ON1:SW2.ON2] +Switch setup: [ SW1.ON1:SW2.ON2 ] 5W.2 <-> V1.4 5W.2 <-> V4.4 - Bass.1 <-> PEC.2 + Bass.1 <-> PEC.1 <-> PEC.2 Bass.2 <-> PEC.1 <-> PEC.1 <-> R17.1 - Bass.3 <-> PEC.1 <-> PEC.2 - C1.1 <-> R15.2 <-> R37.1 <-> R7.2 - C1.2 <-> C15.1 <-> C2.1 <-> C5.2 <-> C8.1 <-> PEC.2 <-> R10.1 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> R9.2 + Bass.3 <-> PEC.2 + C1.+ <-> R15.2 <-> R37.1 <-> R7.2 + C1.- <-> C15.+ <-> C2.1 <-> C5.- <-> C8.+ <-> PEC.2 <-> R10.1 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 <-> R9.2 C10.1 <-> PEC.1 <-> PEC.2 <-> PEC.2 C10.2 <-> R15.1 <-> V2.5 C11.1 <-> R28.1 <-> R29.1 @@ -61,22 +61,22 @@ Switch setup: [SW1.ON1:SW2.ON2] C13.2 <-> Grid .2 <-> R30.1 C14.1 <-> R27.1 <-> R29.2 <-> V3.5 C14.2 <-> R31.1 - C15.2 <-> R36.1 <-> R42.2 - C19.1 <-> C9.2 <-> Volume.1 + C15.- <-> R36.1 <-> R42.2 + C19.1 <-> C9.2 <-> Volume.3 C19.2 <-> C3.1 <-> C4.1 - C2.2 <-> Treble.3 + C2.2 <-> Treble.1 C3.2 <-> R7.1 <-> V2.2 C4.2 <-> R9.1 - C5.1 <-> R26.1 <-> R27.2 <-> R38.2 - C8.2 <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 - D1.2 <-> R36.2 - D2.1 <-> D4.2 - D2.2 <-> D3.2 - D3.1 <-> D5.2 - D4.1 <-> D5.1 + C5.+ <-> R26.1 <-> R27.2 <-> R38.2 + C8.- <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 + D1.K <-> R36.2 + D2.A <-> D4.K + D2.K <-> D3.K + D3.A <-> D5.K + D4.A <-> D5.A Grid .1 <-> V1.5 Grid.1 <-> V4.5 - PEC.1 <-> Treble.1 + PEC.1 <-> Treble.3 R1.1 <-> R2.1 <-> R5.1 <-> V1 grid.2 R16.1 <-> V2.6 R17.2 <-> R18.2 <-> Treble.2 @@ -85,20 +85,20 @@ Switch setup: [SW1.ON1:SW2.ON2] R25.1 <-> R40.1 <-> V3.3 R37.2 <-> R38.1 R8.1 <-> V2.3 - R8.2 <-> Volume.3 + R8.2 <-> Volume.1 V1 grid.1 <-> V2.1 V1 grid.1 <-> V2.4 V1 grid.2 <-> Volume.2 -Switch setup: [SW1.ON2:SW2.ON1] +Switch setup: [ SW1.ON2:SW2.ON1 ] 5W.2 <-> V1.4 5W.2 <-> V4.4 - Bass.1 <-> PEC.2 + Bass.1 <-> PEC.1 <-> PEC.2 Bass.2 <-> PEC.1 <-> PEC.1 <-> R17.1 - Bass.3 <-> PEC.1 <-> PEC.2 - C1.1 <-> R15.2 <-> R37.1 <-> R7.2 - C1.2 <-> C15.1 <-> C2.1 <-> C5.2 <-> C8.1 <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 + Bass.3 <-> PEC.2 + C1.+ <-> R15.2 <-> R37.1 <-> R7.2 + C1.- <-> C15.+ <-> C2.1 <-> C5.- <-> C8.+ <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 C10.1 <-> PEC.1 <-> PEC.2 <-> PEC.2 C10.2 <-> R15.1 <-> V2.5 C11.1 <-> R28.1 <-> R29.1 @@ -107,23 +107,23 @@ Switch setup: [SW1.ON2:SW2.ON1] C13.2 <-> Grid .2 <-> R30.1 C14.1 <-> R27.1 <-> R29.2 <-> V3.5 C14.2 <-> R31.1 - C15.2 <-> R36.1 <-> R42.2 - C19.1 <-> C9.2 <-> Volume.1 + C15.- <-> R36.1 <-> R42.2 + C19.1 <-> C9.2 <-> Volume.3 C19.2 <-> C3.1 <-> C4.1 - C2.2 <-> Treble.3 + C2.2 <-> Treble.1 C3.2 <-> R7.1 <-> V2.2 C4.2 <-> R9.1 - C5.1 <-> R26.1 <-> R27.2 <-> R38.2 - C8.2 <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 + C5.+ <-> R26.1 <-> R27.2 <-> R38.2 + C8.- <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 C9.1 <-> V1 grid.2 <-> Volume.2 - D1.2 <-> R36.2 - D2.1 <-> D4.2 - D2.2 <-> D3.2 - D3.1 <-> D5.2 - D4.1 <-> D5.1 + D1.K <-> R36.2 + D2.A <-> D4.K + D2.K <-> D3.K + D3.A <-> D5.K + D4.A <-> D5.A Grid .1 <-> V1.5 Grid.1 <-> V4.5 - PEC.1 <-> Treble.1 + PEC.1 <-> Treble.3 R1.1 <-> R2.1 <-> R5.1 <-> V1 grid.2 R10.1 <-> R9.2 R16.1 <-> V2.6 @@ -133,19 +133,19 @@ Switch setup: [SW1.ON2:SW2.ON1] R25.1 <-> R40.1 <-> V3.3 R37.2 <-> R38.1 R8.1 <-> V2.3 - R8.2 <-> Volume.3 + R8.2 <-> Volume.1 V1 grid.1 <-> V2.1 V1 grid.1 <-> V2.4 -Switch setup: [SW1.ON2:SW2.ON2] +Switch setup: [ SW1.ON2:SW2.ON2 ] 5W.2 <-> V1.4 5W.2 <-> V4.4 - Bass.1 <-> PEC.2 + Bass.1 <-> PEC.1 <-> PEC.2 Bass.2 <-> PEC.1 <-> PEC.1 <-> R17.1 - Bass.3 <-> PEC.1 <-> PEC.2 - C1.1 <-> R15.2 <-> R37.1 <-> R7.2 - C1.2 <-> C15.1 <-> C2.1 <-> C5.2 <-> C8.1 <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 + Bass.3 <-> PEC.2 + C1.+ <-> R15.2 <-> R37.1 <-> R7.2 + C1.- <-> C15.+ <-> C2.1 <-> C5.- <-> C8.+ <-> PEC.2 <-> R10.2 <-> R16.2 <-> R23.2 <-> R24.2 <-> R34.1 <-> R5.2 C10.1 <-> PEC.1 <-> PEC.2 <-> PEC.2 C10.2 <-> R15.1 <-> V2.5 C11.1 <-> R28.1 <-> R29.1 @@ -154,22 +154,22 @@ Switch setup: [SW1.ON2:SW2.ON2] C13.2 <-> Grid .2 <-> R30.1 C14.1 <-> R27.1 <-> R29.2 <-> V3.5 C14.2 <-> R31.1 - C15.2 <-> R36.1 <-> R42.2 - C19.1 <-> C9.2 <-> Volume.1 + C15.- <-> R36.1 <-> R42.2 + C19.1 <-> C9.2 <-> Volume.3 C19.2 <-> C3.1 <-> C4.1 - C2.2 <-> Treble.3 + C2.2 <-> Treble.1 C3.2 <-> R7.1 <-> V2.2 C4.2 <-> R9.1 - C5.1 <-> R26.1 <-> R27.2 <-> R38.2 - C8.2 <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 - D1.2 <-> R36.2 - D2.1 <-> D4.2 - D2.2 <-> D3.2 - D3.1 <-> D5.2 - D4.1 <-> D5.1 + C5.+ <-> R26.1 <-> R27.2 <-> R38.2 + C8.- <-> R30.2 <-> R31.2 <-> R34.2 <-> R42.1 + D1.K <-> R36.2 + D2.A <-> D4.K + D2.K <-> D3.K + D3.A <-> D5.K + D4.A <-> D5.A Grid .1 <-> V1.5 Grid.1 <-> V4.5 - PEC.1 <-> Treble.1 + PEC.1 <-> Treble.3 R1.1 <-> R2.1 <-> R5.1 <-> V1 grid.2 R10.1 <-> R9.2 R16.1 <-> V2.6 @@ -179,7 +179,7 @@ Switch setup: [SW1.ON2:SW2.ON2] R25.1 <-> R40.1 <-> V3.3 R37.2 <-> R38.1 R8.1 <-> V2.3 - R8.2 <-> Volume.3 + R8.2 <-> Volume.1 V1 grid.1 <-> V2.1 V1 grid.1 <-> V2.4 V1 grid.2 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/374_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/374_excl_switches.txt index 0dfabffa2..3f4e97395 100644 --- a/diylc-regression-data/input/cloud/netlist/374_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/374_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> LED.1 <-> Q1.1 <-> RY1.1 - C1.2 <-> Q1.2 - D1.1 <-> R1.2 <-> RY1.5 - LED.2 <-> R1.1 + C1.+ <-> D1.K <-> LED.A <-> Q1.E <-> RY1.1 + C1.- <-> Q1.B + D1.A <-> R1.2 <-> RY1.5 + LED.K <-> R1.1 RY1.2 <-> RY1.6 diff --git a/diylc-regression-data/input/cloud/netlist/374_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/374_incl_switches.txt index 0dfabffa2..3f4e97395 100644 --- a/diylc-regression-data/input/cloud/netlist/374_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/374_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> LED.1 <-> Q1.1 <-> RY1.1 - C1.2 <-> Q1.2 - D1.1 <-> R1.2 <-> RY1.5 - LED.2 <-> R1.1 + C1.+ <-> D1.K <-> LED.A <-> Q1.E <-> RY1.1 + C1.- <-> Q1.B + D1.A <-> R1.2 <-> RY1.5 + LED.K <-> R1.1 RY1.2 <-> RY1.6 diff --git a/diylc-regression-data/input/cloud/netlist/375_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/375_excl_switches.txt index e14814d8d..ceb97607f 100644 --- a/diylc-regression-data/input/cloud/netlist/375_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/375_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 <-> IC1.3 <-> PH1.1 C1.2 <-> IC1.5 C2.1 <-> IC1.8 <-> PH1.5 - D1.1 <-> D1.2 <-> IC1.6 <-> IC2.10 - D2.1 <-> D2.2 <-> IC1.7 <-> IC2.11 + D1.A <-> D1.K <-> IC1.6 <-> IC2.10 + D2.A <-> D2.K <-> IC1.7 <-> IC2.11 IC1.1 <-> PH1.3 IC1.2 <-> PH1.4 diff --git a/diylc-regression-data/input/cloud/netlist/375_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/375_incl_switches.txt index e14814d8d..ceb97607f 100644 --- a/diylc-regression-data/input/cloud/netlist/375_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/375_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.2 <-> IC1.3 <-> PH1.1 C1.2 <-> IC1.5 C2.1 <-> IC1.8 <-> PH1.5 - D1.1 <-> D1.2 <-> IC1.6 <-> IC2.10 - D2.1 <-> D2.2 <-> IC1.7 <-> IC2.11 + D1.A <-> D1.K <-> IC1.6 <-> IC2.10 + D2.A <-> D2.K <-> IC1.7 <-> IC2.11 IC1.1 <-> PH1.3 IC1.2 <-> PH1.4 diff --git a/diylc-regression-data/input/cloud/netlist/376_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/376_excl_switches.txt index 4b8181d0a..4a06ff9b1 100644 --- a/diylc-regression-data/input/cloud/netlist/376_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/376_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> C11.2 <-> C2.2 <-> C3.2 <-> C8.2 <-> C9.1 <-> D1.1 <-> IC1.4 <-> IC2.4 <-> R14.2 <-> R15.2 <-> R17.2 <-> R18.2 <-> R2.2 <-> R8.2 - C10.1 <-> C12.1 <-> IC2.6 <-> R10.1 - C11.1 <-> R11.2 + C1.2 <-> C11.- <-> C2.2 <-> C3.- <-> C8.- <-> C9.1 <-> D1.A <-> IC1.4 <-> IC2.4 <-> R14.2 <-> R15.2 <-> R17.2 <-> R18.2 <-> R2.2 <-> R8.2 + C10.+ <-> C12.1 <-> IC2.6 <-> R10.1 + C11.+ <-> R11.2 C12.2 <-> R12.2 <-> R9.2 C13.1 <-> R16.1 C13.2 <-> R14.1 C2.1 <-> IC1.3 <-> R2.1 <-> R4.2 - C3.1 <-> D1.2 <-> IC1.6 <-> IC2.5 <-> R3.1 <-> R4.1 <-> R7.1 - C4.1 <-> C5.1 <-> C6.2 <-> D4.2 <-> D7.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R1.2 + C3.+ <-> D1.K <-> IC1.6 <-> IC2.5 <-> R3.1 <-> R4.1 <-> R7.1 + C4.+ <-> C5.1 <-> C6.2 <-> D4.K <-> D7.A <-> IC1.7 <-> R5.2 + C4.- <-> R1.2 C6.1 <-> R17.1 - C7.1 <-> R6.2 - C8.1 <-> IC2.3 <-> R15.1 <-> R7.2 + C7.+ <-> R6.2 + C8.+ <-> IC2.3 <-> R15.1 <-> R7.2 C9.2 <-> IC2.8 <-> R12.1 - D2.1 <-> D5.2 <-> IC1.2 <-> R5.1 <-> R6.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - D5.1 <-> D6.2 - D6.1 <-> D7.2 + D2.A <-> D5.K <-> IC1.2 <-> R5.1 <-> R6.1 + D2.K <-> D3.A + D3.K <-> D4.A + D5.A <-> D6.K + D6.A <-> D7.K IC2.1 <-> R13.2 <-> R9.1 IC2.2 <-> R13.1 <-> R16.2 IC2.7 <-> R10.2 <-> R11.1 diff --git a/diylc-regression-data/input/cloud/netlist/376_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/376_incl_switches.txt index 4b8181d0a..4a06ff9b1 100644 --- a/diylc-regression-data/input/cloud/netlist/376_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/376_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> C11.2 <-> C2.2 <-> C3.2 <-> C8.2 <-> C9.1 <-> D1.1 <-> IC1.4 <-> IC2.4 <-> R14.2 <-> R15.2 <-> R17.2 <-> R18.2 <-> R2.2 <-> R8.2 - C10.1 <-> C12.1 <-> IC2.6 <-> R10.1 - C11.1 <-> R11.2 + C1.2 <-> C11.- <-> C2.2 <-> C3.- <-> C8.- <-> C9.1 <-> D1.A <-> IC1.4 <-> IC2.4 <-> R14.2 <-> R15.2 <-> R17.2 <-> R18.2 <-> R2.2 <-> R8.2 + C10.+ <-> C12.1 <-> IC2.6 <-> R10.1 + C11.+ <-> R11.2 C12.2 <-> R12.2 <-> R9.2 C13.1 <-> R16.1 C13.2 <-> R14.1 C2.1 <-> IC1.3 <-> R2.1 <-> R4.2 - C3.1 <-> D1.2 <-> IC1.6 <-> IC2.5 <-> R3.1 <-> R4.1 <-> R7.1 - C4.1 <-> C5.1 <-> C6.2 <-> D4.2 <-> D7.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R1.2 + C3.+ <-> D1.K <-> IC1.6 <-> IC2.5 <-> R3.1 <-> R4.1 <-> R7.1 + C4.+ <-> C5.1 <-> C6.2 <-> D4.K <-> D7.A <-> IC1.7 <-> R5.2 + C4.- <-> R1.2 C6.1 <-> R17.1 - C7.1 <-> R6.2 - C8.1 <-> IC2.3 <-> R15.1 <-> R7.2 + C7.+ <-> R6.2 + C8.+ <-> IC2.3 <-> R15.1 <-> R7.2 C9.2 <-> IC2.8 <-> R12.1 - D2.1 <-> D5.2 <-> IC1.2 <-> R5.1 <-> R6.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - D5.1 <-> D6.2 - D6.1 <-> D7.2 + D2.A <-> D5.K <-> IC1.2 <-> R5.1 <-> R6.1 + D2.K <-> D3.A + D3.K <-> D4.A + D5.A <-> D6.K + D6.A <-> D7.K IC2.1 <-> R13.2 <-> R9.1 IC2.2 <-> R13.1 <-> R16.2 IC2.7 <-> R10.2 <-> R11.1 diff --git a/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt index 34209492d..d993708fe 100644 --- a/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> IC1.3 <-> IC1.7 <-> J9.Ring <-> R2.2 - D1.2 <-> IC1.2 <-> IC1.6 <-> R1.2 - IC1.1 <-> IC1.5 <-> J9.Tip <-> R1.1 <-> R2.1 - IC1.4 <-> IC1.8 + D1.A <-> IC1.3 <-> J9.Ring + D1.K <-> IC1.2 <-> R1.2 + IC1.5 <-> R2.1 + IC1.7 <-> R2.2 + J9.Tip <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt index 34209492d..d993708fe 100644 --- a/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> IC1.3 <-> IC1.7 <-> J9.Ring <-> R2.2 - D1.2 <-> IC1.2 <-> IC1.6 <-> R1.2 - IC1.1 <-> IC1.5 <-> J9.Tip <-> R1.1 <-> R2.1 - IC1.4 <-> IC1.8 + D1.A <-> IC1.3 <-> J9.Ring + D1.K <-> IC1.2 <-> R1.2 + IC1.5 <-> R2.1 + IC1.7 <-> R2.2 + J9.Tip <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt index 735939a39..d09731578 100644 --- a/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.Q1.0 <-> R1.2 <-> R2.1 C1.2 <-> Q1.2 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt index 735939a39..d09731578 100644 --- a/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.Q1.0 <-> R1.2 <-> R2.1 C1.2 <-> Q1.2 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt index df9959b47..9713ba02e 100644 --- a/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 1N4148.2 <-> 6N139.2 <-> 6N139.6 - 1N4148.1 <-> 6N139.3 <-> 6N139.7 <-> R1.1 - 6N139.1 <-> 6N139.5 <-> R1.2 - 6N139.4 <-> 6N139.8 + .1 <-> 1N4148.K <-> 6N139.2 + 1N4148.A <-> 6N139.3 + 6N139.5 <-> R1.2 + 6N139.7 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt index df9959b47..9713ba02e 100644 --- a/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> 1N4148.2 <-> 6N139.2 <-> 6N139.6 - 1N4148.1 <-> 6N139.3 <-> 6N139.7 <-> R1.1 - 6N139.1 <-> 6N139.5 <-> R1.2 - 6N139.4 <-> 6N139.8 + .1 <-> 1N4148.K <-> 6N139.2 + 1N4148.A <-> 6N139.3 + 6N139.5 <-> R1.2 + 6N139.7 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt index bcff7a7cb..c5de102f6 100644 --- a/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR3.3 + C1.+ <-> VR1.1 <-> VR2.1 + J1.Sleeve <-> PKP2.North Finish <-> VR3.1 J1.Tip <-> VR3.2 PKP1.North Start <-> SW1.4 PKP2.North Start <-> SW2.4 diff --git a/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt index 08a1e2e5f..7490e7ef1 100644 --- a/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt @@ -1,28 +1,28 @@ -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1, SW1.ON1:SW2.ON2:SW3.ON1] +Switch setup: [ SW1.ON1:SW3.ON1 ] - C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR3.3 + C1.+ <-> VR1.1 <-> VR2.1 + J1.Sleeve <-> PKP2.North Finish <-> VR3.1 J1.Tip <-> VR3.2 PKP1.North Start <-> VR2.2 PKP3.North Start <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2, SW1.ON1:SW2.ON2:SW3.ON2] +Switch setup: [ SW1.ON1:SW3.ON2 ] - C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR3.3 + C1.+ <-> VR1.1 <-> VR2.1 + J1.Sleeve <-> PKP2.North Finish <-> VR3.1 J1.Tip <-> VR3.2 PKP1.North Start <-> VR2.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1, SW1.ON2:SW2.ON2:SW3.ON1] +Switch setup: [ SW1.ON2:SW3.ON1 ] - C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR3.3 + C1.+ <-> VR1.1 <-> VR2.1 + J1.Sleeve <-> PKP2.North Finish <-> VR3.1 J1.Tip <-> VR3.2 PKP3.North Start <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2, SW1.ON2:SW2.ON2:SW3.ON2] +Switch setup: [ SW1.ON2:SW3.ON2 ] - C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR3.3 + C1.+ <-> VR1.1 <-> VR2.1 + J1.Sleeve <-> PKP2.North Finish <-> VR3.1 J1.Tip <-> VR3.2 diff --git a/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt index 516ac39c0..d88d3e9b5 100644 --- a/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt @@ -1,4 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3 + 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3 + C3.2 <-> R11.1 <-> R12.1 + R12.2 <-> R13.1 diff --git a/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt index 516ac39c0..d88d3e9b5 100644 --- a/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt @@ -1,4 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3 + 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3 + C3.2 <-> R11.1 <-> R12.1 + R12.2 <-> R13.1 diff --git a/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt index 516ac39c0..c689d926a 100644 --- a/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt @@ -1,4 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3 + 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3 + C3.2 <-> R11.1 <-> R12.1 + R12.2 <-> R13.1 diff --git a/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt index 516ac39c0..c689d926a 100644 --- a/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt @@ -1,4 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3 + 40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3 + C3.2 <-> R11.1 <-> R12.1 + R12.2 <-> R13.1 diff --git a/diylc-regression-data/input/cloud/netlist/383_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/383_excl_switches.txt index 5e0522bcf..32c66406f 100644 --- a/diylc-regression-data/input/cloud/netlist/383_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/383_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .1 <-> .1 <-> .1 <-> .1 <-> .1 - .1 <-> .5 <-> J1.3 <-> J1.4 - .1 <-> J2.1 <-> J2.2 + .1 <-> R2.1 .2 <-> .2 .2 <-> .2 .2 <-> .2 - .2 <-> J1.1 <-> J1.2 .2 <-> J2.3 <-> J2.4 - .3 <-> J3.3 <-> J3.4 - .3 <-> R2.1 - .6 <-> J3.1 <-> J3.2 + .3 <-> J1.3 <-> J1.4 <-> SW2.5 + J1.1 <-> J1.2 <-> SW2.2 + J2.1 <-> J2.2 <-> SW1.1 + J3.1 <-> J3.2 <-> SW2.6 + J3.3 <-> J3.4 <-> SW2.3 diff --git a/diylc-regression-data/input/cloud/netlist/383_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/383_incl_switches.txt index 21f1598e6..042a81bce 100644 --- a/diylc-regression-data/input/cloud/netlist/383_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/383_incl_switches.txt @@ -1,26 +1,26 @@ -Switch setup: [.ON1:.ON1, .ON2:.ON1] +Switch setup: [ SW2.ON1 ] .1 <-> .1 <-> .1 <-> .1 <-> .1 - .1 <-> J1.3 <-> J1.4 + .1 <-> R2.1 .2 <-> .2 .2 <-> .2 .2 <-> .2 .2 <-> J2.3 <-> J2.4 - .3 <-> R2.1 + .3 <-> J1.3 <-> J1.4 J1.1 <-> J1.2 J2.1 <-> J2.2 J3.1 <-> J3.2 J3.3 <-> J3.4 -Switch setup: [.ON1:.ON2, .ON2:.ON2] +Switch setup: [ SW2.ON2 ] .1 <-> .1 <-> .1 <-> .1 <-> .1 - .1 <-> J1.3 <-> J1.4 <-> J3.1 <-> J3.2 + .1 <-> R2.1 .2 <-> .2 .2 <-> .2 .2 <-> .2 .2 <-> J2.3 <-> J2.4 - .3 <-> R2.1 + .3 <-> J1.3 <-> J1.4 <-> J3.1 <-> J3.2 J1.1 <-> J1.2 <-> J3.3 <-> J3.4 J2.1 <-> J2.2 diff --git a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt index 6db172e62..63fba55ed 100644 --- a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1 - C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 - C12.1 <-> R2.2 <-> V1.3 + C10.1 <-> C9.2 <-> PR6 (GAIN).1 <-> R10.2 <-> R9.1 + C10.2 <-> C11.1 <-> C11.2 <-> C12.- <-> C18.- <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 + C12.+ <-> R2.2 <-> V1.3 C15.1 <-> R14.2 <-> V1.1 C15.2 <-> R15.2 C17.1 <-> R18.2 <-> R19.1 C17.2 <-> R12.2 <-> V1.6 - C18.1 <-> R21.2 <-> V2.3 - C19.2 <-> PR9 (HIGH).3 - C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R24.2 + C18.+ <-> R21.2 <-> V2.3 + C19.2 <-> PR9 (HIGH).1 + C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).2 <-> PR9 (HIGH).3 <-> R24.2 C22.1 <-> R24.1 C9.1 <-> INPUT.2 <-> R9.2 R12.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt index 6db172e62..63fba55ed 100644 --- a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1 - C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 - C12.1 <-> R2.2 <-> V1.3 + C10.1 <-> C9.2 <-> PR6 (GAIN).1 <-> R10.2 <-> R9.1 + C10.2 <-> C11.1 <-> C11.2 <-> C12.- <-> C18.- <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 + C12.+ <-> R2.2 <-> V1.3 C15.1 <-> R14.2 <-> V1.1 C15.2 <-> R15.2 C17.1 <-> R18.2 <-> R19.1 C17.2 <-> R12.2 <-> V1.6 - C18.1 <-> R21.2 <-> V2.3 - C19.2 <-> PR9 (HIGH).3 - C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R24.2 + C18.+ <-> R21.2 <-> V2.3 + C19.2 <-> PR9 (HIGH).1 + C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).2 <-> PR9 (HIGH).3 <-> R24.2 C22.1 <-> R24.1 C9.1 <-> INPUT.2 <-> R9.2 R12.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt index bf615bab1..3f509aee6 100644 --- a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> PR6 (GAIN).2 - C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 + C10.2 <-> C9.1 <-> PR6 (GAIN).1 <-> R10.2 <-> R9.2 C9.2 <-> INPUT.1 <-> R9.1 - GND <-> PR6 (GAIN).1 <-> R10.1 + GND <-> PR6 (GAIN).3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt index bf615bab1..3f509aee6 100644 --- a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> PR6 (GAIN).2 - C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 + C10.2 <-> C9.1 <-> PR6 (GAIN).1 <-> R10.2 <-> R9.2 C9.2 <-> INPUT.1 <-> R9.1 - GND <-> PR6 (GAIN).1 <-> R10.1 + GND <-> PR6 (GAIN).3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt index 8a851d7d3..ee3a0a3af 100644 --- a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.+ <-> C12.- <-> C13.2 <-> C17.1 <-> C18.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).3 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 - C14.1 <-> PR9 (HIGH).3 + C14.1 <-> PR9 (HIGH).1 C14.2 <-> R19.2 - C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 + C15.1 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR9 (HIGH).3 C15.2 <-> C16.2 <-> R19.1 C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C18.1 <-> SW1.3 C3.1 <-> R2.1 <-> V1.1 - PR7 (BASS).1 <-> PR8 (MID).3 + PR7 (BASS).3 <-> PR8 (MID).1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt index 970e5e631..05ed0afd6 100644 --- a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [SW1.ON1, SW1.OFF] +Switch setup: [ SW1.OFF,SW1.ON1 ] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.+ <-> C12.- <-> C13.2 <-> C17.1 <-> C18.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).3 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 - C14.1 <-> PR9 (HIGH).3 + C14.1 <-> PR9 (HIGH).1 C14.2 <-> R19.2 - C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 + C15.1 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR9 (HIGH).3 C15.2 <-> C16.2 <-> R19.1 C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C3.1 <-> R2.1 <-> V1.1 - PR7 (BASS).1 <-> PR8 (MID).3 + PR7 (BASS).3 <-> PR8 (MID).1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 @@ -22,21 +22,21 @@ Switch setup: [SW1.ON1, SW1.OFF] R3.1 <-> V1.3 R9.1 <-> V2.8 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.+ <-> C12.- <-> C13.2 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.+ <-> C2.- <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR8 (MID).3 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 - C14.1 <-> PR9 (HIGH).3 + C14.1 <-> PR9 (HIGH).1 C14.2 <-> R19.2 - C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 + C15.1 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR9 (HIGH).3 C15.2 <-> C16.2 <-> R19.1 C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C3.1 <-> R2.1 <-> V1.1 - PR7 (BASS).1 <-> PR8 (MID).3 + PR7 (BASS).3 <-> PR8 (MID).1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt index 5599112c8..0d1d62c64 100644 --- a/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> J1.1 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 GND <-> J1.2 diff --git a/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt index 5599112c8..0d1d62c64 100644 --- a/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> J1.1 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 GND <-> J1.2 diff --git a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt index 6f315f8b3..82e404cad 100644 --- a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt @@ -1,24 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 + C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.- <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR10 VOL.2 <-> PR10 VOL.3 <-> PR4 GAIN.2 <-> PR4 GAIN.3 <-> PR5 VOL.2 <-> PR5 VOL.3 <-> PR6 GAIN.1 <-> PR6 GAIN.2 <-> PR6 GAIN.3 <-> PR7 MID.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R24.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 <-> V4.8 C15.2 <-> J4.2 <-> R17.1 C17.1 <-> R19.1 - C2.1 <-> R4.2 <-> R8.1 - C20.1 <-> PR8 BASS.2 <-> PR8 BASS.3 + C2.+ <-> R4.2 <-> R8.1 + C20.1 <-> PR8 BASS.1 <-> PR8 BASS.2 <-> PR9 TREBLE.3 C20.2 <-> C21.2 <-> R23.1 - C22.1 <-> PR10 VOL.3 - C3.2 <-> PR1 TREBLE.3 + C21.1 <-> PR7 MID.2 + C22.1 <-> PR10 VOL.1 <-> PR9 TREBLE.2 + C3.2 <-> PR1 TREBLE.1 C4.1 <-> C5.1 <-> R5.1 + C4.1 <-> PR9 TREBLE.1 + C4.2 <-> PR1 TREBLE.3 <-> PR2 BASS.1 <-> PR2 BASS.2 C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8 - C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3 + C5.2 <-> PR2 BASS.3 <-> PR3 MID.1 <-> PR3 MID.2 C6.2 <-> R6.2 <-> V4.3 - C8.1 <-> PR5 VOL.3 + C8.1 <-> PR5 VOL.1 C8.2 <-> R7.1 <-> V4.1 - PR10 VOL.1 <-> R24.1 - PR2 BASS.2 <-> PR2 BASS.3 - PR7 MID.3 <-> PR8 BASS.1 + PR1 TREBLE.2 <-> PR4 GAIN.1 + PR7 MID.1 <-> PR8 BASS.3 R14.1 <-> R15.1 <-> R16.2 R14.2 <-> V4.7 R18.1 <-> R19.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt index 6f315f8b3..82e404cad 100644 --- a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt @@ -1,24 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 + C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.- <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR10 VOL.2 <-> PR10 VOL.3 <-> PR4 GAIN.2 <-> PR4 GAIN.3 <-> PR5 VOL.2 <-> PR5 VOL.3 <-> PR6 GAIN.1 <-> PR6 GAIN.2 <-> PR6 GAIN.3 <-> PR7 MID.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R24.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 <-> V4.8 C15.2 <-> J4.2 <-> R17.1 C17.1 <-> R19.1 - C2.1 <-> R4.2 <-> R8.1 - C20.1 <-> PR8 BASS.2 <-> PR8 BASS.3 + C2.+ <-> R4.2 <-> R8.1 + C20.1 <-> PR8 BASS.1 <-> PR8 BASS.2 <-> PR9 TREBLE.3 C20.2 <-> C21.2 <-> R23.1 - C22.1 <-> PR10 VOL.3 - C3.2 <-> PR1 TREBLE.3 + C21.1 <-> PR7 MID.2 + C22.1 <-> PR10 VOL.1 <-> PR9 TREBLE.2 + C3.2 <-> PR1 TREBLE.1 C4.1 <-> C5.1 <-> R5.1 + C4.1 <-> PR9 TREBLE.1 + C4.2 <-> PR1 TREBLE.3 <-> PR2 BASS.1 <-> PR2 BASS.2 C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8 - C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3 + C5.2 <-> PR2 BASS.3 <-> PR3 MID.1 <-> PR3 MID.2 C6.2 <-> R6.2 <-> V4.3 - C8.1 <-> PR5 VOL.3 + C8.1 <-> PR5 VOL.1 C8.2 <-> R7.1 <-> V4.1 - PR10 VOL.1 <-> R24.1 - PR2 BASS.2 <-> PR2 BASS.3 - PR7 MID.3 <-> PR8 BASS.1 + PR1 TREBLE.2 <-> PR4 GAIN.1 + PR7 MID.1 <-> PR8 BASS.3 R14.1 <-> R15.1 <-> R16.2 R14.2 <-> V4.7 R18.1 <-> R19.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt index 60039dbff..afa4bb4d6 100644 --- a/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt @@ -1,5 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> C3.2 <-> D2.1 <-> IC1.2 <-> IC1.6 <-> P1.2 <-> R1.1 <-> R2.1 - C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.2 <-> IC1.1 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 + C1.+ <-> IC1.2 <-> R2.1 + C1.- <-> C2.2 <-> IC1.1 <-> R3.2 + C2.1 <-> IC1.5 + C3.1 <-> R1.1 + C3.2 <-> D2.A + D1.A <-> IC1.3 + D1.K <-> R3.1 + D2.K <-> IC1.4 <-> IC1.8 + IC1.6 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 + IC1.7 <-> P1.2 diff --git a/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt index 60039dbff..afa4bb4d6 100644 --- a/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt @@ -1,5 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> C3.2 <-> D2.1 <-> IC1.2 <-> IC1.6 <-> P1.2 <-> R1.1 <-> R2.1 - C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.2 <-> IC1.1 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 + C1.+ <-> IC1.2 <-> R2.1 + C1.- <-> C2.2 <-> IC1.1 <-> R3.2 + C2.1 <-> IC1.5 + C3.1 <-> R1.1 + C3.2 <-> D2.A + D1.A <-> IC1.3 + D1.K <-> R3.1 + D2.K <-> IC1.4 <-> IC1.8 + IC1.6 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 + IC1.7 <-> P1.2 diff --git a/diylc-regression-data/input/cloud/netlist/390_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/390_excl_switches.txt index c5a458918..daf4d721b 100644 --- a/diylc-regression-data/input/cloud/netlist/390_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/390_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> C11.1 <-> C12.1 <-> C4.1 <-> R16.1 <-> R17.2 <-> R18.1 <-> R19.2 - C1.2 <-> R4.1 - C10.2 <-> R20.1 <-> R21.2 <-> R9.1 - C11.2 <-> C12.2 <-> R18.2 <-> R19.1 + C1.+ <-> C10.+ <-> C11.+ <-> C12.+ <-> C4.+ <-> R16.1 <-> R17.2 <-> R18.1 <-> R19.2 + C1.- <-> R4.1 + C10.- <-> R20.1 <-> R21.2 <-> R9.1 + C11.- <-> C12.- <-> R18.2 <-> R19.1 C13.2 <-> R21.1 <-> R25.2 C14.2 <-> C15.2 <-> R25.1 - C16.1 <-> VR2.3 - C16.2 <-> D1.1 <-> R23.1 <-> R24.1 - C2.1 <-> C3.1 <-> R2.2 <-> R3.2 - C2.2 <-> R3.1 - C3.2 <-> R2.1 - C4.2 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.2 + C16.+ <-> VR2.3 + C16.- <-> D1.A <-> R23.1 <-> R24.1 + C2.+ <-> C3.+ <-> R2.2 <-> R3.2 + C2.- <-> R3.1 + C3.- <-> R2.1 + C4.- <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.2 C5.1 <-> R5.1 C5.2 <-> R7.1 C6.1 <-> R6.1 @@ -22,9 +22,9 @@ Switch setup: [Default] C8.2 <-> R15.1 C9.1 <-> R11.2 C9.2 <-> R20.2 - D1.2 <-> R22.2 + D1.K <-> R22.2 R12.2 <-> R13.2 <-> R14.2 <-> R15.2 - R23.2 <-> R24.2 <-> VR1.1 + R23.2 <-> R24.2 <-> VR1.1 <-> VR1.3 R26.1 <-> VR2.1 R26.2 <-> VR1.2 R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/390_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/390_incl_switches.txt index c5a458918..daf4d721b 100644 --- a/diylc-regression-data/input/cloud/netlist/390_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/390_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> C11.1 <-> C12.1 <-> C4.1 <-> R16.1 <-> R17.2 <-> R18.1 <-> R19.2 - C1.2 <-> R4.1 - C10.2 <-> R20.1 <-> R21.2 <-> R9.1 - C11.2 <-> C12.2 <-> R18.2 <-> R19.1 + C1.+ <-> C10.+ <-> C11.+ <-> C12.+ <-> C4.+ <-> R16.1 <-> R17.2 <-> R18.1 <-> R19.2 + C1.- <-> R4.1 + C10.- <-> R20.1 <-> R21.2 <-> R9.1 + C11.- <-> C12.- <-> R18.2 <-> R19.1 C13.2 <-> R21.1 <-> R25.2 C14.2 <-> C15.2 <-> R25.1 - C16.1 <-> VR2.3 - C16.2 <-> D1.1 <-> R23.1 <-> R24.1 - C2.1 <-> C3.1 <-> R2.2 <-> R3.2 - C2.2 <-> R3.1 - C3.2 <-> R2.1 - C4.2 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.2 + C16.+ <-> VR2.3 + C16.- <-> D1.A <-> R23.1 <-> R24.1 + C2.+ <-> C3.+ <-> R2.2 <-> R3.2 + C2.- <-> R3.1 + C3.- <-> R2.1 + C4.- <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.2 C5.1 <-> R5.1 C5.2 <-> R7.1 C6.1 <-> R6.1 @@ -22,9 +22,9 @@ Switch setup: [Default] C8.2 <-> R15.1 C9.1 <-> R11.2 C9.2 <-> R20.2 - D1.2 <-> R22.2 + D1.K <-> R22.2 R12.2 <-> R13.2 <-> R14.2 <-> R15.2 - R23.2 <-> R24.2 <-> VR1.1 + R23.2 <-> R24.2 <-> VR1.1 <-> VR1.3 R26.1 <-> VR2.1 R26.2 <-> VR1.2 R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt index 4e54314ba..ce817e014 100644 --- a/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 mohm.1 <-> 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> PH2.1 <-> PH2.3 <-> PH3.1 <-> PH4.1 <-> PH4.4 - 10 kohm.1 <-> PH3.2 <-> PH4.2 - 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 - 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 + 10 kohm.1 <-> PH3.2 + 10 kohm.2 <-> PH2.1 <-> PH4.1 + 220 ohm.1 <-> PH2.3 <-> PH3.1 <-> PH4.4 + 220 ohm.2 <-> 220 ohm.2 diff --git a/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt index 4e54314ba..ce817e014 100644 --- a/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 mohm.1 <-> 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> PH2.1 <-> PH2.3 <-> PH3.1 <-> PH4.1 <-> PH4.4 - 10 kohm.1 <-> PH3.2 <-> PH4.2 - 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 - 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 + 10 kohm.1 <-> PH3.2 + 10 kohm.2 <-> PH2.1 <-> PH4.1 + 220 ohm.1 <-> PH2.3 <-> PH3.1 <-> PH4.4 + 220 ohm.2 <-> 220 ohm.2 diff --git a/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt index be65c3628..c0f364200 100644 --- a/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt @@ -1,10 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 + PH1.1 <-> PH1.14 <-> PH1.3 <-> PH1.9 <-> PH10.3 <-> PH11.2 <-> PH11.4 <-> PH12 <-> PH15 <-> PH2.1 <-> PH2.14 <-> PH2.3 <-> PH2.9 <-> PH3.1 <-> PH3.3 <-> PH4.1 <-> PH4.3 <-> PH5.2 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.3 <-> PH9.2 <-> PH9.4 PH1.10 <-> PH2.10 PH1.11 <-> PH2.11 + PH1.12 <-> PH1.13 <-> PH1.2 <-> PH1.7 <-> PH10.1 <-> PH11.3 <-> PH11.5 <-> PH16 <-> PH2.12 <-> PH2.13 <-> PH2.2 <-> PH2.7 <-> PH3.2 <-> PH4.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH8.1 <-> PH9.3 <-> PH9.5 PH1.15 <-> PH2.15 - PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6 + PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2 + PH1.5 <-> PH2.5 PH1.6 <-> PH2.6 PH11.1 <-> PH9.1 + PH11.6 <-> PH9.6 diff --git a/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt index be65c3628..c0f364200 100644 --- a/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt @@ -1,10 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 + PH1.1 <-> PH1.14 <-> PH1.3 <-> PH1.9 <-> PH10.3 <-> PH11.2 <-> PH11.4 <-> PH12 <-> PH15 <-> PH2.1 <-> PH2.14 <-> PH2.3 <-> PH2.9 <-> PH3.1 <-> PH3.3 <-> PH4.1 <-> PH4.3 <-> PH5.2 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.3 <-> PH9.2 <-> PH9.4 PH1.10 <-> PH2.10 PH1.11 <-> PH2.11 + PH1.12 <-> PH1.13 <-> PH1.2 <-> PH1.7 <-> PH10.1 <-> PH11.3 <-> PH11.5 <-> PH16 <-> PH2.12 <-> PH2.13 <-> PH2.2 <-> PH2.7 <-> PH3.2 <-> PH4.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH8.1 <-> PH9.3 <-> PH9.5 PH1.15 <-> PH2.15 - PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6 + PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2 + PH1.5 <-> PH2.5 PH1.6 <-> PH2.6 PH11.1 <-> PH9.1 + PH11.6 <-> PH9.6 diff --git a/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt index be65c3628..e342b655c 100644 --- a/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 + PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.7 <-> PH1.9 <-> PH10.1 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.7 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 PH1.10 <-> PH2.10 PH1.11 <-> PH2.11 PH1.15 <-> PH2.15 - PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6 + PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2 + PH1.5 <-> PH2.5 PH1.6 <-> PH2.6 PH11.1 <-> PH9.1 + PH11.6 <-> PH9.6 diff --git a/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt index be65c3628..e342b655c 100644 --- a/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 + PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.7 <-> PH1.9 <-> PH10.1 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.7 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5 PH1.10 <-> PH2.10 PH1.11 <-> PH2.11 PH1.15 <-> PH2.15 - PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6 + PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2 + PH1.5 <-> PH2.5 PH1.6 <-> PH2.6 PH11.1 <-> PH9.1 + PH11.6 <-> PH9.6 diff --git a/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt index e182282ae..69bf333c5 100644 --- a/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt @@ -1,5 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 mohm.1 <-> 10 kohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> PH4.3 <-> PH5.2 <-> PH7.2 <-> PH8.2 - 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> PH2.1 <-> PH2.2 <-> PH2.4 <-> PH4.1 <-> PH4.10 <-> PH4.15 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH4.9 <-> PH5.1 <-> PH5.3 <-> PH7.1 <-> PH7.3 <-> PH8.1 + 1 mohm.2 <-> 10 kohm.2 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.1 <-> PH7.1 + 10 kohm.1 <-> PH8.2 + 220 ohm.1 <-> 220 ohm.2 <-> PH2.4 <-> PH4.1 <-> PH5.3 <-> PH7.3 <-> PH8.1 + 220 ohm.2 <-> PH4.15 + PH4.3 <-> PH5.2 diff --git a/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt index e182282ae..69bf333c5 100644 --- a/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt @@ -1,5 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 mohm.1 <-> 10 kohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> PH4.3 <-> PH5.2 <-> PH7.2 <-> PH8.2 - 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> PH2.1 <-> PH2.2 <-> PH2.4 <-> PH4.1 <-> PH4.10 <-> PH4.15 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH4.9 <-> PH5.1 <-> PH5.3 <-> PH7.1 <-> PH7.3 <-> PH8.1 + 1 mohm.2 <-> 10 kohm.2 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.1 <-> PH7.1 + 10 kohm.1 <-> PH8.2 + 220 ohm.1 <-> 220 ohm.2 <-> PH2.4 <-> PH4.1 <-> PH5.3 <-> PH7.3 <-> PH8.1 + 220 ohm.2 <-> PH4.15 + PH4.3 <-> PH5.2 diff --git a/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt index d166f1e9b..277873403 100644 --- a/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt @@ -1,14 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.12 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.2 <-> PH6.6 <-> PH7.12 <-> PH7.16 <-> PH7.2 <-> PH7.5 - 1 KOhm.2 <-> 10 KOhm.2 <-> PH14.2 - 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH13.2 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3 - 220 Ohm.1 <-> 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH4.15 <-> PH5.1 <-> PH6.5 <-> PH7.1 <-> PH7.15 - 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> PH10 <-> PH11 <-> PH12 <-> PH4.10 <-> PH4.11 <-> PH4.9 <-> PH6.1 <-> PH7.10 <-> PH7.11 <-> PH7.9 <-> PH9 - PH1.2 <-> PH15.2 <-> PH4.13 <-> PH6.3 <-> PH7.13 - PH1.3 <-> PH15.3 <-> PH4.14 <-> PH6.4 <-> PH7.14 + 1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.6 <-> PH7.16 <-> PH7.2 <-> PH7.5 + 10 KOhm.2 <-> PH14.2 + 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3 + 220 Ohm.1 <-> PH4.15 <-> PH6.5 <-> PH7.15 + 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH5.1 <-> PH7.1 + 220 Ohm.2 <-> PH10 + 220 Ohm.2 <-> PH11 + 220 Ohm.2 <-> PH12 + 220 Ohm.2 <-> PH9 + PH1.2 <-> PH15.2 + PH1.3 <-> PH15.3 + PH4.10 <-> PH7.10 + PH4.11 <-> PH6.1 <-> PH7.11 + PH4.12 <-> PH6.2 <-> PH7.12 + PH4.13 <-> PH6.3 <-> PH7.13 + PH4.14 <-> PH6.4 <-> PH7.14 PH4.4 <-> PH5.4 <-> PH7.4 PH4.6 <-> PH5.6 <-> PH7.6 PH4.7 <-> PH7.7 PH4.8 <-> PH7.8 + PH4.9 <-> PH7.9 diff --git a/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt index d166f1e9b..277873403 100644 --- a/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt @@ -1,14 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.12 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.2 <-> PH6.6 <-> PH7.12 <-> PH7.16 <-> PH7.2 <-> PH7.5 - 1 KOhm.2 <-> 10 KOhm.2 <-> PH14.2 - 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH13.2 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3 - 220 Ohm.1 <-> 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH4.15 <-> PH5.1 <-> PH6.5 <-> PH7.1 <-> PH7.15 - 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> PH10 <-> PH11 <-> PH12 <-> PH4.10 <-> PH4.11 <-> PH4.9 <-> PH6.1 <-> PH7.10 <-> PH7.11 <-> PH7.9 <-> PH9 - PH1.2 <-> PH15.2 <-> PH4.13 <-> PH6.3 <-> PH7.13 - PH1.3 <-> PH15.3 <-> PH4.14 <-> PH6.4 <-> PH7.14 + 1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.6 <-> PH7.16 <-> PH7.2 <-> PH7.5 + 10 KOhm.2 <-> PH14.2 + 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3 + 220 Ohm.1 <-> PH4.15 <-> PH6.5 <-> PH7.15 + 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH5.1 <-> PH7.1 + 220 Ohm.2 <-> PH10 + 220 Ohm.2 <-> PH11 + 220 Ohm.2 <-> PH12 + 220 Ohm.2 <-> PH9 + PH1.2 <-> PH15.2 + PH1.3 <-> PH15.3 + PH4.10 <-> PH7.10 + PH4.11 <-> PH6.1 <-> PH7.11 + PH4.12 <-> PH6.2 <-> PH7.12 + PH4.13 <-> PH6.3 <-> PH7.13 + PH4.14 <-> PH6.4 <-> PH7.14 PH4.4 <-> PH5.4 <-> PH7.4 PH4.6 <-> PH5.6 <-> PH7.6 PH4.7 <-> PH7.7 PH4.8 <-> PH7.8 + PH4.9 <-> PH7.9 diff --git a/diylc-regression-data/input/cloud/netlist/396_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/396_excl_switches.txt index 475a0c8ef..e5e8dddcc 100644 --- a/diylc-regression-data/input/cloud/netlist/396_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/396_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> J4.Tip - C2.1 <-> Q1.2 <-> R3.2 <-> R4.1 - C2.2 <-> J1.Tip + C2.+ <-> Q1.2 <-> R3.2 <-> R4.1 + C2.- <-> J1.Tip J1.Sleeve <-> R1.2 <-> R4.2 Q1.1 <-> R1.1 R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/396_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/396_incl_switches.txt index 475a0c8ef..e5e8dddcc 100644 --- a/diylc-regression-data/input/cloud/netlist/396_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/396_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> J4.Tip - C2.1 <-> Q1.2 <-> R3.2 <-> R4.1 - C2.2 <-> J1.Tip + C2.+ <-> Q1.2 <-> R3.2 <-> R4.1 + C2.- <-> J1.Tip J1.Sleeve <-> R1.2 <-> R4.2 Q1.1 <-> R1.1 R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt index 53f69ba41..a9a5daf1b 100644 --- a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt @@ -1,40 +1,37 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.2 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R19.1 <-> V4.2 C11.2 <-> R17.2 <-> V2.6 - C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.+ <-> R21.1 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> OT.2 <-> R13.2 <-> R18.1 <-> R19.2 <-> R1A.1 <-> R2.1 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> Tone.1 <-> TS R3.1 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1 - C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 C2.1 <-> R1.2 <-> V1.2 C2.2 <-> R2.2 <-> R3.2 <-> V1.3 - C3.1 <-> R3.1 <-> R4.1 <-> R5.1 - C3.2 <-> R18.1 <-> R2.1 <-> Tone.3 + C3.+ <-> R3.1 <-> R4.1 <-> R5.1 C4.1 <-> R4.2 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.2 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 - C9.1 <-> R11.2 <-> R12.1 - Input Jack.Sleeve <-> R1A.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.1 <-> R1A.2 - J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 + J1.Sleeve <-> J1.Tip <-> OT.4 <-> OT.5 <-> R15.1 OT.1 <-> R22.2 <-> V4.7 PL1.1 <-> PL1.2 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.1 <-> R14.1 R14.2 <-> R28.2 <-> R29.2 R7.1 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1 - TS R3.1 <-> Volume.3 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.3 V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt index 53f69ba41..a9a5daf1b 100644 --- a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt @@ -1,40 +1,37 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.2 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R19.1 <-> V4.2 C11.2 <-> R17.2 <-> V2.6 - C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.+ <-> R21.1 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> OT.2 <-> R13.2 <-> R18.1 <-> R19.2 <-> R1A.1 <-> R2.1 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> Tone.1 <-> TS R3.1 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1 - C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 C2.1 <-> R1.2 <-> V1.2 C2.2 <-> R2.2 <-> R3.2 <-> V1.3 - C3.1 <-> R3.1 <-> R4.1 <-> R5.1 - C3.2 <-> R18.1 <-> R2.1 <-> Tone.3 + C3.+ <-> R3.1 <-> R4.1 <-> R5.1 C4.1 <-> R4.2 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.2 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 - C9.1 <-> R11.2 <-> R12.1 - Input Jack.Sleeve <-> R1A.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.1 <-> R1A.2 - J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 + J1.Sleeve <-> J1.Tip <-> OT.4 <-> OT.5 <-> R15.1 OT.1 <-> R22.2 <-> V4.7 PL1.1 <-> PL1.2 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.1 <-> R14.1 R14.2 <-> R28.2 <-> R29.2 R7.1 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1 - TS R3.1 <-> Volume.3 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.3 V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/398_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/398_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/398_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/398_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/398_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/398_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/398_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/398_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/399_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/399_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/399_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/399_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/399_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/399_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/399_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/399_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/400_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/400_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/400_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/400_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/400_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/400_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/cloud/netlist/400_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/400_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt index 6b7f0b60b..f0d7fb77c 100644 --- a/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt @@ -1,20 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R12.1 + C1.1 <-> R12.3 C1.2 <-> R5.2 <-> V3.1 C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 - C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND <-> R9.1 - C5.1 <-> R5.1 <-> R7.1 - C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 - C6.1 <-> R8.2 <-> V2.8 - C7.1 <-> R4.2 <-> V3.3 + C3.+ <-> R10.1 <-> V1.2 <-> V1.8 + C3.- <-> C4.- <-> C6.- <-> GND <-> R8.1 <-> R9.1 + C5.+ <-> R11.1 <-> R5.1 <-> R7.1 + C5.- <-> C7.- <-> Input 2.Sleeve <-> R12.1 <-> R4.1 + C6.+ <-> R8.2 <-> V2.8 + C7.+ <-> R4.2 <-> V3.3 FH1.1 <-> FH1.2 Input 1.Shunt <-> Input 1.Sleeve <-> R1.2 Input 1.Tip <-> Input 2.Shunt <-> R1.1 <-> R3.1 + Input 2.Tip <-> R2.1 J3.Tip <-> R13.1 PL1.1 <-> PL1.2 <-> V2.2 <-> V2.7 <-> V3.4 <-> V3.5 <-> V3.9 + R10.2 <-> R11.2 <-> V2.4 R12.2 <-> V3.7 R13.2 <-> R6.2 R2.2 <-> R3.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt index 6b7f0b60b..f0d7fb77c 100644 --- a/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt @@ -1,20 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R12.1 + C1.1 <-> R12.3 C1.2 <-> R5.2 <-> V3.1 C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 - C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND <-> R9.1 - C5.1 <-> R5.1 <-> R7.1 - C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 - C6.1 <-> R8.2 <-> V2.8 - C7.1 <-> R4.2 <-> V3.3 + C3.+ <-> R10.1 <-> V1.2 <-> V1.8 + C3.- <-> C4.- <-> C6.- <-> GND <-> R8.1 <-> R9.1 + C5.+ <-> R11.1 <-> R5.1 <-> R7.1 + C5.- <-> C7.- <-> Input 2.Sleeve <-> R12.1 <-> R4.1 + C6.+ <-> R8.2 <-> V2.8 + C7.+ <-> R4.2 <-> V3.3 FH1.1 <-> FH1.2 Input 1.Shunt <-> Input 1.Sleeve <-> R1.2 Input 1.Tip <-> Input 2.Shunt <-> R1.1 <-> R3.1 + Input 2.Tip <-> R2.1 J3.Tip <-> R13.1 PL1.1 <-> PL1.2 <-> V2.2 <-> V2.7 <-> V3.4 <-> V3.5 <-> V3.9 + R10.2 <-> R11.2 <-> V2.4 R12.2 <-> V3.7 R13.2 <-> R6.2 R2.2 <-> R3.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/402_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/402_excl_switches.txt index 8b67fe19c..1a81a2d47 100644 --- a/diylc-regression-data/input/cloud/netlist/402_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/402_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> J3.Tip diff --git a/diylc-regression-data/input/cloud/netlist/402_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/402_incl_switches.txt index 8b67fe19c..1a81a2d47 100644 --- a/diylc-regression-data/input/cloud/netlist/402_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/402_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> J3.Tip diff --git a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt index ff9829729..8bdc02ab8 100644 --- a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.1 - 1N4007.2 <-> V2.4 - 1N4007.2 <-> V2.6 - 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 - 2W.1 <-> C3.1 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 - 2W.2 <-> C1.1 <-> R1.1 <-> R2.2 + 1N4007.A <-> 1N4007.A <-> 5W.1 <-> C1.- <-> C3.- <-> C3.- <-> C3.- <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.3 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.3 + 1N4007.K <-> V2.4 + 1N4007.K <-> V2.6 + 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.+ <-> V2.6 + 2W.1 <-> C3.+ <-> PL1.2 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 + 2W.2 <-> C1.+ <-> R1.1 <-> R2.2 5W.1 <-> V2.4 - 5W.2 <-> C3.1 <-> V2.8 - C4.1 <-> VR1.3 + 5W.2 <-> C3.+ <-> V2.8 + C4.1 <-> VR1.1 C4.2 <-> R1.2 <-> V1.6 C5.1 <-> R2.1 <-> V1.1 C5.2 <-> R3.2 <-> R8.1 diff --git a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt index 0ade845fd..ccbfe3af6 100644 --- a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [SW1.ON1] +Switch setup: [ SW1.ON1 ] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 - 1N4007.2 <-> V2.4 - 1N4007.2 <-> V2.6 - 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 - 2W.1 <-> C3.1 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 - 2W.2 <-> C1.1 <-> R1.1 <-> R2.2 + 1N4007.A <-> 1N4007.A <-> 5W.1 <-> C1.- <-> C3.- <-> C3.- <-> C3.- <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.3 + 1N4007.K <-> V2.4 + 1N4007.K <-> V2.6 + 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.+ <-> V2.6 + 2W.1 <-> C3.+ <-> PL1.2 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 + 2W.2 <-> C1.+ <-> R1.1 <-> R2.2 5W.1 <-> V2.4 - 5W.2 <-> C3.1 <-> V2.8 - C4.1 <-> VR1.3 + 5W.2 <-> C3.+ <-> V2.8 + C4.1 <-> VR1.1 C4.2 <-> R1.2 <-> V1.6 C5.1 <-> R2.1 <-> V1.1 C5.2 <-> R3.2 <-> R8.1 @@ -26,17 +26,17 @@ Switch setup: [SW1.ON1] R9.1 <-> V1.2 R9.2 <-> VR1.2 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> FH1.1 <-> GND <-> IEC1.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 - 1N4007.2 <-> V2.4 - 1N4007.2 <-> V2.6 - 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 - 2W.1 <-> C3.1 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 - 2W.2 <-> C1.1 <-> R1.1 <-> R2.2 + 1N4007.A <-> 1N4007.A <-> 5W.1 <-> C1.- <-> C3.- <-> C3.- <-> C3.- <-> FH1.1 <-> GND <-> IEC1.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.3 + 1N4007.K <-> V2.4 + 1N4007.K <-> V2.6 + 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.+ <-> V2.6 + 2W.1 <-> C3.+ <-> PL1.2 <-> PL1.3 <-> V2.2 <-> V2.3 <-> V2.8 + 2W.2 <-> C1.+ <-> R1.1 <-> R2.2 5W.1 <-> V2.4 - 5W.2 <-> C3.1 <-> V2.8 - C4.1 <-> VR1.3 + 5W.2 <-> C3.+ <-> V2.8 + C4.1 <-> VR1.1 C4.2 <-> R1.2 <-> V1.6 C5.1 <-> R2.1 <-> V1.1 C5.2 <-> R3.2 <-> R8.1 diff --git a/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt index 6b7f0b60b..f0d7fb77c 100644 --- a/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt @@ -1,20 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R12.1 + C1.1 <-> R12.3 C1.2 <-> R5.2 <-> V3.1 C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 - C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND <-> R9.1 - C5.1 <-> R5.1 <-> R7.1 - C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 - C6.1 <-> R8.2 <-> V2.8 - C7.1 <-> R4.2 <-> V3.3 + C3.+ <-> R10.1 <-> V1.2 <-> V1.8 + C3.- <-> C4.- <-> C6.- <-> GND <-> R8.1 <-> R9.1 + C5.+ <-> R11.1 <-> R5.1 <-> R7.1 + C5.- <-> C7.- <-> Input 2.Sleeve <-> R12.1 <-> R4.1 + C6.+ <-> R8.2 <-> V2.8 + C7.+ <-> R4.2 <-> V3.3 FH1.1 <-> FH1.2 Input 1.Shunt <-> Input 1.Sleeve <-> R1.2 Input 1.Tip <-> Input 2.Shunt <-> R1.1 <-> R3.1 + Input 2.Tip <-> R2.1 J3.Tip <-> R13.1 PL1.1 <-> PL1.2 <-> V2.2 <-> V2.7 <-> V3.4 <-> V3.5 <-> V3.9 + R10.2 <-> R11.2 <-> V2.4 R12.2 <-> V3.7 R13.2 <-> R6.2 R2.2 <-> R3.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt index 6b7f0b60b..f0d7fb77c 100644 --- a/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt @@ -1,20 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R12.1 + C1.1 <-> R12.3 C1.2 <-> R5.2 <-> V3.1 C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 - C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND <-> R9.1 - C5.1 <-> R5.1 <-> R7.1 - C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 - C6.1 <-> R8.2 <-> V2.8 - C7.1 <-> R4.2 <-> V3.3 + C3.+ <-> R10.1 <-> V1.2 <-> V1.8 + C3.- <-> C4.- <-> C6.- <-> GND <-> R8.1 <-> R9.1 + C5.+ <-> R11.1 <-> R5.1 <-> R7.1 + C5.- <-> C7.- <-> Input 2.Sleeve <-> R12.1 <-> R4.1 + C6.+ <-> R8.2 <-> V2.8 + C7.+ <-> R4.2 <-> V3.3 FH1.1 <-> FH1.2 Input 1.Shunt <-> Input 1.Sleeve <-> R1.2 Input 1.Tip <-> Input 2.Shunt <-> R1.1 <-> R3.1 + Input 2.Tip <-> R2.1 J3.Tip <-> R13.1 PL1.1 <-> PL1.2 <-> V2.2 <-> V2.7 <-> V3.4 <-> V3.5 <-> V3.9 + R10.2 <-> R11.2 <-> V2.4 R12.2 <-> V3.7 R13.2 <-> R6.2 R2.2 <-> R3.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt index 53f69ba41..a9a5daf1b 100644 --- a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt @@ -1,40 +1,37 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.2 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R19.1 <-> V4.2 C11.2 <-> R17.2 <-> V2.6 - C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.+ <-> R21.1 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> OT.2 <-> R13.2 <-> R18.1 <-> R19.2 <-> R1A.1 <-> R2.1 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> Tone.1 <-> TS R3.1 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1 - C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 C2.1 <-> R1.2 <-> V1.2 C2.2 <-> R2.2 <-> R3.2 <-> V1.3 - C3.1 <-> R3.1 <-> R4.1 <-> R5.1 - C3.2 <-> R18.1 <-> R2.1 <-> Tone.3 + C3.+ <-> R3.1 <-> R4.1 <-> R5.1 C4.1 <-> R4.2 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.2 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 - C9.1 <-> R11.2 <-> R12.1 - Input Jack.Sleeve <-> R1A.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.1 <-> R1A.2 - J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 + J1.Sleeve <-> J1.Tip <-> OT.4 <-> OT.5 <-> R15.1 OT.1 <-> R22.2 <-> V4.7 PL1.1 <-> PL1.2 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.1 <-> R14.1 R14.2 <-> R28.2 <-> R29.2 R7.1 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1 - TS R3.1 <-> Volume.3 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.3 V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt index 53f69ba41..a9a5daf1b 100644 --- a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt @@ -1,40 +1,37 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.2 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R19.1 <-> V4.2 C11.2 <-> R17.2 <-> V2.6 - C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.+ <-> R21.1 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> OT.2 <-> R13.2 <-> R18.1 <-> R19.2 <-> R1A.1 <-> R2.1 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> Tone.1 <-> TS R3.1 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1 - C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2 C2.1 <-> R1.2 <-> V1.2 C2.2 <-> R2.2 <-> R3.2 <-> V1.3 - C3.1 <-> R3.1 <-> R4.1 <-> R5.1 - C3.2 <-> R18.1 <-> R2.1 <-> Tone.3 + C3.+ <-> R3.1 <-> R4.1 <-> R5.1 C4.1 <-> R4.2 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.2 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 - C9.1 <-> R11.2 <-> R12.1 - Input Jack.Sleeve <-> R1A.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.1 <-> R1A.2 - J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 + J1.Sleeve <-> J1.Tip <-> OT.4 <-> OT.5 <-> R15.1 OT.1 <-> R22.2 <-> V4.7 PL1.1 <-> PL1.2 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.1 <-> R14.1 R14.2 <-> R28.2 <-> R29.2 R7.1 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1 - TS R3.1 <-> Volume.3 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.3 V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt index 5b320680c..812c257f8 100644 --- a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt @@ -1,36 +1,35 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.1 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R17.2 <-> V2.6 C11.2 <-> R19.2 <-> V4.2 - C12.1 <-> R21.2 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 + C12.+ <-> R21.2 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R15.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.1 <-> TS R3.2 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> OT.3 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.2 <-> R28.2 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.2 - C19.1 <-> R10.1 <-> R31.1 <-> R32.2 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.2 <-> V2.2 C2.1 <-> R1.1 <-> V1.2 C2.2 <-> R2.1 <-> R3.1 <-> V1.3 - C3.1 <-> R3.2 <-> R4.2 <-> R5.1 + C3.+ <-> R3.2 <-> R4.2 <-> R5.1 C4.1 <-> R4.1 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.1 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R10.2 <-> V2.7 C8.2 <-> R15.2 <-> R9.2 - C9.1 <-> R11.2 <-> R12.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.2 <-> R1A.1 + OT.1 <-> R22.2 <-> V4.7 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.2 <-> R14.2 R14.1 <-> R28.1 <-> R29.2 - R22.2 <-> V4.7 R7.2 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.1 - V1.4 <-> V1.5 <-> V1.9 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.3 + V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 - V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 diff --git a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt index 5b320680c..812c257f8 100644 --- a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt @@ -1,36 +1,35 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R18.1 <-> V3.2 C10.2 <-> R16.1 <-> V2.1 C11.1 <-> R17.2 <-> V2.6 C11.2 <-> R19.2 <-> V4.2 - C12.1 <-> R21.2 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 + C12.+ <-> R21.2 <-> V3.3 <-> V4.3 + C12.- <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.- <-> C3.- <-> C9.- <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R15.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.1 <-> TS R3.2 <-> V5.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.1 C13.1 <-> OT.3 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.2 <-> R28.2 <-> R30.2 <-> V3.9 <-> V4.9 C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.2 - C19.1 <-> R10.1 <-> R31.1 <-> R32.2 <-> V2.2 + C19.+ <-> R10.1 <-> R31.1 <-> R32.2 <-> V2.2 C2.1 <-> R1.1 <-> V1.2 C2.2 <-> R2.1 <-> R3.1 <-> V1.3 - C3.1 <-> R3.2 <-> R4.2 <-> R5.1 + C3.+ <-> R3.2 <-> R4.2 <-> R5.1 C4.1 <-> R4.1 <-> V1.1 C4.2 <-> TSR1.1 <-> TSR2.2 C5.2 <-> C6.1 <-> R8.1 <-> V1.6 C6.2 <-> R9.1 C8.1 <-> R10.2 <-> V2.7 C8.2 <-> R15.2 <-> R9.2 - C9.1 <-> R11.2 <-> R12.1 + C9.+ <-> R11.2 <-> R12.1 Input Jack.Tip <-> R1.2 <-> R1A.1 + OT.1 <-> R22.2 <-> V4.7 R11.1 <-> V2.3 <-> V2.8 R12.2 <-> R13.2 <-> R14.2 R14.1 <-> R28.1 <-> R29.2 - R22.2 <-> V4.7 R7.2 <-> V1.8 - Tone.1 <-> TSR1.2 Tone.2 <-> TS C1.2 - TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.1 - V1.4 <-> V1.5 <-> V1.9 + Tone.3 <-> TSR1.2 + TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.3 + V1.4 <-> V1.5 <-> V1.9 <-> V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 V1.7 <-> Volume.2 - V2.4 <-> V2.5 <-> V2.9 <-> V3.4 <-> V3.5 <-> V4.4 <-> V4.5 diff --git a/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt index 1b6d532a3..585879a71 100644 --- a/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt @@ -1,10 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> LesPaul 3 Pos Switch.1 <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> Push Pull.3 <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - JAZZ BASS BRIDGE PU.South Start <-> VOL2.1 + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> LesPaul 3 Pos Switch.1 <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> Push Pull.3 <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 LesPaul 3 Pos Switch.2 <-> VOL2.2 LesPaul 3 Pos Switch.3 <-> Presa Jack.Tip <-> TONE.2 LesPaul 3 Pos Switch.4 <-> VOL1.2 + PRECISION COIL N.North Finish <-> Push Pull.2 + PRECISION COIL N.North Start <-> Push Pull.6 <-> VOL1.3 + PRECISION COIL S.South Start <-> Push Pull.5 Push Pull.1 <-> Push Pull.4 diff --git a/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt index a2d076c2c..3066cef68 100644 --- a/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt @@ -1,21 +1,51 @@ -Switch setup: [LesPaul 3 Pos Switch.Middle:Push Pull.ON1, LesPaul 3 Pos Switch.Middle:Push Pull.ON2] +Switch setup: [ LesPaul 3 Pos Switch.Middle:Push Pull.ON1 ] - 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - JAZZ BASS BRIDGE PU.South Start <-> VOL2.1 + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Finish <-> PRECISION COIL S.South Start + PRECISION COIL N.North Start <-> VOL1.3 Presa Jack.Tip <-> TONE.2 <-> VOL1.2 <-> VOL2.2 -Switch setup: [LesPaul 3 Pos Switch.Rhythm:Push Pull.ON1, LesPaul 3 Pos Switch.Rhythm:Push Pull.ON2] +Switch setup: [ LesPaul 3 Pos Switch.Middle:Push Pull.ON2 ] - 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - JAZZ BASS BRIDGE PU.South Start <-> VOL2.1 + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL N.North Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Start <-> PRECISION COIL S.South Start <-> VOL1.3 + Presa Jack.Tip <-> TONE.2 <-> VOL1.2 <-> VOL2.2 + +Switch setup: [ LesPaul 3 Pos Switch.Rhythm:Push Pull.ON1 ] + + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Finish <-> PRECISION COIL S.South Start + PRECISION COIL N.North Start <-> VOL1.3 Presa Jack.Tip <-> TONE.2 <-> VOL1.2 -Switch setup: [LesPaul 3 Pos Switch.Treble:Push Pull.ON1, LesPaul 3 Pos Switch.Treble:Push Pull.ON2] +Switch setup: [ LesPaul 3 Pos Switch.Rhythm:Push Pull.ON2 ] - 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - JAZZ BASS BRIDGE PU.South Start <-> VOL2.1 + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL N.North Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Start <-> PRECISION COIL S.South Start <-> VOL1.3 + Presa Jack.Tip <-> TONE.2 <-> VOL1.2 + +Switch setup: [ LesPaul 3 Pos Switch.Treble:Push Pull.ON1 ] + + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Finish <-> PRECISION COIL S.South Start + PRECISION COIL N.North Start <-> VOL1.3 + Presa Jack.Tip <-> TONE.2 <-> VOL2.2 + +Switch setup: [ LesPaul 3 Pos Switch.Treble:Push Pull.ON2 ] + + 0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL N.North Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + JAZZ BASS BRIDGE PU.South Start <-> VOL2.3 + PRECISION COIL N.North Start <-> PRECISION COIL S.South Start <-> VOL1.3 Presa Jack.Tip <-> TONE.2 <-> VOL2.2 diff --git a/diylc-regression-data/input/cloud/netlist/408_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/408_excl_switches.txt index 2f90a2db3..32226d885 100644 --- a/diylc-regression-data/input/cloud/netlist/408_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/408_excl_switches.txt @@ -1,6 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish + 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish <-> VOL1 250K.1 + 1/4'' mono jack socket.Tip <-> VOL1 250K.2 CAP 0.47 uF.1 <-> TONE 250K.2 - CRL 3 way Tele spring action switch.1 <-> CRL 3 way Tele spring action switch.8 <-> VOL1 250K.1 + CRL 3 way Tele spring action switch.1 <-> CRL 3 way Tele spring action switch.3 <-> CRL 3 way Tele spring action switch.6 <-> CRL 3 way Tele spring action switch.8 <-> TONE 250K.1 <-> VOL1 250K.3 + CRL 3 way Tele spring action switch.2 <-> Telecaster Neck Pickup.North Start + CRL 3 way Tele spring action switch.7 <-> Telecaster Bridge Pickup.South Start diff --git a/diylc-regression-data/input/cloud/netlist/408_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/408_incl_switches.txt index f7d5b3a70..e3e6ed05c 100644 --- a/diylc-regression-data/input/cloud/netlist/408_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/408_incl_switches.txt @@ -1,5 +1,21 @@ -Switch setup: [CRL 3 way Tele spring action switch.1, CRL 3 way Tele spring action switch.2, CRL 3 way Tele spring action switch.3] +Switch setup: [ CRL 3 way Tele spring action switch.1 ] - 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish + 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish <-> VOL1 250K.1 + 1/4'' mono jack socket.Tip <-> VOL1 250K.2 CAP 0.47 uF.1 <-> TONE 250K.2 + Telecaster Bridge Pickup.South Start <-> TONE 250K.1 <-> VOL1 250K.3 + +Switch setup: [ CRL 3 way Tele spring action switch.2 ] + + 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish <-> VOL1 250K.1 + 1/4'' mono jack socket.Tip <-> VOL1 250K.2 + CAP 0.47 uF.1 <-> TONE 250K.2 + Telecaster Bridge Pickup.South Start <-> Telecaster Neck Pickup.North Start <-> TONE 250K.1 <-> VOL1 250K.3 + +Switch setup: [ CRL 3 way Tele spring action switch.3 ] + + 1/4'' mono jack socket.Sleeve <-> CAP 0.47 uF.2 <-> Telecaster Bridge Pickup.South Finish <-> Telecaster Neck Pickup.North Finish <-> VOL1 250K.1 + 1/4'' mono jack socket.Tip <-> VOL1 250K.2 + CAP 0.47 uF.1 <-> TONE 250K.2 + Telecaster Neck Pickup.North Start <-> TONE 250K.1 <-> VOL1 250K.3 diff --git a/diylc-regression-data/input/cloud/netlist/409_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/409_excl_switches.txt index b746e532b..1b40d113d 100644 --- a/diylc-regression-data/input/cloud/netlist/409_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/409_excl_switches.txt @@ -1,5 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - CAP.2 <-> CENTER PU.South Finish <-> NECK PU.North Finish <-> VOL.3 - Strat 5 Way Switch.2 <-> Strat 5 Way Switch.7 + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> Strat 5 Way Switch.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> Strat 5 Way Switch.3 + J1.Tip <-> VOL.2 + NECK PU.North Start <-> Strat 5 Way Switch.5 + Strat 5 Way Switch.2 <-> Strat 5 Way Switch.7 <-> VOL.3 + Strat 5 Way Switch.4 <-> Strat 5 Way Switch.6 <-> Tone2.1 + Strat 5 Way Switch.8 <-> Tone1.2 diff --git a/diylc-regression-data/input/cloud/netlist/409_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/409_incl_switches.txt index 5ff307514..618cf37f8 100644 --- a/diylc-regression-data/input/cloud/netlist/409_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/409_incl_switches.txt @@ -1,4 +1,35 @@ -Switch setup: [Strat 5 Way Switch.1, Strat 5 Way Switch.2, Strat 5 Way Switch.3, Strat 5 Way Switch.4, Strat 5 Way Switch.5] +Switch setup: [ Strat 5 Way Switch.1 ] - CAP.2 <-> CENTER PU.South Finish <-> NECK PU.North Finish <-> VOL.3 + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> Tone2.1 <-> VOL.3 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.2 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> CENTER PU.South Start <-> Tone2.1 <-> VOL.3 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.3 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> Tone2.1 <-> VOL.3 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.4 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> NECK PU.North Start <-> Tone1.2 <-> Tone2.1 <-> VOL.3 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.5 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + NECK PU.North Start <-> Tone1.2 <-> VOL.3 diff --git a/diylc-regression-data/input/cloud/netlist/410_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/410_excl_switches.txt index a7cd1eb15..935f9c20e 100644 --- a/diylc-regression-data/input/cloud/netlist/410_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/410_excl_switches.txt @@ -1,6 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.3 - Strat 5 Way Switch.2 <-> Strat 5 Way Switch.7 <-> SW1.1 - Tone1.3 <-> Tone2.2 + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> Strat 5 Way Switch.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> Strat 5 Way Switch.3 + J1.Tip <-> VOL.2 + NECK PU.North Start <-> Strat 5 Way Switch.5 + Strat 5 Way Switch.2 <-> Strat 5 Way Switch.7 <-> SW1.1 <-> VOL.3 + Strat 5 Way Switch.4 <-> Strat 5 Way Switch.6 <-> Tone2.1 + Strat 5 Way Switch.8 <-> Tone1.2 diff --git a/diylc-regression-data/input/cloud/netlist/410_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/410_incl_switches.txt index f4f111911..618cf37f8 100644 --- a/diylc-regression-data/input/cloud/netlist/410_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/410_incl_switches.txt @@ -1,5 +1,35 @@ -Switch setup: [Strat 5 Way Switch.1:SW1.ON1, Strat 5 Way Switch.2:SW1.ON1, Strat 5 Way Switch.3:SW1.ON1, Strat 5 Way Switch.4:SW1.ON1, Strat 5 Way Switch.5:SW1.ON1, Strat 5 Way Switch.1:SW1.ON2, Strat 5 Way Switch.2:SW1.ON2, Strat 5 Way Switch.3:SW1.ON2, Strat 5 Way Switch.4:SW1.ON2, Strat 5 Way Switch.5:SW1.ON2] +Switch setup: [ Strat 5 Way Switch.1 ] - CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.3 - Tone1.3 <-> Tone2.2 + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> Tone2.1 <-> VOL.3 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.2 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + BRIDGE PU.North Start <-> CENTER PU.South Start <-> Tone2.1 <-> VOL.3 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.3 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> Tone2.1 <-> VOL.3 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.4 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + CENTER PU.South Start <-> NECK PU.North Start <-> Tone1.2 <-> Tone2.1 <-> VOL.3 + J1.Tip <-> VOL.2 + +Switch setup: [ Strat 5 Way Switch.5 ] + + BRIDGE PU.North Finish <-> CAP.2 <-> CENTER PU.South Finish <-> J1.Sleeve <-> NECK PU.North Finish <-> VOL.1 + CAP.1 <-> Tone1.1 <-> Tone2.2 + J1.Tip <-> VOL.2 + NECK PU.North Start <-> Tone1.2 <-> VOL.3 diff --git a/diylc-regression-data/input/cloud/netlist/411_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/411_excl_switches.txt index 237e927d6..56599bf27 100644 --- a/diylc-regression-data/input/cloud/netlist/411_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/411_excl_switches.txt @@ -1,6 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] + .05 mF.1 <-> BRIDGE PICKUP.North Finish <-> VOLUME.3 + .05 mF.2 <-> TONE.2 + BLENDER.1 <-> J1.Sleeve <-> NECK PICKUP.South Start <-> TONE.1 <-> VOLUME.1 BLENDER.2 <-> BRIDGE PICKUP.North Start <-> NECK PICKUP.South Finish - BLENDER.3 <-> NECK PICKUP.South Start <-> TONE.3 <-> VOLUME.3 J1.Tip <-> VOLUME.2 diff --git a/diylc-regression-data/input/cloud/netlist/411_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/411_incl_switches.txt index 237e927d6..56599bf27 100644 --- a/diylc-regression-data/input/cloud/netlist/411_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/411_incl_switches.txt @@ -1,6 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] + .05 mF.1 <-> BRIDGE PICKUP.North Finish <-> VOLUME.3 + .05 mF.2 <-> TONE.2 + BLENDER.1 <-> J1.Sleeve <-> NECK PICKUP.South Start <-> TONE.1 <-> VOLUME.1 BLENDER.2 <-> BRIDGE PICKUP.North Start <-> NECK PICKUP.South Finish - BLENDER.3 <-> NECK PICKUP.South Start <-> TONE.3 <-> VOLUME.3 J1.Tip <-> VOLUME.2 diff --git a/diylc-regression-data/input/cloud/netlist/412_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/412_excl_switches.txt index a36d4e053..05aad23cd 100644 --- a/diylc-regression-data/input/cloud/netlist/412_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/412_excl_switches.txt @@ -1,9 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 3 POS LP SWITCH.1 <-> CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.3 <-> VOL2 250K.3 + 3 POS LP SWITCH.1 <-> CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.1 <-> VOL2 250K.1 3 POS LP SWITCH.2 <-> VOL2 250K.2 3 POS LP SWITCH.3 <-> J1.Tip <-> TONE 250K.2 3 POS LP SWITCH.4 <-> VOL1 250K.2 - CAP 0.47 uF.2 <-> TONE 250K.3 - JAZZ BASS BRG.South Start <-> VOL2 250K.1 + CAP 0.47 uF.2 <-> TONE 250K.1 + JAZZ BASS BRG.South Start <-> VOL2 250K.3 + JAZZ BASS NECK.South Start <-> VOL1 250K.3 diff --git a/diylc-regression-data/input/cloud/netlist/412_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/412_incl_switches.txt index 839d7616a..71828fce4 100644 --- a/diylc-regression-data/input/cloud/netlist/412_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/412_incl_switches.txt @@ -1,21 +1,24 @@ -Switch setup: [3 POS LP SWITCH.Middle] +Switch setup: [ 3 POS LP SWITCH.Middle ] - CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.3 <-> VOL2 250K.3 - CAP 0.47 uF.2 <-> TONE 250K.3 + CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.1 <-> VOL2 250K.1 + CAP 0.47 uF.2 <-> TONE 250K.1 J1.Tip <-> TONE 250K.2 <-> VOL1 250K.2 <-> VOL2 250K.2 - JAZZ BASS BRG.South Start <-> VOL2 250K.1 + JAZZ BASS BRG.South Start <-> VOL2 250K.3 + JAZZ BASS NECK.South Start <-> VOL1 250K.3 -Switch setup: [3 POS LP SWITCH.Rhythm] +Switch setup: [ 3 POS LP SWITCH.Rhythm ] - CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.3 <-> VOL2 250K.3 - CAP 0.47 uF.2 <-> TONE 250K.3 + CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.1 <-> VOL2 250K.1 + CAP 0.47 uF.2 <-> TONE 250K.1 J1.Tip <-> TONE 250K.2 <-> VOL1 250K.2 - JAZZ BASS BRG.South Start <-> VOL2 250K.1 + JAZZ BASS BRG.South Start <-> VOL2 250K.3 + JAZZ BASS NECK.South Start <-> VOL1 250K.3 -Switch setup: [3 POS LP SWITCH.Treble] +Switch setup: [ 3 POS LP SWITCH.Treble ] - CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.3 <-> VOL2 250K.3 - CAP 0.47 uF.2 <-> TONE 250K.3 + CAP 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.South Finish <-> VOL1 250K.1 <-> VOL2 250K.1 + CAP 0.47 uF.2 <-> TONE 250K.1 J1.Tip <-> TONE 250K.2 <-> VOL2 250K.2 - JAZZ BASS BRG.South Start <-> VOL2 250K.1 + JAZZ BASS BRG.South Start <-> VOL2 250K.3 + JAZZ BASS NECK.South Start <-> VOL1 250K.3 diff --git a/diylc-regression-data/input/cloud/netlist/413_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/413_excl_switches.txt index 953454bec..15cd37d70 100644 --- a/diylc-regression-data/input/cloud/netlist/413_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/413_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.North Finish <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - J1.Tip <-> TONE.2 - VOL1.1 <-> VOL2.1 + 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.North Finish <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + J1.Tip <-> TONE.2 <-> VOL1.3 <-> VOL2.3 + JAZZ BASS BRG.South Start <-> VOL2.2 + JAZZ BASS NECK.North Start <-> VOL1.2 diff --git a/diylc-regression-data/input/cloud/netlist/413_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/413_incl_switches.txt index 953454bec..15cd37d70 100644 --- a/diylc-regression-data/input/cloud/netlist/413_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/413_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.North Finish <-> VOL1.3 <-> VOL2.3 - 0.47 uF.2 <-> TONE.3 - J1.Tip <-> TONE.2 - VOL1.1 <-> VOL2.1 + 0.47 uF.1 <-> J1.Sleeve <-> JAZZ BASS BRG.South Finish <-> JAZZ BASS NECK.North Finish <-> VOL1.1 <-> VOL2.1 + 0.47 uF.2 <-> TONE.1 + J1.Tip <-> TONE.2 <-> VOL1.3 <-> VOL2.3 + JAZZ BASS BRG.South Start <-> VOL2.2 + JAZZ BASS NECK.North Start <-> VOL1.2 diff --git a/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt index 1c81af7ec..6d65e8f9a 100644 --- a/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt @@ -1,4 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve + CAP 0.47 uF.1 <-> TONE.2 + CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve <-> VOL.1 + Precision North Coil.North Finish <-> Precision South Coil.South Start + Precision North Coil.North Start <-> TONE.1 <-> VOL.3 + Presa Jack.Tip <-> VOL.2 diff --git a/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt index 1c81af7ec..6d65e8f9a 100644 --- a/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt @@ -1,4 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve + CAP 0.47 uF.1 <-> TONE.2 + CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve <-> VOL.1 + Precision North Coil.North Finish <-> Precision South Coil.South Start + Precision North Coil.North Start <-> TONE.1 <-> VOL.3 + Presa Jack.Tip <-> VOL.2 diff --git a/diylc-regression-data/input/cloud/netlist/415_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/415_excl_switches.txt index 5bb317553..9bac067f2 100644 --- a/diylc-regression-data/input/cloud/netlist/415_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/415_excl_switches.txt @@ -1,5 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] + 0,02 mF.1 <-> 100K.1 <-> PICKUP.North Start <-> TONE.1 <-> VOL.3 + 0,02 mF.2 <-> 100K.2 <-> J1.Tip <-> VOL.2 CAP 0.47 uF.1 <-> TONE.2 - CAP 0.47 uF.2 <-> J1.Sleeve <-> PICKUP.North Finish + CAP 0.47 uF.2 <-> J1.Sleeve <-> PICKUP.North Finish <-> VOL.1 diff --git a/diylc-regression-data/input/cloud/netlist/415_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/415_incl_switches.txt index 5bb317553..9bac067f2 100644 --- a/diylc-regression-data/input/cloud/netlist/415_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/415_incl_switches.txt @@ -1,5 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] + 0,02 mF.1 <-> 100K.1 <-> PICKUP.North Start <-> TONE.1 <-> VOL.3 + 0,02 mF.2 <-> 100K.2 <-> J1.Tip <-> VOL.2 CAP 0.47 uF.1 <-> TONE.2 - CAP 0.47 uF.2 <-> J1.Sleeve <-> PICKUP.North Finish + CAP 0.47 uF.2 <-> J1.Sleeve <-> PICKUP.North Finish <-> VOL.1 diff --git a/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt index 54feb2dd7..a6f6dedcb 100644 --- a/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt @@ -1,7 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BRIDGE VOL.3 <-> CAP 0.22 uF.2 + BRIDGE TONE.1 <-> BRIDGE VOL.3 <-> LP BRIDGE.North Start + BRIDGE TONE.2 <-> CAP 0.22 uF.1 + BRIDGE VOL.1 <-> CAP 0.22 uF.2 <-> CAP 0.22 uF.2 <-> J1.Sleeve <-> LP BRIDGE.South Start <-> LP NECK.South Start <-> NECK VOL.1 CAP 0.22 uF.1 <-> NECK TONE.2 + J1.Tip <-> SW1.3 LP BRIDGE.North Finish <-> LP BRIDGE.South Finish LP NECK.North Finish <-> LP NECK.South Finish + LP NECK.North Start <-> NECK TONE.1 <-> NECK VOL.3 + NECK VOL.2 <-> SW1.4 diff --git a/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt index e7b2cf22e..fb360e44d 100644 --- a/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt @@ -1,7 +1,21 @@ -Switch setup: [SW1.Treble, SW1.Middle, SW1.Rhythm] +Switch setup: [ SW1.Middle,SW1.Rhythm ] - BRIDGE VOL.3 <-> CAP 0.22 uF.2 + BRIDGE TONE.1 <-> BRIDGE VOL.3 <-> LP BRIDGE.North Start + BRIDGE TONE.2 <-> CAP 0.22 uF.1 + BRIDGE VOL.1 <-> CAP 0.22 uF.2 <-> CAP 0.22 uF.2 <-> J1.Sleeve <-> LP BRIDGE.South Start <-> LP NECK.South Start <-> NECK VOL.1 + CAP 0.22 uF.1 <-> NECK TONE.2 + J1.Tip <-> NECK VOL.2 + LP BRIDGE.North Finish <-> LP BRIDGE.South Finish + LP NECK.North Finish <-> LP NECK.South Finish + LP NECK.North Start <-> NECK TONE.1 <-> NECK VOL.3 + +Switch setup: [ SW1.Treble ] + + BRIDGE TONE.1 <-> BRIDGE VOL.3 <-> LP BRIDGE.North Start + BRIDGE TONE.2 <-> CAP 0.22 uF.1 + BRIDGE VOL.1 <-> CAP 0.22 uF.2 <-> CAP 0.22 uF.2 <-> J1.Sleeve <-> LP BRIDGE.South Start <-> LP NECK.South Start <-> NECK VOL.1 CAP 0.22 uF.1 <-> NECK TONE.2 LP BRIDGE.North Finish <-> LP BRIDGE.South Finish LP NECK.North Finish <-> LP NECK.South Finish + LP NECK.North Start <-> NECK TONE.1 <-> NECK VOL.3 diff --git a/diylc-regression-data/input/cloud/netlist/417_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/417_excl_switches.txt index c6d23a742..71a57afae 100644 --- a/diylc-regression-data/input/cloud/netlist/417_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/417_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - J1.Sleeve <-> Seymour Duncan.South Start <-> SW1.6 <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.South Start <-> SW1.6 <-> VR1.1 J1.Tip <-> VR1.2 Seymour Duncan.North Finish <-> SW1.5 - Seymour Duncan.North Start <-> SW1.3 <-> VR1.1 + Seymour Duncan.North Start <-> SW1.3 <-> VR1.3 Seymour Duncan.South Finish <-> SW1.2 SW1.1 <-> SW1.4 diff --git a/diylc-regression-data/input/cloud/netlist/417_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/417_incl_switches.txt index 8ed7792ef..e35a116c2 100644 --- a/diylc-regression-data/input/cloud/netlist/417_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/417_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [SW1.ON1] +Switch setup: [ SW1.ON1 ] - J1.Sleeve <-> Seymour Duncan.South Start <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.South Start <-> VR1.1 J1.Tip <-> VR1.2 Seymour Duncan.North Finish <-> Seymour Duncan.South Finish - Seymour Duncan.North Start <-> VR1.1 + Seymour Duncan.North Start <-> VR1.3 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] - J1.Sleeve <-> Seymour Duncan.North Finish <-> Seymour Duncan.South Start <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.North Finish <-> Seymour Duncan.South Start <-> VR1.1 J1.Tip <-> VR1.2 - Seymour Duncan.North Start <-> Seymour Duncan.South Finish <-> VR1.1 + Seymour Duncan.North Start <-> Seymour Duncan.South Finish <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/418_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/418_excl_switches.txt index 5d2da5cb1..f9522ace3 100644 --- a/diylc-regression-data/input/cloud/netlist/418_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/418_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - J1.Sleeve <-> Seymour Duncan.South Start <-> SW1.3 <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.South Start <-> SW1.3 <-> VR1.1 J1.Tip <-> VR1.2 Seymour Duncan.North Finish <-> Seymour Duncan.South Finish <-> SW1.2 - Seymour Duncan.North Start <-> VR1.1 + Seymour Duncan.North Start <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/418_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/418_incl_switches.txt index 5eec35228..34125a656 100644 --- a/diylc-regression-data/input/cloud/netlist/418_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/418_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [SW1.ON1] +Switch setup: [ SW1.ON1 ] - J1.Sleeve <-> Seymour Duncan.South Start <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.South Start <-> VR1.1 J1.Tip <-> VR1.2 Seymour Duncan.North Finish <-> Seymour Duncan.South Finish - Seymour Duncan.North Start <-> VR1.1 + Seymour Duncan.North Start <-> VR1.3 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] - J1.Sleeve <-> Seymour Duncan.North Finish <-> Seymour Duncan.South Finish <-> Seymour Duncan.South Start <-> VR1.3 + J1.Sleeve <-> Seymour Duncan.North Finish <-> Seymour Duncan.South Finish <-> Seymour Duncan.South Start <-> VR1.1 J1.Tip <-> VR1.2 - Seymour Duncan.North Start <-> VR1.1 + Seymour Duncan.North Start <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt index b87821393..cc9480a99 100644 --- a/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt @@ -1,7 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - +12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> Arduino Nano.22 <-> Arduino Nano.23 <-> Arduino Nano.24 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3 - Arduino Nano.1 <-> Arduino Nano.16 - Arduino Nano.17 <-> Arduino Nano.2 - Arduino Nano.18 <-> Arduino Nano.3 + +12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3 diff --git a/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt index b87821393..cc9480a99 100644 --- a/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt @@ -1,7 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - +12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> Arduino Nano.22 <-> Arduino Nano.23 <-> Arduino Nano.24 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3 - Arduino Nano.1 <-> Arduino Nano.16 - Arduino Nano.17 <-> Arduino Nano.2 - Arduino Nano.18 <-> Arduino Nano.3 + +12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.A <-> D1.K <-> D2.A <-> D2.K <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3 diff --git a/diylc-regression-data/input/cloud/netlist/41_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/41_excl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/cloud/netlist/41_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/41_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/41_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/41_incl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/cloud/netlist/41_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/41_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/42_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/42_excl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/cloud/netlist/42_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/42_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/42_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/42_incl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/cloud/netlist/42_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/42_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/cloud/netlist/43_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/43_excl_switches.txt index b3204cab9..67cfced3e 100644 --- a/diylc-regression-data/input/cloud/netlist/43_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/43_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> C6.2 <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> C6.- <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 C3.1 <-> R4.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.1 <-> Q2.2 <-> R10.1 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.1 <-> Q2.2 <-> R10.1 C7.1 <-> R9.2 C7.2 <-> R11.2 - D1.1 <-> Q1.3 <-> R3.2 - D2.1 <-> Q2.3 <-> R8.1 + D1.A <-> Q1.3 <-> R3.2 + D2.A <-> Q2.3 <-> R8.1 R11.1 <-> R12.1 R3.1 <-> R4.1 <-> R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/43_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/43_incl_switches.txt index b3204cab9..67cfced3e 100644 --- a/diylc-regression-data/input/cloud/netlist/43_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/43_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> C6.2 <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> C6.- <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 C3.1 <-> R4.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.1 <-> Q2.2 <-> R10.1 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.1 <-> Q2.2 <-> R10.1 C7.1 <-> R9.2 C7.2 <-> R11.2 - D1.1 <-> Q1.3 <-> R3.2 - D2.1 <-> Q2.3 <-> R8.1 + D1.A <-> Q1.3 <-> R3.2 + D2.A <-> Q2.3 <-> R8.1 R11.1 <-> R12.1 R3.1 <-> R4.1 <-> R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/44_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/44_excl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/cloud/netlist/44_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/44_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/44_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/44_incl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/cloud/netlist/44_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/44_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/45_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/45_excl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/cloud/netlist/45_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/45_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/45_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/45_incl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/cloud/netlist/45_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/45_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/46_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/46_excl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/cloud/netlist/46_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/46_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/46_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/46_incl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/cloud/netlist/46_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/46_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/47_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/47_excl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/cloud/netlist/47_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/47_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/47_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/47_incl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/cloud/netlist/47_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/47_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/48_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/48_excl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/cloud/netlist/48_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/48_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/48_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/48_incl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/cloud/netlist/48_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/48_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/49_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/49_excl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/cloud/netlist/49_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/49_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/49_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/49_incl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/cloud/netlist/49_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/49_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/50_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/50_excl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/cloud/netlist/50_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/50_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/50_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/50_incl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/cloud/netlist/50_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/50_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/51_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/51_excl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/cloud/netlist/51_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/51_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/51_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/51_incl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/cloud/netlist/51_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/51_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/52_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/52_excl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/cloud/netlist/52_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/52_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/52_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/52_incl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/cloud/netlist/52_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/52_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/53_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/53_excl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/cloud/netlist/53_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/53_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/53_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/53_incl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/cloud/netlist/53_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/53_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/cloud/netlist/54_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/54_excl_switches.txt index e4debad29..e70af1248 100644 --- a/diylc-regression-data/input/cloud/netlist/54_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/54_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 - Q2.1 <-> VR1.1 <-> VR1.2 - Q2.2 <-> Q2.3 <-> R1.1 + Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 + Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/54_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/54_incl_switches.txt index e4debad29..e70af1248 100644 --- a/diylc-regression-data/input/cloud/netlist/54_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/54_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 - Q2.1 <-> VR1.1 <-> VR1.2 - Q2.2 <-> Q2.3 <-> R1.1 + Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 + Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/55_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/55_excl_switches.txt index e4debad29..e70af1248 100644 --- a/diylc-regression-data/input/cloud/netlist/55_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/55_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 - Q2.1 <-> VR1.1 <-> VR1.2 - Q2.2 <-> Q2.3 <-> R1.1 + Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 + Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/55_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/55_incl_switches.txt index e4debad29..e70af1248 100644 --- a/diylc-regression-data/input/cloud/netlist/55_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/55_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 - Q2.1 <-> VR1.1 <-> VR1.2 - Q2.2 <-> Q2.3 <-> R1.1 + Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 + Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/cloud/netlist/56_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/56_excl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/cloud/netlist/56_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/56_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/56_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/56_incl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/cloud/netlist/56_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/56_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/57_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/57_excl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/cloud/netlist/57_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/57_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/57_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/57_incl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/cloud/netlist/57_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/57_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/58_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/58_excl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/cloud/netlist/58_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/58_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/58_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/58_incl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/cloud/netlist/58_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/58_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/59_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/59_excl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/cloud/netlist/59_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/59_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/59_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/59_incl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/cloud/netlist/59_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/59_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/60_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/60_excl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/cloud/netlist/60_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/60_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/60_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/60_incl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/cloud/netlist/60_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/60_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/61_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/61_excl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/cloud/netlist/61_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/61_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/61_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/61_incl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/cloud/netlist/61_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/61_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/cloud/netlist/62_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/62_excl_switches.txt index da706757f..3f4dd2cd7 100644 --- a/diylc-regression-data/input/cloud/netlist/62_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/62_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 - C3.1 <-> Q2.1 <-> Q2.2 <-> R2.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 - Q2.3 <-> R5.2 <-> R6.1 + Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 Q3.3 <-> R8.1 Q4.2 <-> Q4.3 diff --git a/diylc-regression-data/input/cloud/netlist/62_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/62_incl_switches.txt index da706757f..3f4dd2cd7 100644 --- a/diylc-regression-data/input/cloud/netlist/62_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/62_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 - C3.1 <-> Q2.1 <-> Q2.2 <-> R2.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 - Q2.3 <-> R5.2 <-> R6.1 + Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 Q3.3 <-> R8.1 Q4.2 <-> Q4.3 diff --git a/diylc-regression-data/input/cloud/netlist/63_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/63_excl_switches.txt index da706757f..3f4dd2cd7 100644 --- a/diylc-regression-data/input/cloud/netlist/63_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/63_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 - C3.1 <-> Q2.1 <-> Q2.2 <-> R2.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 - Q2.3 <-> R5.2 <-> R6.1 + Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 Q3.3 <-> R8.1 Q4.2 <-> Q4.3 diff --git a/diylc-regression-data/input/cloud/netlist/63_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/63_incl_switches.txt index da706757f..3f4dd2cd7 100644 --- a/diylc-regression-data/input/cloud/netlist/63_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/63_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 - C3.1 <-> Q2.1 <-> Q2.2 <-> R2.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 - Q2.3 <-> R5.2 <-> R6.1 + Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 Q3.3 <-> R8.1 Q4.2 <-> Q4.3 diff --git a/diylc-regression-data/input/cloud/netlist/64_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/64_excl_switches.txt index f944499ec..af7854155 100644 --- a/diylc-regression-data/input/cloud/netlist/64_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/64_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 - Q1.3 <-> R2.2 <-> R8.2 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 Q3.2 <-> Q3.3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/64_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/64_incl_switches.txt index f944499ec..af7854155 100644 --- a/diylc-regression-data/input/cloud/netlist/64_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/64_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 - Q1.3 <-> R2.2 <-> R8.2 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 Q3.2 <-> Q3.3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/65_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/65_excl_switches.txt index f944499ec..af7854155 100644 --- a/diylc-regression-data/input/cloud/netlist/65_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/65_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 - Q1.3 <-> R2.2 <-> R8.2 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 Q3.2 <-> Q3.3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/65_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/65_incl_switches.txt index f944499ec..af7854155 100644 --- a/diylc-regression-data/input/cloud/netlist/65_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/65_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 - Q1.3 <-> R2.2 <-> R8.2 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 Q3.2 <-> Q3.3 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/66_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/66_excl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/cloud/netlist/66_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/66_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/66_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/66_incl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/cloud/netlist/66_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/66_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/67_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/67_excl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/cloud/netlist/67_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/67_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/67_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/67_incl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/cloud/netlist/67_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/67_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/cloud/netlist/68_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/68_excl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/cloud/netlist/68_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/68_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/68_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/68_incl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/cloud/netlist/68_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/68_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/69_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/69_excl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/cloud/netlist/69_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/69_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/69_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/69_incl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/cloud/netlist/69_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/69_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/70_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/70_excl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/cloud/netlist/70_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/70_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/70_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/70_incl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/cloud/netlist/70_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/70_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/71_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/71_excl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/cloud/netlist/71_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/71_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/71_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/71_incl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/cloud/netlist/71_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/71_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/cloud/netlist/72_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/72_excl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/cloud/netlist/72_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/72_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/72_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/72_incl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/cloud/netlist/72_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/72_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/73_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/73_excl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/cloud/netlist/73_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/73_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/73_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/73_incl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/cloud/netlist/73_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/73_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/74_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/74_excl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/cloud/netlist/74_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/74_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/74_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/74_incl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/cloud/netlist/74_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/74_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/75_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/75_excl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/cloud/netlist/75_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/75_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/75_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/75_incl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/cloud/netlist/75_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/75_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/cloud/netlist/76_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/76_excl_switches.txt index 9fd932944..7d3d1f6f1 100644 --- a/diylc-regression-data/input/cloud/netlist/76_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/76_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 + C1.2 <-> D1.A <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R2.2 <-> R4.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 - C3.2 <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> Q2.2 <-> Q2.3 <-> R6.1 + C3.- <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C4.1 <-> Q2.1 <-> VR1.3 C4.2 <-> R7.2 C5.2 <-> R7.1 - D1.2 <-> R3.1 + D1.K <-> R3.1 R4.2 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/76_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/76_incl_switches.txt index 9fd932944..7d3d1f6f1 100644 --- a/diylc-regression-data/input/cloud/netlist/76_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/76_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 + C1.2 <-> D1.A <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R2.2 <-> R4.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 - C3.2 <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> Q2.2 <-> Q2.3 <-> R6.1 + C3.- <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C4.1 <-> Q2.1 <-> VR1.3 C4.2 <-> R7.2 C5.2 <-> R7.1 - D1.2 <-> R3.1 + D1.K <-> R3.1 R4.2 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/77_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/77_excl_switches.txt index e862b7649..a3d279e98 100644 --- a/diylc-regression-data/input/cloud/netlist/77_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/77_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 - C3.2 <-> C4.2 <-> Q2.1 <-> Q2.2 <-> R2.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/77_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/77_incl_switches.txt index e862b7649..a3d279e98 100644 --- a/diylc-regression-data/input/cloud/netlist/77_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/77_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 - C3.2 <-> C4.2 <-> Q2.1 <-> Q2.2 <-> R2.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/78_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/78_excl_switches.txt index e862b7649..a3d279e98 100644 --- a/diylc-regression-data/input/cloud/netlist/78_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/78_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 - C3.2 <-> C4.2 <-> Q2.1 <-> Q2.2 <-> R2.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/78_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/78_incl_switches.txt index e862b7649..a3d279e98 100644 --- a/diylc-regression-data/input/cloud/netlist/78_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/78_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 - C3.2 <-> C4.2 <-> Q2.1 <-> Q2.2 <-> R2.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/cloud/netlist/79_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/79_excl_switches.txt index 2aa7c7a79..2ac0c54ee 100644 --- a/diylc-regression-data/input/cloud/netlist/79_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/79_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R3.1 <-> R4.2 - C2.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C2.+ <-> R2.1 <-> R3.1 <-> R4.2 + C2.- <-> C5.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/79_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/79_incl_switches.txt index 2aa7c7a79..2ac0c54ee 100644 --- a/diylc-regression-data/input/cloud/netlist/79_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/79_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R3.1 <-> R4.2 - C2.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C2.+ <-> R2.1 <-> R3.1 <-> R4.2 + C2.- <-> C5.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/80_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/80_excl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/cloud/netlist/80_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/80_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/80_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/80_incl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/cloud/netlist/80_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/80_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/81_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/81_excl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/cloud/netlist/81_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/81_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/81_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/81_incl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/cloud/netlist/81_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/81_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/82_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/82_excl_switches.txt index 13200d511..9a6b8714d 100644 --- a/diylc-regression-data/input/cloud/netlist/82_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/82_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R2.2 - C1.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 + C1.2 <-> C6.2 <-> C7.- <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 C2.2 <-> R3.2 C3.1 <-> Q1.3 <-> R4.1 C3.2 <-> R5.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C4.2 <-> C9.2 <-> R8.2 C5.1 <-> Q2.1 <-> VR1.1 C5.2 <-> R6.1 - C7.1 <-> Q3.2 <-> Q3.3 <-> R7.1 + C7.+ <-> Q3.2 <-> Q3.3 <-> R7.1 C8.1 <-> R8.1 C8.2 <-> Q3.1 <-> VR2.1 Q1.1 <-> Q1.2 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/82_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/82_incl_switches.txt index 13200d511..9a6b8714d 100644 --- a/diylc-regression-data/input/cloud/netlist/82_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/82_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R2.2 - C1.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 + C1.2 <-> C6.2 <-> C7.- <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 C2.2 <-> R3.2 C3.1 <-> Q1.3 <-> R4.1 C3.2 <-> R5.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C4.2 <-> C9.2 <-> R8.2 C5.1 <-> Q2.1 <-> VR1.1 C5.2 <-> R6.1 - C7.1 <-> Q3.2 <-> Q3.3 <-> R7.1 + C7.+ <-> Q3.2 <-> Q3.3 <-> R7.1 C8.1 <-> R8.1 C8.2 <-> Q3.1 <-> VR2.1 Q1.1 <-> Q1.2 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/83_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/83_excl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/cloud/netlist/83_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/83_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/83_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/83_incl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/cloud/netlist/83_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/83_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/84_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/84_excl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/cloud/netlist/84_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/84_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/84_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/84_incl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/cloud/netlist/84_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/84_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/cloud/netlist/85_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/85_excl_switches.txt index 8c8f9d792..36f4ac5c3 100644 --- a/diylc-regression-data/input/cloud/netlist/85_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/85_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R6.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R6.1 C3.1 <-> Q2.3 <-> R9.1 C3.2 <-> R10.2 - C4.1 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 - C4.2 <-> R8.2 - C5.1 <-> R10.1 <-> R12.1 <-> R9.2 - C5.2 <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 - C7.1 <-> R11.2 - D1.2 <-> R12.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 + C4.- <-> R8.2 + C5.+ <-> R10.1 <-> R12.1 <-> R9.2 + C5.- <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 + C7.+ <-> R11.2 + D1.K <-> R12.2 Q1.3 <-> R2.2 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/85_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/85_incl_switches.txt index 8c8f9d792..36f4ac5c3 100644 --- a/diylc-regression-data/input/cloud/netlist/85_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/85_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R6.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R6.1 C3.1 <-> Q2.3 <-> R9.1 C3.2 <-> R10.2 - C4.1 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 - C4.2 <-> R8.2 - C5.1 <-> R10.1 <-> R12.1 <-> R9.2 - C5.2 <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 - C7.1 <-> R11.2 - D1.2 <-> R12.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 + C4.- <-> R8.2 + C5.+ <-> R10.1 <-> R12.1 <-> R9.2 + C5.- <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 + C7.+ <-> R11.2 + D1.K <-> R12.2 Q1.3 <-> R2.2 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/cloud/netlist/86_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/86_excl_switches.txt index adaf6d3f9..6120c2ff1 100644 --- a/diylc-regression-data/input/cloud/netlist/86_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/86_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> R10.2 <-> R4.1 <-> R7.1 - C2.2 <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C3.2 <-> R6.1 + C2.+ <-> R10.2 <-> R4.1 <-> R7.1 + C2.- <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C3.- <-> R6.1 C4.1 <-> Q2.3 <-> R4.2 - C4.2 <-> C6.1 <-> R7.2 - C5.1 <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 - C5.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 - D1.2 <-> R10.1 + C4.2 <-> C6.+ <-> R7.2 + C5.+ <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 + C5.- <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 + D1.K <-> R10.1 Q1.3 <-> R2.2 <-> R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/86_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/86_incl_switches.txt index adaf6d3f9..6120c2ff1 100644 --- a/diylc-regression-data/input/cloud/netlist/86_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/86_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> R10.2 <-> R4.1 <-> R7.1 - C2.2 <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C3.2 <-> R6.1 + C2.+ <-> R10.2 <-> R4.1 <-> R7.1 + C2.- <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C3.- <-> R6.1 C4.1 <-> Q2.3 <-> R4.2 - C4.2 <-> C6.1 <-> R7.2 - C5.1 <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 - C5.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 - D1.2 <-> R10.1 + C4.2 <-> C6.+ <-> R7.2 + C5.+ <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 + C5.- <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 + D1.K <-> R10.1 Q1.3 <-> R2.2 <-> R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/cloud/netlist/87_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/87_excl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/cloud/netlist/87_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/87_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/87_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/87_incl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/cloud/netlist/87_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/87_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/88_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/88_excl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/cloud/netlist/88_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/88_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/88_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/88_incl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/cloud/netlist/88_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/88_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/cloud/netlist/89_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/89_excl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/cloud/netlist/89_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/89_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/89_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/89_incl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/cloud/netlist/89_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/89_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/90_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/90_excl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/cloud/netlist/90_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/90_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/90_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/90_incl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/cloud/netlist/90_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/90_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/91_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/91_excl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/cloud/netlist/91_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/91_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/cloud/netlist/91_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/91_incl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/cloud/netlist/91_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/91_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/cloud/netlist/92_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/92_excl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/cloud/netlist/92_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/92_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/cloud/netlist/92_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/92_incl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/cloud/netlist/92_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/92_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/cloud/netlist/93_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/93_excl_switches.txt index ad4c86186..bad8a6704 100644 --- a/diylc-regression-data/input/cloud/netlist/93_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/93_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 - .3 <-> C3.1 C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 C2.1 <-> Q1.1 <-> VR1.3 + C3.1 <-> S1.3 + Q1.2 <-> Q1.3 <-> S1.2 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/93_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/93_incl_switches.txt index 1bed75932..50eb7801c 100644 --- a/diylc-regression-data/input/cloud/netlist/93_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/93_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [.ON1] +Switch setup: [ S1.ON1 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 @@ -6,7 +6,7 @@ Switch setup: [.ON1] Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 -Switch setup: [.ON2] +Switch setup: [ S1.ON2 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/94_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/94_excl_switches.txt index ad4c86186..bad8a6704 100644 --- a/diylc-regression-data/input/cloud/netlist/94_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/94_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 - .3 <-> C3.1 C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 C2.1 <-> Q1.1 <-> VR1.3 + C3.1 <-> S1.3 + Q1.2 <-> Q1.3 <-> S1.2 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/94_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/94_incl_switches.txt index 1bed75932..50eb7801c 100644 --- a/diylc-regression-data/input/cloud/netlist/94_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/94_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [.ON1] +Switch setup: [ S1.ON1 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 @@ -6,7 +6,7 @@ Switch setup: [.ON1] Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 -Switch setup: [.ON2] +Switch setup: [ S1.ON2 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/95_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/95_excl_switches.txt index 23f393fcb..a2a5c08ad 100644 --- a/diylc-regression-data/input/cloud/netlist/95_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/95_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 + C1.2 <-> C3.- <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 C2.2 <-> Q1.1 <-> VR1.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R5.1 + C3.+ <-> Q2.2 <-> Q2.3 <-> R5.1 C4.2 <-> Q2.1 <-> VR3.1 Q1.2 <-> Q1.3 <-> VR2.2 <-> VR2.3 R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/95_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/95_incl_switches.txt index 23f393fcb..a2a5c08ad 100644 --- a/diylc-regression-data/input/cloud/netlist/95_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/95_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 + C1.2 <-> C3.- <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 C2.2 <-> Q1.1 <-> VR1.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R5.1 + C3.+ <-> Q2.2 <-> Q2.3 <-> R5.1 C4.2 <-> Q2.1 <-> VR3.1 Q1.2 <-> Q1.3 <-> VR2.2 <-> VR2.3 R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/cloud/netlist/96_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/96_excl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/cloud/netlist/96_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/96_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/96_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/96_incl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/cloud/netlist/96_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/96_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/97_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/97_excl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/cloud/netlist/97_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/97_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/97_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/97_incl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/cloud/netlist/97_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/97_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/cloud/netlist/98_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/98_excl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/cloud/netlist/98_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/98_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/98_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/98_incl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/cloud/netlist/98_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/98_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/99_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/99_excl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/cloud/netlist/99_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/99_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/netlist/99_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/99_incl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/cloud/netlist/99_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/99_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/cloud/png/100.png b/diylc-regression-data/input/cloud/png/100.png index 5df0a96ba..04ed38f39 100644 Binary files a/diylc-regression-data/input/cloud/png/100.png and b/diylc-regression-data/input/cloud/png/100.png differ diff --git a/diylc-regression-data/input/cloud/png/101.png b/diylc-regression-data/input/cloud/png/101.png index f509f7da1..96c5d11d2 100644 Binary files a/diylc-regression-data/input/cloud/png/101.png and b/diylc-regression-data/input/cloud/png/101.png differ diff --git a/diylc-regression-data/input/cloud/png/102.png b/diylc-regression-data/input/cloud/png/102.png index c8e146210..dbed293ff 100644 Binary files a/diylc-regression-data/input/cloud/png/102.png and b/diylc-regression-data/input/cloud/png/102.png differ diff --git a/diylc-regression-data/input/cloud/png/103.png b/diylc-regression-data/input/cloud/png/103.png index b77f936f9..ce2f5aae3 100644 Binary files a/diylc-regression-data/input/cloud/png/103.png and b/diylc-regression-data/input/cloud/png/103.png differ diff --git a/diylc-regression-data/input/cloud/png/104.png b/diylc-regression-data/input/cloud/png/104.png index e83210a2c..881a34613 100644 Binary files a/diylc-regression-data/input/cloud/png/104.png and b/diylc-regression-data/input/cloud/png/104.png differ diff --git a/diylc-regression-data/input/cloud/png/105.png b/diylc-regression-data/input/cloud/png/105.png index 591e0b13e..bd6baae64 100644 Binary files a/diylc-regression-data/input/cloud/png/105.png and b/diylc-regression-data/input/cloud/png/105.png differ diff --git a/diylc-regression-data/input/cloud/png/106.png b/diylc-regression-data/input/cloud/png/106.png index 10e4d76fc..20c930c65 100644 Binary files a/diylc-regression-data/input/cloud/png/106.png and b/diylc-regression-data/input/cloud/png/106.png differ diff --git a/diylc-regression-data/input/cloud/png/107.png b/diylc-regression-data/input/cloud/png/107.png index a6adadece..6deee1f90 100644 Binary files a/diylc-regression-data/input/cloud/png/107.png and b/diylc-regression-data/input/cloud/png/107.png differ diff --git a/diylc-regression-data/input/cloud/png/108.png b/diylc-regression-data/input/cloud/png/108.png index 418f39b3e..1c59762e5 100644 Binary files a/diylc-regression-data/input/cloud/png/108.png and b/diylc-regression-data/input/cloud/png/108.png differ diff --git a/diylc-regression-data/input/cloud/png/109.png b/diylc-regression-data/input/cloud/png/109.png index 9f9f258b0..46a94f85b 100644 Binary files a/diylc-regression-data/input/cloud/png/109.png and b/diylc-regression-data/input/cloud/png/109.png differ diff --git a/diylc-regression-data/input/cloud/png/110.png b/diylc-regression-data/input/cloud/png/110.png index c246a7012..94c385030 100644 Binary files a/diylc-regression-data/input/cloud/png/110.png and b/diylc-regression-data/input/cloud/png/110.png differ diff --git a/diylc-regression-data/input/cloud/png/111.png b/diylc-regression-data/input/cloud/png/111.png index 149830bfd..9ebd86273 100644 Binary files a/diylc-regression-data/input/cloud/png/111.png and b/diylc-regression-data/input/cloud/png/111.png differ diff --git a/diylc-regression-data/input/cloud/png/112.png b/diylc-regression-data/input/cloud/png/112.png index 9176aa377..7088a2d34 100644 Binary files a/diylc-regression-data/input/cloud/png/112.png and b/diylc-regression-data/input/cloud/png/112.png differ diff --git a/diylc-regression-data/input/cloud/png/113.png b/diylc-regression-data/input/cloud/png/113.png index de30d457c..e96213c17 100644 Binary files a/diylc-regression-data/input/cloud/png/113.png and b/diylc-regression-data/input/cloud/png/113.png differ diff --git a/diylc-regression-data/input/cloud/png/114.png b/diylc-regression-data/input/cloud/png/114.png index d8cb49e6e..0cceec419 100644 Binary files a/diylc-regression-data/input/cloud/png/114.png and b/diylc-regression-data/input/cloud/png/114.png differ diff --git a/diylc-regression-data/input/cloud/png/115.png b/diylc-regression-data/input/cloud/png/115.png index bc5d2747a..ee37070f6 100644 Binary files a/diylc-regression-data/input/cloud/png/115.png and b/diylc-regression-data/input/cloud/png/115.png differ diff --git a/diylc-regression-data/input/cloud/png/116.png b/diylc-regression-data/input/cloud/png/116.png index 249517180..b2fcaccb1 100644 Binary files a/diylc-regression-data/input/cloud/png/116.png and b/diylc-regression-data/input/cloud/png/116.png differ diff --git a/diylc-regression-data/input/cloud/png/117.png b/diylc-regression-data/input/cloud/png/117.png index eb1bdd249..e414faec9 100644 Binary files a/diylc-regression-data/input/cloud/png/117.png and b/diylc-regression-data/input/cloud/png/117.png differ diff --git a/diylc-regression-data/input/cloud/png/118.png b/diylc-regression-data/input/cloud/png/118.png index 9a1fa56a9..d3930a449 100644 Binary files a/diylc-regression-data/input/cloud/png/118.png and b/diylc-regression-data/input/cloud/png/118.png differ diff --git a/diylc-regression-data/input/cloud/png/119.png b/diylc-regression-data/input/cloud/png/119.png index d12a54be9..a3bce59ec 100644 Binary files a/diylc-regression-data/input/cloud/png/119.png and b/diylc-regression-data/input/cloud/png/119.png differ diff --git a/diylc-regression-data/input/cloud/png/120.png b/diylc-regression-data/input/cloud/png/120.png index 9e263b140..205886dbc 100644 Binary files a/diylc-regression-data/input/cloud/png/120.png and b/diylc-regression-data/input/cloud/png/120.png differ diff --git a/diylc-regression-data/input/cloud/png/121.png b/diylc-regression-data/input/cloud/png/121.png index 3f9bf4d36..07f5839b6 100644 Binary files a/diylc-regression-data/input/cloud/png/121.png and b/diylc-regression-data/input/cloud/png/121.png differ diff --git a/diylc-regression-data/input/cloud/png/122.png b/diylc-regression-data/input/cloud/png/122.png index 23fb8750a..18a94cf95 100644 Binary files a/diylc-regression-data/input/cloud/png/122.png and b/diylc-regression-data/input/cloud/png/122.png differ diff --git a/diylc-regression-data/input/cloud/png/123.png b/diylc-regression-data/input/cloud/png/123.png index 4ee0aad9e..944a561ac 100644 Binary files a/diylc-regression-data/input/cloud/png/123.png and b/diylc-regression-data/input/cloud/png/123.png differ diff --git a/diylc-regression-data/input/cloud/png/124.png b/diylc-regression-data/input/cloud/png/124.png index 21d0c3019..41e47eb38 100644 Binary files a/diylc-regression-data/input/cloud/png/124.png and b/diylc-regression-data/input/cloud/png/124.png differ diff --git a/diylc-regression-data/input/cloud/png/125.png b/diylc-regression-data/input/cloud/png/125.png index 70b9a9267..06746ed94 100644 Binary files a/diylc-regression-data/input/cloud/png/125.png and b/diylc-regression-data/input/cloud/png/125.png differ diff --git a/diylc-regression-data/input/cloud/png/126.png b/diylc-regression-data/input/cloud/png/126.png index 03c27f7c5..59e755c55 100644 Binary files a/diylc-regression-data/input/cloud/png/126.png and b/diylc-regression-data/input/cloud/png/126.png differ diff --git a/diylc-regression-data/input/cloud/png/127.png b/diylc-regression-data/input/cloud/png/127.png index a1b71c0aa..4a04185f0 100644 Binary files a/diylc-regression-data/input/cloud/png/127.png and b/diylc-regression-data/input/cloud/png/127.png differ diff --git a/diylc-regression-data/input/cloud/png/128.png b/diylc-regression-data/input/cloud/png/128.png index 0ab9e3394..b9bf631f3 100644 Binary files a/diylc-regression-data/input/cloud/png/128.png and b/diylc-regression-data/input/cloud/png/128.png differ diff --git a/diylc-regression-data/input/cloud/png/129.png b/diylc-regression-data/input/cloud/png/129.png index 2c2437021..724e9bf66 100644 Binary files a/diylc-regression-data/input/cloud/png/129.png and b/diylc-regression-data/input/cloud/png/129.png differ diff --git a/diylc-regression-data/input/cloud/png/130.png b/diylc-regression-data/input/cloud/png/130.png index c7bd8fbdb..17e6f03c3 100644 Binary files a/diylc-regression-data/input/cloud/png/130.png and b/diylc-regression-data/input/cloud/png/130.png differ diff --git a/diylc-regression-data/input/cloud/png/131.png b/diylc-regression-data/input/cloud/png/131.png index 4aa2c12da..4b112a132 100644 Binary files a/diylc-regression-data/input/cloud/png/131.png and b/diylc-regression-data/input/cloud/png/131.png differ diff --git a/diylc-regression-data/input/cloud/png/132.png b/diylc-regression-data/input/cloud/png/132.png index f7f914221..999dfa52c 100644 Binary files a/diylc-regression-data/input/cloud/png/132.png and b/diylc-regression-data/input/cloud/png/132.png differ diff --git a/diylc-regression-data/input/cloud/png/133.png b/diylc-regression-data/input/cloud/png/133.png index f834bd4bc..9565d4d7f 100644 Binary files a/diylc-regression-data/input/cloud/png/133.png and b/diylc-regression-data/input/cloud/png/133.png differ diff --git a/diylc-regression-data/input/cloud/png/134.png b/diylc-regression-data/input/cloud/png/134.png index 80b0488ca..0965dfc4a 100644 Binary files a/diylc-regression-data/input/cloud/png/134.png and b/diylc-regression-data/input/cloud/png/134.png differ diff --git a/diylc-regression-data/input/cloud/png/135.png b/diylc-regression-data/input/cloud/png/135.png index 54349c20d..8c20819eb 100644 Binary files a/diylc-regression-data/input/cloud/png/135.png and b/diylc-regression-data/input/cloud/png/135.png differ diff --git a/diylc-regression-data/input/cloud/png/136.png b/diylc-regression-data/input/cloud/png/136.png index 58978c789..74988580e 100644 Binary files a/diylc-regression-data/input/cloud/png/136.png and b/diylc-regression-data/input/cloud/png/136.png differ diff --git a/diylc-regression-data/input/cloud/png/137.png b/diylc-regression-data/input/cloud/png/137.png index 9b287ade0..b65cabe82 100644 Binary files a/diylc-regression-data/input/cloud/png/137.png and b/diylc-regression-data/input/cloud/png/137.png differ diff --git a/diylc-regression-data/input/cloud/png/138.png b/diylc-regression-data/input/cloud/png/138.png index 58978c789..74988580e 100644 Binary files a/diylc-regression-data/input/cloud/png/138.png and b/diylc-regression-data/input/cloud/png/138.png differ diff --git a/diylc-regression-data/input/cloud/png/139.png b/diylc-regression-data/input/cloud/png/139.png index f43c5850f..49b29ea64 100644 Binary files a/diylc-regression-data/input/cloud/png/139.png and b/diylc-regression-data/input/cloud/png/139.png differ diff --git a/diylc-regression-data/input/cloud/png/140.png b/diylc-regression-data/input/cloud/png/140.png index ccc8634f7..ef24d15a6 100644 Binary files a/diylc-regression-data/input/cloud/png/140.png and b/diylc-regression-data/input/cloud/png/140.png differ diff --git a/diylc-regression-data/input/cloud/png/141.png b/diylc-regression-data/input/cloud/png/141.png index 0be29f33c..caa4454a2 100644 Binary files a/diylc-regression-data/input/cloud/png/141.png and b/diylc-regression-data/input/cloud/png/141.png differ diff --git a/diylc-regression-data/input/cloud/png/142.png b/diylc-regression-data/input/cloud/png/142.png index d8e0f51c2..dd20d3390 100644 Binary files a/diylc-regression-data/input/cloud/png/142.png and b/diylc-regression-data/input/cloud/png/142.png differ diff --git a/diylc-regression-data/input/cloud/png/143.png b/diylc-regression-data/input/cloud/png/143.png index 060bc0056..bdb58d238 100644 Binary files a/diylc-regression-data/input/cloud/png/143.png and b/diylc-regression-data/input/cloud/png/143.png differ diff --git a/diylc-regression-data/input/cloud/png/144.png b/diylc-regression-data/input/cloud/png/144.png index 748bd863e..255aaa35c 100644 Binary files a/diylc-regression-data/input/cloud/png/144.png and b/diylc-regression-data/input/cloud/png/144.png differ diff --git a/diylc-regression-data/input/cloud/png/145.png b/diylc-regression-data/input/cloud/png/145.png index 1a2c21b44..5ccbb8bca 100644 Binary files a/diylc-regression-data/input/cloud/png/145.png and b/diylc-regression-data/input/cloud/png/145.png differ diff --git a/diylc-regression-data/input/cloud/png/146.png b/diylc-regression-data/input/cloud/png/146.png index 5b1cb9010..f907d3ea6 100644 Binary files a/diylc-regression-data/input/cloud/png/146.png and b/diylc-regression-data/input/cloud/png/146.png differ diff --git a/diylc-regression-data/input/cloud/png/147.png b/diylc-regression-data/input/cloud/png/147.png index ac662e090..bbe6b4a5e 100644 Binary files a/diylc-regression-data/input/cloud/png/147.png and b/diylc-regression-data/input/cloud/png/147.png differ diff --git a/diylc-regression-data/input/cloud/png/148.png b/diylc-regression-data/input/cloud/png/148.png index cb1bddb2f..7738c879a 100644 Binary files a/diylc-regression-data/input/cloud/png/148.png and b/diylc-regression-data/input/cloud/png/148.png differ diff --git a/diylc-regression-data/input/cloud/png/149.png b/diylc-regression-data/input/cloud/png/149.png index 234687dfb..3c82aa904 100644 Binary files a/diylc-regression-data/input/cloud/png/149.png and b/diylc-regression-data/input/cloud/png/149.png differ diff --git a/diylc-regression-data/input/cloud/png/150.png b/diylc-regression-data/input/cloud/png/150.png index 8dfa228f4..cfbb2e7b2 100644 Binary files a/diylc-regression-data/input/cloud/png/150.png and b/diylc-regression-data/input/cloud/png/150.png differ diff --git a/diylc-regression-data/input/cloud/png/151.png b/diylc-regression-data/input/cloud/png/151.png index 023fcd96e..afaecc493 100644 Binary files a/diylc-regression-data/input/cloud/png/151.png and b/diylc-regression-data/input/cloud/png/151.png differ diff --git a/diylc-regression-data/input/cloud/png/152.png b/diylc-regression-data/input/cloud/png/152.png index d53801264..9d4c0f448 100644 Binary files a/diylc-regression-data/input/cloud/png/152.png and b/diylc-regression-data/input/cloud/png/152.png differ diff --git a/diylc-regression-data/input/cloud/png/153.png b/diylc-regression-data/input/cloud/png/153.png index 7f4262eac..70fbc7d28 100644 Binary files a/diylc-regression-data/input/cloud/png/153.png and b/diylc-regression-data/input/cloud/png/153.png differ diff --git a/diylc-regression-data/input/cloud/png/154.png b/diylc-regression-data/input/cloud/png/154.png index 23e42bbb2..b8d6eede9 100644 Binary files a/diylc-regression-data/input/cloud/png/154.png and b/diylc-regression-data/input/cloud/png/154.png differ diff --git a/diylc-regression-data/input/cloud/png/155.png b/diylc-regression-data/input/cloud/png/155.png index cabc2820d..aa505a7b9 100644 Binary files a/diylc-regression-data/input/cloud/png/155.png and b/diylc-regression-data/input/cloud/png/155.png differ diff --git a/diylc-regression-data/input/cloud/png/156.png b/diylc-regression-data/input/cloud/png/156.png index 3c5a76eb8..e54f81ec2 100644 Binary files a/diylc-regression-data/input/cloud/png/156.png and b/diylc-regression-data/input/cloud/png/156.png differ diff --git a/diylc-regression-data/input/cloud/png/157.png b/diylc-regression-data/input/cloud/png/157.png index aaa1cb3e0..b2aaf6ce5 100644 Binary files a/diylc-regression-data/input/cloud/png/157.png and b/diylc-regression-data/input/cloud/png/157.png differ diff --git a/diylc-regression-data/input/cloud/png/158.png b/diylc-regression-data/input/cloud/png/158.png index c4fccc9a3..58c6eea70 100644 Binary files a/diylc-regression-data/input/cloud/png/158.png and b/diylc-regression-data/input/cloud/png/158.png differ diff --git a/diylc-regression-data/input/cloud/png/159.png b/diylc-regression-data/input/cloud/png/159.png index ada2ecb38..a8bc668d6 100644 Binary files a/diylc-regression-data/input/cloud/png/159.png and b/diylc-regression-data/input/cloud/png/159.png differ diff --git a/diylc-regression-data/input/cloud/png/160.png b/diylc-regression-data/input/cloud/png/160.png index 385a46a66..aa61997ff 100644 Binary files a/diylc-regression-data/input/cloud/png/160.png and b/diylc-regression-data/input/cloud/png/160.png differ diff --git a/diylc-regression-data/input/cloud/png/161.png b/diylc-regression-data/input/cloud/png/161.png index 4a5c0cd4f..4bfafeea7 100644 Binary files a/diylc-regression-data/input/cloud/png/161.png and b/diylc-regression-data/input/cloud/png/161.png differ diff --git a/diylc-regression-data/input/cloud/png/162.png b/diylc-regression-data/input/cloud/png/162.png index 9585c2250..9efafb7a6 100644 Binary files a/diylc-regression-data/input/cloud/png/162.png and b/diylc-regression-data/input/cloud/png/162.png differ diff --git a/diylc-regression-data/input/cloud/png/163.png b/diylc-regression-data/input/cloud/png/163.png index 0adec5efe..109ff9fed 100644 Binary files a/diylc-regression-data/input/cloud/png/163.png and b/diylc-regression-data/input/cloud/png/163.png differ diff --git a/diylc-regression-data/input/cloud/png/164.png b/diylc-regression-data/input/cloud/png/164.png index 5172275ff..13d8b04c2 100644 Binary files a/diylc-regression-data/input/cloud/png/164.png and b/diylc-regression-data/input/cloud/png/164.png differ diff --git a/diylc-regression-data/input/cloud/png/165.png b/diylc-regression-data/input/cloud/png/165.png index 5e536d13d..10dbcf7e7 100644 Binary files a/diylc-regression-data/input/cloud/png/165.png and b/diylc-regression-data/input/cloud/png/165.png differ diff --git a/diylc-regression-data/input/cloud/png/166.png b/diylc-regression-data/input/cloud/png/166.png index ecdb34c9a..5d4644da5 100644 Binary files a/diylc-regression-data/input/cloud/png/166.png and b/diylc-regression-data/input/cloud/png/166.png differ diff --git a/diylc-regression-data/input/cloud/png/167.png b/diylc-regression-data/input/cloud/png/167.png index 1ad10a690..335bc3518 100644 Binary files a/diylc-regression-data/input/cloud/png/167.png and b/diylc-regression-data/input/cloud/png/167.png differ diff --git a/diylc-regression-data/input/cloud/png/168.png b/diylc-regression-data/input/cloud/png/168.png index 4e9cc1123..776a62b07 100644 Binary files a/diylc-regression-data/input/cloud/png/168.png and b/diylc-regression-data/input/cloud/png/168.png differ diff --git a/diylc-regression-data/input/cloud/png/169.png b/diylc-regression-data/input/cloud/png/169.png index e34a531a8..8d34c0ffa 100644 Binary files a/diylc-regression-data/input/cloud/png/169.png and b/diylc-regression-data/input/cloud/png/169.png differ diff --git a/diylc-regression-data/input/cloud/png/170.png b/diylc-regression-data/input/cloud/png/170.png index 2bf4a681d..77e0883bd 100644 Binary files a/diylc-regression-data/input/cloud/png/170.png and b/diylc-regression-data/input/cloud/png/170.png differ diff --git a/diylc-regression-data/input/cloud/png/171.png b/diylc-regression-data/input/cloud/png/171.png index 21e167633..290339406 100644 Binary files a/diylc-regression-data/input/cloud/png/171.png and b/diylc-regression-data/input/cloud/png/171.png differ diff --git a/diylc-regression-data/input/cloud/png/172.png b/diylc-regression-data/input/cloud/png/172.png index e370f574a..e032e9f5d 100644 Binary files a/diylc-regression-data/input/cloud/png/172.png and b/diylc-regression-data/input/cloud/png/172.png differ diff --git a/diylc-regression-data/input/cloud/png/173.png b/diylc-regression-data/input/cloud/png/173.png index 4dcc67494..06205f17b 100644 Binary files a/diylc-regression-data/input/cloud/png/173.png and b/diylc-regression-data/input/cloud/png/173.png differ diff --git a/diylc-regression-data/input/cloud/png/174.png b/diylc-regression-data/input/cloud/png/174.png index 34a222fcd..822faec83 100644 Binary files a/diylc-regression-data/input/cloud/png/174.png and b/diylc-regression-data/input/cloud/png/174.png differ diff --git a/diylc-regression-data/input/cloud/png/175.png b/diylc-regression-data/input/cloud/png/175.png index 1b89a7a56..ff63f074f 100644 Binary files a/diylc-regression-data/input/cloud/png/175.png and b/diylc-regression-data/input/cloud/png/175.png differ diff --git a/diylc-regression-data/input/cloud/png/176.png b/diylc-regression-data/input/cloud/png/176.png index 179060aad..73511efb6 100644 Binary files a/diylc-regression-data/input/cloud/png/176.png and b/diylc-regression-data/input/cloud/png/176.png differ diff --git a/diylc-regression-data/input/cloud/png/177.png b/diylc-regression-data/input/cloud/png/177.png index 87f300cf2..10f01d8d5 100644 Binary files a/diylc-regression-data/input/cloud/png/177.png and b/diylc-regression-data/input/cloud/png/177.png differ diff --git a/diylc-regression-data/input/cloud/png/178.png b/diylc-regression-data/input/cloud/png/178.png index a28e3ed10..7d892d478 100644 Binary files a/diylc-regression-data/input/cloud/png/178.png and b/diylc-regression-data/input/cloud/png/178.png differ diff --git a/diylc-regression-data/input/cloud/png/179.png b/diylc-regression-data/input/cloud/png/179.png index 3ced17885..c910db030 100644 Binary files a/diylc-regression-data/input/cloud/png/179.png and b/diylc-regression-data/input/cloud/png/179.png differ diff --git a/diylc-regression-data/input/cloud/png/180.png b/diylc-regression-data/input/cloud/png/180.png index 669df8635..77693bc5b 100644 Binary files a/diylc-regression-data/input/cloud/png/180.png and b/diylc-regression-data/input/cloud/png/180.png differ diff --git a/diylc-regression-data/input/cloud/png/181.png b/diylc-regression-data/input/cloud/png/181.png index 393f22a9a..f5c429182 100644 Binary files a/diylc-regression-data/input/cloud/png/181.png and b/diylc-regression-data/input/cloud/png/181.png differ diff --git a/diylc-regression-data/input/cloud/png/182.png b/diylc-regression-data/input/cloud/png/182.png index 69175d376..a36893678 100644 Binary files a/diylc-regression-data/input/cloud/png/182.png and b/diylc-regression-data/input/cloud/png/182.png differ diff --git a/diylc-regression-data/input/cloud/png/183.png b/diylc-regression-data/input/cloud/png/183.png index 932dfa273..efafdabbc 100644 Binary files a/diylc-regression-data/input/cloud/png/183.png and b/diylc-regression-data/input/cloud/png/183.png differ diff --git a/diylc-regression-data/input/cloud/png/184.png b/diylc-regression-data/input/cloud/png/184.png index 9b9487d4c..8249d9099 100644 Binary files a/diylc-regression-data/input/cloud/png/184.png and b/diylc-regression-data/input/cloud/png/184.png differ diff --git a/diylc-regression-data/input/cloud/png/185.png b/diylc-regression-data/input/cloud/png/185.png index eaa3fc568..07956ee14 100644 Binary files a/diylc-regression-data/input/cloud/png/185.png and b/diylc-regression-data/input/cloud/png/185.png differ diff --git a/diylc-regression-data/input/cloud/png/186.png b/diylc-regression-data/input/cloud/png/186.png index 8295cbc12..0a0eb6fd2 100644 Binary files a/diylc-regression-data/input/cloud/png/186.png and b/diylc-regression-data/input/cloud/png/186.png differ diff --git a/diylc-regression-data/input/cloud/png/187.png b/diylc-regression-data/input/cloud/png/187.png index be0400c68..6b0066eb0 100644 Binary files a/diylc-regression-data/input/cloud/png/187.png and b/diylc-regression-data/input/cloud/png/187.png differ diff --git a/diylc-regression-data/input/cloud/png/188.png b/diylc-regression-data/input/cloud/png/188.png index 761cc5589..b47399176 100644 Binary files a/diylc-regression-data/input/cloud/png/188.png and b/diylc-regression-data/input/cloud/png/188.png differ diff --git a/diylc-regression-data/input/cloud/png/189.png b/diylc-regression-data/input/cloud/png/189.png index a2332647d..8362309b5 100644 Binary files a/diylc-regression-data/input/cloud/png/189.png and b/diylc-regression-data/input/cloud/png/189.png differ diff --git a/diylc-regression-data/input/cloud/png/190.png b/diylc-regression-data/input/cloud/png/190.png index 8e3b0bacf..676dd08b5 100644 Binary files a/diylc-regression-data/input/cloud/png/190.png and b/diylc-regression-data/input/cloud/png/190.png differ diff --git a/diylc-regression-data/input/cloud/png/191.png b/diylc-regression-data/input/cloud/png/191.png index 1b39bc897..b707428d5 100644 Binary files a/diylc-regression-data/input/cloud/png/191.png and b/diylc-regression-data/input/cloud/png/191.png differ diff --git a/diylc-regression-data/input/cloud/png/192.png b/diylc-regression-data/input/cloud/png/192.png index 3807b4d01..fa62c7d46 100644 Binary files a/diylc-regression-data/input/cloud/png/192.png and b/diylc-regression-data/input/cloud/png/192.png differ diff --git a/diylc-regression-data/input/cloud/png/193.png b/diylc-regression-data/input/cloud/png/193.png index 89cd344b7..42fb01a30 100644 Binary files a/diylc-regression-data/input/cloud/png/193.png and b/diylc-regression-data/input/cloud/png/193.png differ diff --git a/diylc-regression-data/input/cloud/png/194.png b/diylc-regression-data/input/cloud/png/194.png index 00fb5a32c..885731bbf 100644 Binary files a/diylc-regression-data/input/cloud/png/194.png and b/diylc-regression-data/input/cloud/png/194.png differ diff --git a/diylc-regression-data/input/cloud/png/195.png b/diylc-regression-data/input/cloud/png/195.png index a7ab3ba25..6088db890 100644 Binary files a/diylc-regression-data/input/cloud/png/195.png and b/diylc-regression-data/input/cloud/png/195.png differ diff --git a/diylc-regression-data/input/cloud/png/196.png b/diylc-regression-data/input/cloud/png/196.png index 06a724be2..85fdec58a 100644 Binary files a/diylc-regression-data/input/cloud/png/196.png and b/diylc-regression-data/input/cloud/png/196.png differ diff --git a/diylc-regression-data/input/cloud/png/197.png b/diylc-regression-data/input/cloud/png/197.png index 095aae970..bbb917d0b 100644 Binary files a/diylc-regression-data/input/cloud/png/197.png and b/diylc-regression-data/input/cloud/png/197.png differ diff --git a/diylc-regression-data/input/cloud/png/198.png b/diylc-regression-data/input/cloud/png/198.png index 9c7afbd18..7b5fa4148 100644 Binary files a/diylc-regression-data/input/cloud/png/198.png and b/diylc-regression-data/input/cloud/png/198.png differ diff --git a/diylc-regression-data/input/cloud/png/199.png b/diylc-regression-data/input/cloud/png/199.png index 44d6a752d..26226b00e 100644 Binary files a/diylc-regression-data/input/cloud/png/199.png and b/diylc-regression-data/input/cloud/png/199.png differ diff --git a/diylc-regression-data/input/cloud/png/200.png b/diylc-regression-data/input/cloud/png/200.png index 3313f3fd4..3f613908a 100644 Binary files a/diylc-regression-data/input/cloud/png/200.png and b/diylc-regression-data/input/cloud/png/200.png differ diff --git a/diylc-regression-data/input/cloud/png/201.png b/diylc-regression-data/input/cloud/png/201.png index 1470e2159..93f718b6a 100644 Binary files a/diylc-regression-data/input/cloud/png/201.png and b/diylc-regression-data/input/cloud/png/201.png differ diff --git a/diylc-regression-data/input/cloud/png/202.png b/diylc-regression-data/input/cloud/png/202.png index a6cacc95b..c10b874e1 100644 Binary files a/diylc-regression-data/input/cloud/png/202.png and b/diylc-regression-data/input/cloud/png/202.png differ diff --git a/diylc-regression-data/input/cloud/png/203.png b/diylc-regression-data/input/cloud/png/203.png index 22eb437bc..201f9692e 100644 Binary files a/diylc-regression-data/input/cloud/png/203.png and b/diylc-regression-data/input/cloud/png/203.png differ diff --git a/diylc-regression-data/input/cloud/png/204.png b/diylc-regression-data/input/cloud/png/204.png index ba222d619..9f468034e 100644 Binary files a/diylc-regression-data/input/cloud/png/204.png and b/diylc-regression-data/input/cloud/png/204.png differ diff --git a/diylc-regression-data/input/cloud/png/205.png b/diylc-regression-data/input/cloud/png/205.png index a6cacc95b..c10b874e1 100644 Binary files a/diylc-regression-data/input/cloud/png/205.png and b/diylc-regression-data/input/cloud/png/205.png differ diff --git a/diylc-regression-data/input/cloud/png/206.png b/diylc-regression-data/input/cloud/png/206.png index e85139066..07fc27d14 100644 Binary files a/diylc-regression-data/input/cloud/png/206.png and b/diylc-regression-data/input/cloud/png/206.png differ diff --git a/diylc-regression-data/input/cloud/png/207.png b/diylc-regression-data/input/cloud/png/207.png index 242fae831..8fb766c6d 100644 Binary files a/diylc-regression-data/input/cloud/png/207.png and b/diylc-regression-data/input/cloud/png/207.png differ diff --git a/diylc-regression-data/input/cloud/png/208.png b/diylc-regression-data/input/cloud/png/208.png index c928968c6..ee2d0d472 100644 Binary files a/diylc-regression-data/input/cloud/png/208.png and b/diylc-regression-data/input/cloud/png/208.png differ diff --git a/diylc-regression-data/input/cloud/png/209.png b/diylc-regression-data/input/cloud/png/209.png index 762f3efee..742d73e13 100644 Binary files a/diylc-regression-data/input/cloud/png/209.png and b/diylc-regression-data/input/cloud/png/209.png differ diff --git a/diylc-regression-data/input/cloud/png/210.png b/diylc-regression-data/input/cloud/png/210.png index d45dccb90..177531d4f 100644 Binary files a/diylc-regression-data/input/cloud/png/210.png and b/diylc-regression-data/input/cloud/png/210.png differ diff --git a/diylc-regression-data/input/cloud/png/211.png b/diylc-regression-data/input/cloud/png/211.png index 65f2f30fc..38b9d66f1 100644 Binary files a/diylc-regression-data/input/cloud/png/211.png and b/diylc-regression-data/input/cloud/png/211.png differ diff --git a/diylc-regression-data/input/cloud/png/212.png b/diylc-regression-data/input/cloud/png/212.png index 10b1a7919..c676f0c62 100644 Binary files a/diylc-regression-data/input/cloud/png/212.png and b/diylc-regression-data/input/cloud/png/212.png differ diff --git a/diylc-regression-data/input/cloud/png/213.png b/diylc-regression-data/input/cloud/png/213.png index 0dde7ed8a..0e130f01b 100644 Binary files a/diylc-regression-data/input/cloud/png/213.png and b/diylc-regression-data/input/cloud/png/213.png differ diff --git a/diylc-regression-data/input/cloud/png/214.png b/diylc-regression-data/input/cloud/png/214.png index 7acde3373..33b78afd8 100644 Binary files a/diylc-regression-data/input/cloud/png/214.png and b/diylc-regression-data/input/cloud/png/214.png differ diff --git a/diylc-regression-data/input/cloud/png/215.png b/diylc-regression-data/input/cloud/png/215.png index 47504fbb4..127b0c401 100644 Binary files a/diylc-regression-data/input/cloud/png/215.png and b/diylc-regression-data/input/cloud/png/215.png differ diff --git a/diylc-regression-data/input/cloud/png/216.png b/diylc-regression-data/input/cloud/png/216.png index 1ee57a1d8..e967a702c 100644 Binary files a/diylc-regression-data/input/cloud/png/216.png and b/diylc-regression-data/input/cloud/png/216.png differ diff --git a/diylc-regression-data/input/cloud/png/217.png b/diylc-regression-data/input/cloud/png/217.png index 24a083b4d..8363d1386 100644 Binary files a/diylc-regression-data/input/cloud/png/217.png and b/diylc-regression-data/input/cloud/png/217.png differ diff --git a/diylc-regression-data/input/cloud/png/218.png b/diylc-regression-data/input/cloud/png/218.png index 24c772fd5..2aa8c9a8c 100644 Binary files a/diylc-regression-data/input/cloud/png/218.png and b/diylc-regression-data/input/cloud/png/218.png differ diff --git a/diylc-regression-data/input/cloud/png/219.png b/diylc-regression-data/input/cloud/png/219.png index c1f80e677..3b17f1201 100644 Binary files a/diylc-regression-data/input/cloud/png/219.png and b/diylc-regression-data/input/cloud/png/219.png differ diff --git a/diylc-regression-data/input/cloud/png/220.png b/diylc-regression-data/input/cloud/png/220.png index a6cacc95b..c10b874e1 100644 Binary files a/diylc-regression-data/input/cloud/png/220.png and b/diylc-regression-data/input/cloud/png/220.png differ diff --git a/diylc-regression-data/input/cloud/png/221.png b/diylc-regression-data/input/cloud/png/221.png index 1ad9ed604..134697e38 100644 Binary files a/diylc-regression-data/input/cloud/png/221.png and b/diylc-regression-data/input/cloud/png/221.png differ diff --git a/diylc-regression-data/input/cloud/png/222.png b/diylc-regression-data/input/cloud/png/222.png index 5aaf6e2fa..7d04249db 100644 Binary files a/diylc-regression-data/input/cloud/png/222.png and b/diylc-regression-data/input/cloud/png/222.png differ diff --git a/diylc-regression-data/input/cloud/png/223.png b/diylc-regression-data/input/cloud/png/223.png index 80d42c925..1eac67525 100644 Binary files a/diylc-regression-data/input/cloud/png/223.png and b/diylc-regression-data/input/cloud/png/223.png differ diff --git a/diylc-regression-data/input/cloud/png/224.png b/diylc-regression-data/input/cloud/png/224.png index e3fd37b92..48fdffa11 100644 Binary files a/diylc-regression-data/input/cloud/png/224.png and b/diylc-regression-data/input/cloud/png/224.png differ diff --git a/diylc-regression-data/input/cloud/png/225.png b/diylc-regression-data/input/cloud/png/225.png index 0cd4797f9..f9f9dfb6f 100644 Binary files a/diylc-regression-data/input/cloud/png/225.png and b/diylc-regression-data/input/cloud/png/225.png differ diff --git a/diylc-regression-data/input/cloud/png/226.png b/diylc-regression-data/input/cloud/png/226.png index 7abf25fa7..6271e1ab6 100644 Binary files a/diylc-regression-data/input/cloud/png/226.png and b/diylc-regression-data/input/cloud/png/226.png differ diff --git a/diylc-regression-data/input/cloud/png/227.png b/diylc-regression-data/input/cloud/png/227.png index 893b30191..c27e8399d 100644 Binary files a/diylc-regression-data/input/cloud/png/227.png and b/diylc-regression-data/input/cloud/png/227.png differ diff --git a/diylc-regression-data/input/cloud/png/228.png b/diylc-regression-data/input/cloud/png/228.png index 265ac3148..b01265c48 100644 Binary files a/diylc-regression-data/input/cloud/png/228.png and b/diylc-regression-data/input/cloud/png/228.png differ diff --git a/diylc-regression-data/input/cloud/png/229.png b/diylc-regression-data/input/cloud/png/229.png index 21e271fc2..4f75ed2e2 100644 Binary files a/diylc-regression-data/input/cloud/png/229.png and b/diylc-regression-data/input/cloud/png/229.png differ diff --git a/diylc-regression-data/input/cloud/png/230.png b/diylc-regression-data/input/cloud/png/230.png index 9f27a4a5c..f1fa18466 100644 Binary files a/diylc-regression-data/input/cloud/png/230.png and b/diylc-regression-data/input/cloud/png/230.png differ diff --git a/diylc-regression-data/input/cloud/png/231.png b/diylc-regression-data/input/cloud/png/231.png index 3f1499158..b0c0a4777 100644 Binary files a/diylc-regression-data/input/cloud/png/231.png and b/diylc-regression-data/input/cloud/png/231.png differ diff --git a/diylc-regression-data/input/cloud/png/232.png b/diylc-regression-data/input/cloud/png/232.png index 5bdacc1bc..32420fab1 100644 Binary files a/diylc-regression-data/input/cloud/png/232.png and b/diylc-regression-data/input/cloud/png/232.png differ diff --git a/diylc-regression-data/input/cloud/png/233.png b/diylc-regression-data/input/cloud/png/233.png index 5bdacc1bc..32420fab1 100644 Binary files a/diylc-regression-data/input/cloud/png/233.png and b/diylc-regression-data/input/cloud/png/233.png differ diff --git a/diylc-regression-data/input/cloud/png/234.png b/diylc-regression-data/input/cloud/png/234.png index 5c4abd7aa..164ee1982 100644 Binary files a/diylc-regression-data/input/cloud/png/234.png and b/diylc-regression-data/input/cloud/png/234.png differ diff --git a/diylc-regression-data/input/cloud/png/235.png b/diylc-regression-data/input/cloud/png/235.png index 1a006d86d..6fb16881d 100644 Binary files a/diylc-regression-data/input/cloud/png/235.png and b/diylc-regression-data/input/cloud/png/235.png differ diff --git a/diylc-regression-data/input/cloud/png/236.png b/diylc-regression-data/input/cloud/png/236.png index d474c21bc..51a0cc890 100644 Binary files a/diylc-regression-data/input/cloud/png/236.png and b/diylc-regression-data/input/cloud/png/236.png differ diff --git a/diylc-regression-data/input/cloud/png/237.png b/diylc-regression-data/input/cloud/png/237.png index fb45eb22d..ea0c196e1 100644 Binary files a/diylc-regression-data/input/cloud/png/237.png and b/diylc-regression-data/input/cloud/png/237.png differ diff --git a/diylc-regression-data/input/cloud/png/238.png b/diylc-regression-data/input/cloud/png/238.png index 19c31c2b2..b8108617f 100644 Binary files a/diylc-regression-data/input/cloud/png/238.png and b/diylc-regression-data/input/cloud/png/238.png differ diff --git a/diylc-regression-data/input/cloud/png/239.png b/diylc-regression-data/input/cloud/png/239.png index be3eeb399..d060969c3 100644 Binary files a/diylc-regression-data/input/cloud/png/239.png and b/diylc-regression-data/input/cloud/png/239.png differ diff --git a/diylc-regression-data/input/cloud/png/240.png b/diylc-regression-data/input/cloud/png/240.png index 972db8087..9258ec6f8 100644 Binary files a/diylc-regression-data/input/cloud/png/240.png and b/diylc-regression-data/input/cloud/png/240.png differ diff --git a/diylc-regression-data/input/cloud/png/241.png b/diylc-regression-data/input/cloud/png/241.png index d19ba49a3..851dfeeac 100644 Binary files a/diylc-regression-data/input/cloud/png/241.png and b/diylc-regression-data/input/cloud/png/241.png differ diff --git a/diylc-regression-data/input/cloud/png/242.png b/diylc-regression-data/input/cloud/png/242.png index d550109d4..a2c7e4563 100644 Binary files a/diylc-regression-data/input/cloud/png/242.png and b/diylc-regression-data/input/cloud/png/242.png differ diff --git a/diylc-regression-data/input/cloud/png/243.png b/diylc-regression-data/input/cloud/png/243.png index 4f3aa9987..2c8683c06 100644 Binary files a/diylc-regression-data/input/cloud/png/243.png and b/diylc-regression-data/input/cloud/png/243.png differ diff --git a/diylc-regression-data/input/cloud/png/244.png b/diylc-regression-data/input/cloud/png/244.png index 0cdc81ea4..2fa3f573b 100644 Binary files a/diylc-regression-data/input/cloud/png/244.png and b/diylc-regression-data/input/cloud/png/244.png differ diff --git a/diylc-regression-data/input/cloud/png/245.png b/diylc-regression-data/input/cloud/png/245.png index 8ee7cbe99..de906b2d5 100644 Binary files a/diylc-regression-data/input/cloud/png/245.png and b/diylc-regression-data/input/cloud/png/245.png differ diff --git a/diylc-regression-data/input/cloud/png/246.png b/diylc-regression-data/input/cloud/png/246.png index 607ea7312..9cf032ccf 100644 Binary files a/diylc-regression-data/input/cloud/png/246.png and b/diylc-regression-data/input/cloud/png/246.png differ diff --git a/diylc-regression-data/input/cloud/png/247.png b/diylc-regression-data/input/cloud/png/247.png index 990d46dd1..84ee474e5 100644 Binary files a/diylc-regression-data/input/cloud/png/247.png and b/diylc-regression-data/input/cloud/png/247.png differ diff --git a/diylc-regression-data/input/cloud/png/248.png b/diylc-regression-data/input/cloud/png/248.png index ce1bc3ea6..df1f6dece 100644 Binary files a/diylc-regression-data/input/cloud/png/248.png and b/diylc-regression-data/input/cloud/png/248.png differ diff --git a/diylc-regression-data/input/cloud/png/249.png b/diylc-regression-data/input/cloud/png/249.png index a961ecf30..1782076d1 100644 Binary files a/diylc-regression-data/input/cloud/png/249.png and b/diylc-regression-data/input/cloud/png/249.png differ diff --git a/diylc-regression-data/input/cloud/png/250.png b/diylc-regression-data/input/cloud/png/250.png index 101aac2ee..f55e393df 100644 Binary files a/diylc-regression-data/input/cloud/png/250.png and b/diylc-regression-data/input/cloud/png/250.png differ diff --git a/diylc-regression-data/input/cloud/png/251.png b/diylc-regression-data/input/cloud/png/251.png index 682754973..73fd73d03 100644 Binary files a/diylc-regression-data/input/cloud/png/251.png and b/diylc-regression-data/input/cloud/png/251.png differ diff --git a/diylc-regression-data/input/cloud/png/252.png b/diylc-regression-data/input/cloud/png/252.png index 15a291c1a..84fc60e74 100644 Binary files a/diylc-regression-data/input/cloud/png/252.png and b/diylc-regression-data/input/cloud/png/252.png differ diff --git a/diylc-regression-data/input/cloud/png/253.png b/diylc-regression-data/input/cloud/png/253.png index f43923d49..e6e55bb24 100644 Binary files a/diylc-regression-data/input/cloud/png/253.png and b/diylc-regression-data/input/cloud/png/253.png differ diff --git a/diylc-regression-data/input/cloud/png/254.png b/diylc-regression-data/input/cloud/png/254.png index c6f0583e6..09d683dff 100644 Binary files a/diylc-regression-data/input/cloud/png/254.png and b/diylc-regression-data/input/cloud/png/254.png differ diff --git a/diylc-regression-data/input/cloud/png/255.png b/diylc-regression-data/input/cloud/png/255.png index 14a7514e3..d7042a994 100644 Binary files a/diylc-regression-data/input/cloud/png/255.png and b/diylc-regression-data/input/cloud/png/255.png differ diff --git a/diylc-regression-data/input/cloud/png/256.png b/diylc-regression-data/input/cloud/png/256.png index 1e9df383c..e88d297fd 100644 Binary files a/diylc-regression-data/input/cloud/png/256.png and b/diylc-regression-data/input/cloud/png/256.png differ diff --git a/diylc-regression-data/input/cloud/png/257.png b/diylc-regression-data/input/cloud/png/257.png index 020c7dc62..e29e04d80 100644 Binary files a/diylc-regression-data/input/cloud/png/257.png and b/diylc-regression-data/input/cloud/png/257.png differ diff --git a/diylc-regression-data/input/cloud/png/258.png b/diylc-regression-data/input/cloud/png/258.png index cdcef5e31..9b931fffe 100644 Binary files a/diylc-regression-data/input/cloud/png/258.png and b/diylc-regression-data/input/cloud/png/258.png differ diff --git a/diylc-regression-data/input/cloud/png/259.png b/diylc-regression-data/input/cloud/png/259.png index 41945036d..822b9f288 100644 Binary files a/diylc-regression-data/input/cloud/png/259.png and b/diylc-regression-data/input/cloud/png/259.png differ diff --git a/diylc-regression-data/input/cloud/png/260.png b/diylc-regression-data/input/cloud/png/260.png index 72936d971..234e4a3a0 100644 Binary files a/diylc-regression-data/input/cloud/png/260.png and b/diylc-regression-data/input/cloud/png/260.png differ diff --git a/diylc-regression-data/input/cloud/png/261.png b/diylc-regression-data/input/cloud/png/261.png index 5114cb2b8..e979a0fef 100644 Binary files a/diylc-regression-data/input/cloud/png/261.png and b/diylc-regression-data/input/cloud/png/261.png differ diff --git a/diylc-regression-data/input/cloud/png/262.png b/diylc-regression-data/input/cloud/png/262.png index 29cd16544..55f54de13 100644 Binary files a/diylc-regression-data/input/cloud/png/262.png and b/diylc-regression-data/input/cloud/png/262.png differ diff --git a/diylc-regression-data/input/cloud/png/263.png b/diylc-regression-data/input/cloud/png/263.png index 013c8b3d9..5247f5783 100644 Binary files a/diylc-regression-data/input/cloud/png/263.png and b/diylc-regression-data/input/cloud/png/263.png differ diff --git a/diylc-regression-data/input/cloud/png/264.png b/diylc-regression-data/input/cloud/png/264.png index e914acf94..a12184c4c 100644 Binary files a/diylc-regression-data/input/cloud/png/264.png and b/diylc-regression-data/input/cloud/png/264.png differ diff --git a/diylc-regression-data/input/cloud/png/265.png b/diylc-regression-data/input/cloud/png/265.png index 41eb8fbcd..0326805f9 100644 Binary files a/diylc-regression-data/input/cloud/png/265.png and b/diylc-regression-data/input/cloud/png/265.png differ diff --git a/diylc-regression-data/input/cloud/png/266.png b/diylc-regression-data/input/cloud/png/266.png index a7219e492..28d771f48 100644 Binary files a/diylc-regression-data/input/cloud/png/266.png and b/diylc-regression-data/input/cloud/png/266.png differ diff --git a/diylc-regression-data/input/cloud/png/267.png b/diylc-regression-data/input/cloud/png/267.png index f1722dcad..64e044e53 100644 Binary files a/diylc-regression-data/input/cloud/png/267.png and b/diylc-regression-data/input/cloud/png/267.png differ diff --git a/diylc-regression-data/input/cloud/png/268.png b/diylc-regression-data/input/cloud/png/268.png index d3459afda..ec41ee0a5 100644 Binary files a/diylc-regression-data/input/cloud/png/268.png and b/diylc-regression-data/input/cloud/png/268.png differ diff --git a/diylc-regression-data/input/cloud/png/269.png b/diylc-regression-data/input/cloud/png/269.png index 364516213..59b14a909 100644 Binary files a/diylc-regression-data/input/cloud/png/269.png and b/diylc-regression-data/input/cloud/png/269.png differ diff --git a/diylc-regression-data/input/cloud/png/270.png b/diylc-regression-data/input/cloud/png/270.png index 364516213..59b14a909 100644 Binary files a/diylc-regression-data/input/cloud/png/270.png and b/diylc-regression-data/input/cloud/png/270.png differ diff --git a/diylc-regression-data/input/cloud/png/271.png b/diylc-regression-data/input/cloud/png/271.png index fecc7717b..b4c084b7d 100644 Binary files a/diylc-regression-data/input/cloud/png/271.png and b/diylc-regression-data/input/cloud/png/271.png differ diff --git a/diylc-regression-data/input/cloud/png/272.png b/diylc-regression-data/input/cloud/png/272.png index b635be57f..df37098ec 100644 Binary files a/diylc-regression-data/input/cloud/png/272.png and b/diylc-regression-data/input/cloud/png/272.png differ diff --git a/diylc-regression-data/input/cloud/png/273.png b/diylc-regression-data/input/cloud/png/273.png index 1a427bba8..386a19702 100644 Binary files a/diylc-regression-data/input/cloud/png/273.png and b/diylc-regression-data/input/cloud/png/273.png differ diff --git a/diylc-regression-data/input/cloud/png/274.png b/diylc-regression-data/input/cloud/png/274.png index 7c18e69dc..a9e710481 100644 Binary files a/diylc-regression-data/input/cloud/png/274.png and b/diylc-regression-data/input/cloud/png/274.png differ diff --git a/diylc-regression-data/input/cloud/png/275.png b/diylc-regression-data/input/cloud/png/275.png index 91983a1a7..74db8dd22 100644 Binary files a/diylc-regression-data/input/cloud/png/275.png and b/diylc-regression-data/input/cloud/png/275.png differ diff --git a/diylc-regression-data/input/cloud/png/276.png b/diylc-regression-data/input/cloud/png/276.png index 0a6b46dac..4a355acfd 100644 Binary files a/diylc-regression-data/input/cloud/png/276.png and b/diylc-regression-data/input/cloud/png/276.png differ diff --git a/diylc-regression-data/input/cloud/png/277.png b/diylc-regression-data/input/cloud/png/277.png index a612f574b..0404b6e51 100644 Binary files a/diylc-regression-data/input/cloud/png/277.png and b/diylc-regression-data/input/cloud/png/277.png differ diff --git a/diylc-regression-data/input/cloud/png/278.png b/diylc-regression-data/input/cloud/png/278.png index 51846f3b4..3dce6df13 100644 Binary files a/diylc-regression-data/input/cloud/png/278.png and b/diylc-regression-data/input/cloud/png/278.png differ diff --git a/diylc-regression-data/input/cloud/png/279.png b/diylc-regression-data/input/cloud/png/279.png index 63b7a3079..91f067f50 100644 Binary files a/diylc-regression-data/input/cloud/png/279.png and b/diylc-regression-data/input/cloud/png/279.png differ diff --git a/diylc-regression-data/input/cloud/png/280.png b/diylc-regression-data/input/cloud/png/280.png index 57711c38f..6237d1605 100644 Binary files a/diylc-regression-data/input/cloud/png/280.png and b/diylc-regression-data/input/cloud/png/280.png differ diff --git a/diylc-regression-data/input/cloud/png/281.png b/diylc-regression-data/input/cloud/png/281.png index 24adaadc4..2f6ac88ed 100644 Binary files a/diylc-regression-data/input/cloud/png/281.png and b/diylc-regression-data/input/cloud/png/281.png differ diff --git a/diylc-regression-data/input/cloud/png/282.png b/diylc-regression-data/input/cloud/png/282.png index 990d46dd1..84ee474e5 100644 Binary files a/diylc-regression-data/input/cloud/png/282.png and b/diylc-regression-data/input/cloud/png/282.png differ diff --git a/diylc-regression-data/input/cloud/png/283.png b/diylc-regression-data/input/cloud/png/283.png index 8d13e77ca..b4da15850 100644 Binary files a/diylc-regression-data/input/cloud/png/283.png and b/diylc-regression-data/input/cloud/png/283.png differ diff --git a/diylc-regression-data/input/cloud/png/284.png b/diylc-regression-data/input/cloud/png/284.png index a271f2c17..5fd0f1e12 100644 Binary files a/diylc-regression-data/input/cloud/png/284.png and b/diylc-regression-data/input/cloud/png/284.png differ diff --git a/diylc-regression-data/input/cloud/png/285.png b/diylc-regression-data/input/cloud/png/285.png index a71f98b2d..066f183b9 100644 Binary files a/diylc-regression-data/input/cloud/png/285.png and b/diylc-regression-data/input/cloud/png/285.png differ diff --git a/diylc-regression-data/input/cloud/png/286.png b/diylc-regression-data/input/cloud/png/286.png index c6daa8efd..8e1f4564e 100644 Binary files a/diylc-regression-data/input/cloud/png/286.png and b/diylc-regression-data/input/cloud/png/286.png differ diff --git a/diylc-regression-data/input/cloud/png/287.png b/diylc-regression-data/input/cloud/png/287.png index af08ae2c4..95e0765d9 100644 Binary files a/diylc-regression-data/input/cloud/png/287.png and b/diylc-regression-data/input/cloud/png/287.png differ diff --git a/diylc-regression-data/input/cloud/png/288.png b/diylc-regression-data/input/cloud/png/288.png index 42d5f3a3a..530f7b10c 100644 Binary files a/diylc-regression-data/input/cloud/png/288.png and b/diylc-regression-data/input/cloud/png/288.png differ diff --git a/diylc-regression-data/input/cloud/png/289.png b/diylc-regression-data/input/cloud/png/289.png index 663564fe2..a41720bbf 100644 Binary files a/diylc-regression-data/input/cloud/png/289.png and b/diylc-regression-data/input/cloud/png/289.png differ diff --git a/diylc-regression-data/input/cloud/png/290.png b/diylc-regression-data/input/cloud/png/290.png index 164987637..871c50d19 100644 Binary files a/diylc-regression-data/input/cloud/png/290.png and b/diylc-regression-data/input/cloud/png/290.png differ diff --git a/diylc-regression-data/input/cloud/png/291.png b/diylc-regression-data/input/cloud/png/291.png index 2b1e77c75..f989c26fd 100644 Binary files a/diylc-regression-data/input/cloud/png/291.png and b/diylc-regression-data/input/cloud/png/291.png differ diff --git a/diylc-regression-data/input/cloud/png/292.png b/diylc-regression-data/input/cloud/png/292.png index 58f14a993..bab137759 100644 Binary files a/diylc-regression-data/input/cloud/png/292.png and b/diylc-regression-data/input/cloud/png/292.png differ diff --git a/diylc-regression-data/input/cloud/png/293.png b/diylc-regression-data/input/cloud/png/293.png index 93b130f95..775a234a7 100644 Binary files a/diylc-regression-data/input/cloud/png/293.png and b/diylc-regression-data/input/cloud/png/293.png differ diff --git a/diylc-regression-data/input/cloud/png/294.png b/diylc-regression-data/input/cloud/png/294.png index 6dcee3b22..42cf31e34 100644 Binary files a/diylc-regression-data/input/cloud/png/294.png and b/diylc-regression-data/input/cloud/png/294.png differ diff --git a/diylc-regression-data/input/cloud/png/295.png b/diylc-regression-data/input/cloud/png/295.png index 66794b852..6b547bc5d 100644 Binary files a/diylc-regression-data/input/cloud/png/295.png and b/diylc-regression-data/input/cloud/png/295.png differ diff --git a/diylc-regression-data/input/cloud/png/296.png b/diylc-regression-data/input/cloud/png/296.png index 0e364371c..921cd19d4 100644 Binary files a/diylc-regression-data/input/cloud/png/296.png and b/diylc-regression-data/input/cloud/png/296.png differ diff --git a/diylc-regression-data/input/cloud/png/297.png b/diylc-regression-data/input/cloud/png/297.png index f0c46bce6..f035a3061 100644 Binary files a/diylc-regression-data/input/cloud/png/297.png and b/diylc-regression-data/input/cloud/png/297.png differ diff --git a/diylc-regression-data/input/cloud/png/298.png b/diylc-regression-data/input/cloud/png/298.png index 0eb081ef0..febcc990e 100644 Binary files a/diylc-regression-data/input/cloud/png/298.png and b/diylc-regression-data/input/cloud/png/298.png differ diff --git a/diylc-regression-data/input/cloud/png/299.png b/diylc-regression-data/input/cloud/png/299.png index ebf93fea9..a2a67b568 100644 Binary files a/diylc-regression-data/input/cloud/png/299.png and b/diylc-regression-data/input/cloud/png/299.png differ diff --git a/diylc-regression-data/input/cloud/png/300.png b/diylc-regression-data/input/cloud/png/300.png index dd6ae0458..b9da4b20f 100644 Binary files a/diylc-regression-data/input/cloud/png/300.png and b/diylc-regression-data/input/cloud/png/300.png differ diff --git a/diylc-regression-data/input/cloud/png/301.png b/diylc-regression-data/input/cloud/png/301.png index 4fac0d6e9..3c86deaaf 100644 Binary files a/diylc-regression-data/input/cloud/png/301.png and b/diylc-regression-data/input/cloud/png/301.png differ diff --git a/diylc-regression-data/input/cloud/png/302.png b/diylc-regression-data/input/cloud/png/302.png index b99d0dbd0..d21169c64 100644 Binary files a/diylc-regression-data/input/cloud/png/302.png and b/diylc-regression-data/input/cloud/png/302.png differ diff --git a/diylc-regression-data/input/cloud/png/303.png b/diylc-regression-data/input/cloud/png/303.png index 88a9c7328..231e0dee6 100644 Binary files a/diylc-regression-data/input/cloud/png/303.png and b/diylc-regression-data/input/cloud/png/303.png differ diff --git a/diylc-regression-data/input/cloud/png/304.png b/diylc-regression-data/input/cloud/png/304.png index e955b27b2..3a8e56f7c 100644 Binary files a/diylc-regression-data/input/cloud/png/304.png and b/diylc-regression-data/input/cloud/png/304.png differ diff --git a/diylc-regression-data/input/cloud/png/305.png b/diylc-regression-data/input/cloud/png/305.png index 3d1029b25..b13f11039 100644 Binary files a/diylc-regression-data/input/cloud/png/305.png and b/diylc-regression-data/input/cloud/png/305.png differ diff --git a/diylc-regression-data/input/cloud/png/306.png b/diylc-regression-data/input/cloud/png/306.png index c09615695..07da8ad68 100644 Binary files a/diylc-regression-data/input/cloud/png/306.png and b/diylc-regression-data/input/cloud/png/306.png differ diff --git a/diylc-regression-data/input/cloud/png/307.png b/diylc-regression-data/input/cloud/png/307.png index a8b73d84c..6f2536059 100644 Binary files a/diylc-regression-data/input/cloud/png/307.png and b/diylc-regression-data/input/cloud/png/307.png differ diff --git a/diylc-regression-data/input/cloud/png/308.png b/diylc-regression-data/input/cloud/png/308.png index 6c6420ed8..d62236092 100644 Binary files a/diylc-regression-data/input/cloud/png/308.png and b/diylc-regression-data/input/cloud/png/308.png differ diff --git a/diylc-regression-data/input/cloud/png/309.png b/diylc-regression-data/input/cloud/png/309.png index 270ed1238..73804c3bd 100644 Binary files a/diylc-regression-data/input/cloud/png/309.png and b/diylc-regression-data/input/cloud/png/309.png differ diff --git a/diylc-regression-data/input/cloud/png/310.png b/diylc-regression-data/input/cloud/png/310.png index d7b162e1c..84ee474e5 100644 Binary files a/diylc-regression-data/input/cloud/png/310.png and b/diylc-regression-data/input/cloud/png/310.png differ diff --git a/diylc-regression-data/input/cloud/png/311.png b/diylc-regression-data/input/cloud/png/311.png index 2459c8f70..84ee474e5 100644 Binary files a/diylc-regression-data/input/cloud/png/311.png and b/diylc-regression-data/input/cloud/png/311.png differ diff --git a/diylc-regression-data/input/cloud/png/312.png b/diylc-regression-data/input/cloud/png/312.png index c8a6d7fa8..0abf79298 100644 Binary files a/diylc-regression-data/input/cloud/png/312.png and b/diylc-regression-data/input/cloud/png/312.png differ diff --git a/diylc-regression-data/input/cloud/png/313.png b/diylc-regression-data/input/cloud/png/313.png index bd0731c9e..95ef66f09 100644 Binary files a/diylc-regression-data/input/cloud/png/313.png and b/diylc-regression-data/input/cloud/png/313.png differ diff --git a/diylc-regression-data/input/cloud/png/314.png b/diylc-regression-data/input/cloud/png/314.png index 064c37b40..3fc093a77 100644 Binary files a/diylc-regression-data/input/cloud/png/314.png and b/diylc-regression-data/input/cloud/png/314.png differ diff --git a/diylc-regression-data/input/cloud/png/315.png b/diylc-regression-data/input/cloud/png/315.png index 4ff5b67c8..85fd9b58c 100644 Binary files a/diylc-regression-data/input/cloud/png/315.png and b/diylc-regression-data/input/cloud/png/315.png differ diff --git a/diylc-regression-data/input/cloud/png/316.png b/diylc-regression-data/input/cloud/png/316.png index 70ccf9008..df797fe05 100644 Binary files a/diylc-regression-data/input/cloud/png/316.png and b/diylc-regression-data/input/cloud/png/316.png differ diff --git a/diylc-regression-data/input/cloud/png/317.png b/diylc-regression-data/input/cloud/png/317.png index 9cc155a2a..93fe0904b 100644 Binary files a/diylc-regression-data/input/cloud/png/317.png and b/diylc-regression-data/input/cloud/png/317.png differ diff --git a/diylc-regression-data/input/cloud/png/318.png b/diylc-regression-data/input/cloud/png/318.png index bed8d0e14..7e030d45d 100644 Binary files a/diylc-regression-data/input/cloud/png/318.png and b/diylc-regression-data/input/cloud/png/318.png differ diff --git a/diylc-regression-data/input/cloud/png/319.png b/diylc-regression-data/input/cloud/png/319.png index 881815ae0..63a13fcda 100644 Binary files a/diylc-regression-data/input/cloud/png/319.png and b/diylc-regression-data/input/cloud/png/319.png differ diff --git a/diylc-regression-data/input/cloud/png/320.png b/diylc-regression-data/input/cloud/png/320.png index f0d63d1a5..9e5b05aed 100644 Binary files a/diylc-regression-data/input/cloud/png/320.png and b/diylc-regression-data/input/cloud/png/320.png differ diff --git a/diylc-regression-data/input/cloud/png/321.png b/diylc-regression-data/input/cloud/png/321.png index f0d63d1a5..9e5b05aed 100644 Binary files a/diylc-regression-data/input/cloud/png/321.png and b/diylc-regression-data/input/cloud/png/321.png differ diff --git a/diylc-regression-data/input/cloud/png/322.png b/diylc-regression-data/input/cloud/png/322.png index 9a011132d..9d9d9609f 100644 Binary files a/diylc-regression-data/input/cloud/png/322.png and b/diylc-regression-data/input/cloud/png/322.png differ diff --git a/diylc-regression-data/input/cloud/png/323.png b/diylc-regression-data/input/cloud/png/323.png index fe974a4ba..003f1d23b 100644 Binary files a/diylc-regression-data/input/cloud/png/323.png and b/diylc-regression-data/input/cloud/png/323.png differ diff --git a/diylc-regression-data/input/cloud/png/324.png b/diylc-regression-data/input/cloud/png/324.png index 661655da7..4d2964ac9 100644 Binary files a/diylc-regression-data/input/cloud/png/324.png and b/diylc-regression-data/input/cloud/png/324.png differ diff --git a/diylc-regression-data/input/cloud/png/325.png b/diylc-regression-data/input/cloud/png/325.png index ee3661331..5e3f5438d 100644 Binary files a/diylc-regression-data/input/cloud/png/325.png and b/diylc-regression-data/input/cloud/png/325.png differ diff --git a/diylc-regression-data/input/cloud/png/326.png b/diylc-regression-data/input/cloud/png/326.png index 27555e410..8a7cccb51 100644 Binary files a/diylc-regression-data/input/cloud/png/326.png and b/diylc-regression-data/input/cloud/png/326.png differ diff --git a/diylc-regression-data/input/cloud/png/327.png b/diylc-regression-data/input/cloud/png/327.png index f59be6e33..be8afb129 100644 Binary files a/diylc-regression-data/input/cloud/png/327.png and b/diylc-regression-data/input/cloud/png/327.png differ diff --git a/diylc-regression-data/input/cloud/png/328.png b/diylc-regression-data/input/cloud/png/328.png index 876b97d40..be5feadf1 100644 Binary files a/diylc-regression-data/input/cloud/png/328.png and b/diylc-regression-data/input/cloud/png/328.png differ diff --git a/diylc-regression-data/input/cloud/png/329.png b/diylc-regression-data/input/cloud/png/329.png index c8d7ca637..547469ca5 100644 Binary files a/diylc-regression-data/input/cloud/png/329.png and b/diylc-regression-data/input/cloud/png/329.png differ diff --git a/diylc-regression-data/input/cloud/png/330.png b/diylc-regression-data/input/cloud/png/330.png index f15aa06ee..4bba1f4f7 100644 Binary files a/diylc-regression-data/input/cloud/png/330.png and b/diylc-regression-data/input/cloud/png/330.png differ diff --git a/diylc-regression-data/input/cloud/png/331.png b/diylc-regression-data/input/cloud/png/331.png index 808b43448..3b2678d5d 100644 Binary files a/diylc-regression-data/input/cloud/png/331.png and b/diylc-regression-data/input/cloud/png/331.png differ diff --git a/diylc-regression-data/input/cloud/png/332.png b/diylc-regression-data/input/cloud/png/332.png index 96daa31d4..ea6eac58d 100644 Binary files a/diylc-regression-data/input/cloud/png/332.png and b/diylc-regression-data/input/cloud/png/332.png differ diff --git a/diylc-regression-data/input/cloud/png/333.png b/diylc-regression-data/input/cloud/png/333.png index 72583398b..0c2d30537 100644 Binary files a/diylc-regression-data/input/cloud/png/333.png and b/diylc-regression-data/input/cloud/png/333.png differ diff --git a/diylc-regression-data/input/cloud/png/334.png b/diylc-regression-data/input/cloud/png/334.png index 3b119bd05..27ceb8e89 100644 Binary files a/diylc-regression-data/input/cloud/png/334.png and b/diylc-regression-data/input/cloud/png/334.png differ diff --git a/diylc-regression-data/input/cloud/png/335.png b/diylc-regression-data/input/cloud/png/335.png index a0b9a0d2c..72211ea39 100644 Binary files a/diylc-regression-data/input/cloud/png/335.png and b/diylc-regression-data/input/cloud/png/335.png differ diff --git a/diylc-regression-data/input/cloud/png/336.png b/diylc-regression-data/input/cloud/png/336.png index e66180362..1dac56696 100644 Binary files a/diylc-regression-data/input/cloud/png/336.png and b/diylc-regression-data/input/cloud/png/336.png differ diff --git a/diylc-regression-data/input/cloud/png/337.png b/diylc-regression-data/input/cloud/png/337.png index b74e71e55..75af90611 100644 Binary files a/diylc-regression-data/input/cloud/png/337.png and b/diylc-regression-data/input/cloud/png/337.png differ diff --git a/diylc-regression-data/input/cloud/png/338.png b/diylc-regression-data/input/cloud/png/338.png index 542f89951..fb79ef9a7 100644 Binary files a/diylc-regression-data/input/cloud/png/338.png and b/diylc-regression-data/input/cloud/png/338.png differ diff --git a/diylc-regression-data/input/cloud/png/339.png b/diylc-regression-data/input/cloud/png/339.png index 24dcd5ab0..f34bafb9a 100644 Binary files a/diylc-regression-data/input/cloud/png/339.png and b/diylc-regression-data/input/cloud/png/339.png differ diff --git a/diylc-regression-data/input/cloud/png/340.png b/diylc-regression-data/input/cloud/png/340.png index ed4f0876c..c37847261 100644 Binary files a/diylc-regression-data/input/cloud/png/340.png and b/diylc-regression-data/input/cloud/png/340.png differ diff --git a/diylc-regression-data/input/cloud/png/341.png b/diylc-regression-data/input/cloud/png/341.png index 3f10f2a67..9fca8f916 100644 Binary files a/diylc-regression-data/input/cloud/png/341.png and b/diylc-regression-data/input/cloud/png/341.png differ diff --git a/diylc-regression-data/input/cloud/png/342.png b/diylc-regression-data/input/cloud/png/342.png index fe2f0617b..9c52a068f 100644 Binary files a/diylc-regression-data/input/cloud/png/342.png and b/diylc-regression-data/input/cloud/png/342.png differ diff --git a/diylc-regression-data/input/cloud/png/343.png b/diylc-regression-data/input/cloud/png/343.png index 6cb607b3e..f4c25ae5c 100644 Binary files a/diylc-regression-data/input/cloud/png/343.png and b/diylc-regression-data/input/cloud/png/343.png differ diff --git a/diylc-regression-data/input/cloud/png/344.png b/diylc-regression-data/input/cloud/png/344.png index 6aae884ee..dbf22af71 100644 Binary files a/diylc-regression-data/input/cloud/png/344.png and b/diylc-regression-data/input/cloud/png/344.png differ diff --git a/diylc-regression-data/input/cloud/png/345.png b/diylc-regression-data/input/cloud/png/345.png index 1ad44101e..53a90f42e 100644 Binary files a/diylc-regression-data/input/cloud/png/345.png and b/diylc-regression-data/input/cloud/png/345.png differ diff --git a/diylc-regression-data/input/cloud/png/346.png b/diylc-regression-data/input/cloud/png/346.png index b15d827f9..c5f11fe77 100644 Binary files a/diylc-regression-data/input/cloud/png/346.png and b/diylc-regression-data/input/cloud/png/346.png differ diff --git a/diylc-regression-data/input/cloud/png/347.png b/diylc-regression-data/input/cloud/png/347.png index 990d46dd1..84ee474e5 100644 Binary files a/diylc-regression-data/input/cloud/png/347.png and b/diylc-regression-data/input/cloud/png/347.png differ diff --git a/diylc-regression-data/input/cloud/png/348.png b/diylc-regression-data/input/cloud/png/348.png index c4cf7c087..545cf6b9a 100644 Binary files a/diylc-regression-data/input/cloud/png/348.png and b/diylc-regression-data/input/cloud/png/348.png differ diff --git a/diylc-regression-data/input/cloud/png/349.png b/diylc-regression-data/input/cloud/png/349.png index 736abca8e..0d55c9b8e 100644 Binary files a/diylc-regression-data/input/cloud/png/349.png and b/diylc-regression-data/input/cloud/png/349.png differ diff --git a/diylc-regression-data/input/cloud/png/350.png b/diylc-regression-data/input/cloud/png/350.png index da24a44bd..1ddd09502 100644 Binary files a/diylc-regression-data/input/cloud/png/350.png and b/diylc-regression-data/input/cloud/png/350.png differ diff --git a/diylc-regression-data/input/cloud/png/351.png b/diylc-regression-data/input/cloud/png/351.png index e4b5d52d2..19437ba0a 100644 Binary files a/diylc-regression-data/input/cloud/png/351.png and b/diylc-regression-data/input/cloud/png/351.png differ diff --git a/diylc-regression-data/input/cloud/png/352.png b/diylc-regression-data/input/cloud/png/352.png index bd3585a01..2aa5e196c 100644 Binary files a/diylc-regression-data/input/cloud/png/352.png and b/diylc-regression-data/input/cloud/png/352.png differ diff --git a/diylc-regression-data/input/cloud/png/353.png b/diylc-regression-data/input/cloud/png/353.png index ebc34d46e..5140fba14 100644 Binary files a/diylc-regression-data/input/cloud/png/353.png and b/diylc-regression-data/input/cloud/png/353.png differ diff --git a/diylc-regression-data/input/cloud/png/354.png b/diylc-regression-data/input/cloud/png/354.png index 3de854815..90d0c56b6 100644 Binary files a/diylc-regression-data/input/cloud/png/354.png and b/diylc-regression-data/input/cloud/png/354.png differ diff --git a/diylc-regression-data/input/cloud/png/355.png b/diylc-regression-data/input/cloud/png/355.png index f2f439914..d7341342a 100644 Binary files a/diylc-regression-data/input/cloud/png/355.png and b/diylc-regression-data/input/cloud/png/355.png differ diff --git a/diylc-regression-data/input/cloud/png/356.png b/diylc-regression-data/input/cloud/png/356.png index 784c65302..53b67eeaf 100644 Binary files a/diylc-regression-data/input/cloud/png/356.png and b/diylc-regression-data/input/cloud/png/356.png differ diff --git a/diylc-regression-data/input/cloud/png/357.png b/diylc-regression-data/input/cloud/png/357.png index d899252fa..5a6069fd3 100644 Binary files a/diylc-regression-data/input/cloud/png/357.png and b/diylc-regression-data/input/cloud/png/357.png differ diff --git a/diylc-regression-data/input/cloud/png/358.png b/diylc-regression-data/input/cloud/png/358.png index c4791b5f0..cb50cda7b 100644 Binary files a/diylc-regression-data/input/cloud/png/358.png and b/diylc-regression-data/input/cloud/png/358.png differ diff --git a/diylc-regression-data/input/cloud/png/359.png b/diylc-regression-data/input/cloud/png/359.png index 35554eb7f..29410c92c 100644 Binary files a/diylc-regression-data/input/cloud/png/359.png and b/diylc-regression-data/input/cloud/png/359.png differ diff --git a/diylc-regression-data/input/cloud/png/360.png b/diylc-regression-data/input/cloud/png/360.png index e26391c87..94fe0911d 100644 Binary files a/diylc-regression-data/input/cloud/png/360.png and b/diylc-regression-data/input/cloud/png/360.png differ diff --git a/diylc-regression-data/input/cloud/png/361.png b/diylc-regression-data/input/cloud/png/361.png index 0ebb528b5..e6ab11aa4 100644 Binary files a/diylc-regression-data/input/cloud/png/361.png and b/diylc-regression-data/input/cloud/png/361.png differ diff --git a/diylc-regression-data/input/cloud/png/362.png b/diylc-regression-data/input/cloud/png/362.png index d3cfa20e9..73500f67a 100644 Binary files a/diylc-regression-data/input/cloud/png/362.png and b/diylc-regression-data/input/cloud/png/362.png differ diff --git a/diylc-regression-data/input/cloud/png/363.png b/diylc-regression-data/input/cloud/png/363.png index e8d9acca9..77224666d 100644 Binary files a/diylc-regression-data/input/cloud/png/363.png and b/diylc-regression-data/input/cloud/png/363.png differ diff --git a/diylc-regression-data/input/cloud/png/364.png b/diylc-regression-data/input/cloud/png/364.png index 5d83ad0fe..607106625 100644 Binary files a/diylc-regression-data/input/cloud/png/364.png and b/diylc-regression-data/input/cloud/png/364.png differ diff --git a/diylc-regression-data/input/cloud/png/365.png b/diylc-regression-data/input/cloud/png/365.png index 712fe5a34..f421c734e 100644 Binary files a/diylc-regression-data/input/cloud/png/365.png and b/diylc-regression-data/input/cloud/png/365.png differ diff --git a/diylc-regression-data/input/cloud/png/366.png b/diylc-regression-data/input/cloud/png/366.png index 6933ea18e..b10177f2d 100644 Binary files a/diylc-regression-data/input/cloud/png/366.png and b/diylc-regression-data/input/cloud/png/366.png differ diff --git a/diylc-regression-data/input/cloud/png/367.png b/diylc-regression-data/input/cloud/png/367.png index 9f8fbaa60..fe5899d3d 100644 Binary files a/diylc-regression-data/input/cloud/png/367.png and b/diylc-regression-data/input/cloud/png/367.png differ diff --git a/diylc-regression-data/input/cloud/png/368.png b/diylc-regression-data/input/cloud/png/368.png index 9f8fbaa60..fe5899d3d 100644 Binary files a/diylc-regression-data/input/cloud/png/368.png and b/diylc-regression-data/input/cloud/png/368.png differ diff --git a/diylc-regression-data/input/cloud/png/369.png b/diylc-regression-data/input/cloud/png/369.png index 2b91cf086..5310b1812 100644 Binary files a/diylc-regression-data/input/cloud/png/369.png and b/diylc-regression-data/input/cloud/png/369.png differ diff --git a/diylc-regression-data/input/cloud/png/370.png b/diylc-regression-data/input/cloud/png/370.png index cc43e9cba..9f3087f0e 100644 Binary files a/diylc-regression-data/input/cloud/png/370.png and b/diylc-regression-data/input/cloud/png/370.png differ diff --git a/diylc-regression-data/input/cloud/png/371.png b/diylc-regression-data/input/cloud/png/371.png index ff9d43708..1fb73a131 100644 Binary files a/diylc-regression-data/input/cloud/png/371.png and b/diylc-regression-data/input/cloud/png/371.png differ diff --git a/diylc-regression-data/input/cloud/png/372.png b/diylc-regression-data/input/cloud/png/372.png index e52770dd9..9a7a49d73 100644 Binary files a/diylc-regression-data/input/cloud/png/372.png and b/diylc-regression-data/input/cloud/png/372.png differ diff --git a/diylc-regression-data/input/cloud/png/373.png b/diylc-regression-data/input/cloud/png/373.png index 08958b79f..381f56ae3 100644 Binary files a/diylc-regression-data/input/cloud/png/373.png and b/diylc-regression-data/input/cloud/png/373.png differ diff --git a/diylc-regression-data/input/cloud/png/374.png b/diylc-regression-data/input/cloud/png/374.png index d3c0b79f3..856e16815 100644 Binary files a/diylc-regression-data/input/cloud/png/374.png and b/diylc-regression-data/input/cloud/png/374.png differ diff --git a/diylc-regression-data/input/cloud/png/375.png b/diylc-regression-data/input/cloud/png/375.png index 6ab7b5c7c..0dfd4786e 100644 Binary files a/diylc-regression-data/input/cloud/png/375.png and b/diylc-regression-data/input/cloud/png/375.png differ diff --git a/diylc-regression-data/input/cloud/png/376.png b/diylc-regression-data/input/cloud/png/376.png index a9e2a438e..056d38b24 100644 Binary files a/diylc-regression-data/input/cloud/png/376.png and b/diylc-regression-data/input/cloud/png/376.png differ diff --git a/diylc-regression-data/input/cloud/png/377.png b/diylc-regression-data/input/cloud/png/377.png index bfc47a2ed..ca92f82a3 100644 Binary files a/diylc-regression-data/input/cloud/png/377.png and b/diylc-regression-data/input/cloud/png/377.png differ diff --git a/diylc-regression-data/input/cloud/png/378.png b/diylc-regression-data/input/cloud/png/378.png index 73b071f1f..859314d13 100644 Binary files a/diylc-regression-data/input/cloud/png/378.png and b/diylc-regression-data/input/cloud/png/378.png differ diff --git a/diylc-regression-data/input/cloud/png/379.png b/diylc-regression-data/input/cloud/png/379.png index a2f946d98..635ff1310 100644 Binary files a/diylc-regression-data/input/cloud/png/379.png and b/diylc-regression-data/input/cloud/png/379.png differ diff --git a/diylc-regression-data/input/cloud/png/380.png b/diylc-regression-data/input/cloud/png/380.png index d100c0f7e..6e6d536db 100644 Binary files a/diylc-regression-data/input/cloud/png/380.png and b/diylc-regression-data/input/cloud/png/380.png differ diff --git a/diylc-regression-data/input/cloud/png/381.png b/diylc-regression-data/input/cloud/png/381.png index fbc35013f..73021bb0c 100644 Binary files a/diylc-regression-data/input/cloud/png/381.png and b/diylc-regression-data/input/cloud/png/381.png differ diff --git a/diylc-regression-data/input/cloud/png/382.png b/diylc-regression-data/input/cloud/png/382.png index 673b58bd6..ebc8fb7b8 100644 Binary files a/diylc-regression-data/input/cloud/png/382.png and b/diylc-regression-data/input/cloud/png/382.png differ diff --git a/diylc-regression-data/input/cloud/png/383.png b/diylc-regression-data/input/cloud/png/383.png index 712a7dcdb..75b5e2eca 100644 Binary files a/diylc-regression-data/input/cloud/png/383.png and b/diylc-regression-data/input/cloud/png/383.png differ diff --git a/diylc-regression-data/input/cloud/png/384.png b/diylc-regression-data/input/cloud/png/384.png index 6e719dfa6..7e9fa7a9d 100644 Binary files a/diylc-regression-data/input/cloud/png/384.png and b/diylc-regression-data/input/cloud/png/384.png differ diff --git a/diylc-regression-data/input/cloud/png/385.png b/diylc-regression-data/input/cloud/png/385.png index a3ef2a522..577c2136f 100644 Binary files a/diylc-regression-data/input/cloud/png/385.png and b/diylc-regression-data/input/cloud/png/385.png differ diff --git a/diylc-regression-data/input/cloud/png/386.png b/diylc-regression-data/input/cloud/png/386.png index 67d994be6..7561bc7c4 100644 Binary files a/diylc-regression-data/input/cloud/png/386.png and b/diylc-regression-data/input/cloud/png/386.png differ diff --git a/diylc-regression-data/input/cloud/png/387.png b/diylc-regression-data/input/cloud/png/387.png index 09895a514..c06015c89 100644 Binary files a/diylc-regression-data/input/cloud/png/387.png and b/diylc-regression-data/input/cloud/png/387.png differ diff --git a/diylc-regression-data/input/cloud/png/388.png b/diylc-regression-data/input/cloud/png/388.png index ccee2f12b..ebc651bd8 100644 Binary files a/diylc-regression-data/input/cloud/png/388.png and b/diylc-regression-data/input/cloud/png/388.png differ diff --git a/diylc-regression-data/input/cloud/png/389.png b/diylc-regression-data/input/cloud/png/389.png index 57a8b03e9..c43d75f92 100644 Binary files a/diylc-regression-data/input/cloud/png/389.png and b/diylc-regression-data/input/cloud/png/389.png differ diff --git a/diylc-regression-data/input/cloud/png/390.png b/diylc-regression-data/input/cloud/png/390.png index ca048640e..c71d1c271 100644 Binary files a/diylc-regression-data/input/cloud/png/390.png and b/diylc-regression-data/input/cloud/png/390.png differ diff --git a/diylc-regression-data/input/cloud/png/391.png b/diylc-regression-data/input/cloud/png/391.png index 863cabcec..5232321ac 100644 Binary files a/diylc-regression-data/input/cloud/png/391.png and b/diylc-regression-data/input/cloud/png/391.png differ diff --git a/diylc-regression-data/input/cloud/png/392.png b/diylc-regression-data/input/cloud/png/392.png index ccc4713ac..30f512d93 100644 Binary files a/diylc-regression-data/input/cloud/png/392.png and b/diylc-regression-data/input/cloud/png/392.png differ diff --git a/diylc-regression-data/input/cloud/png/393.png b/diylc-regression-data/input/cloud/png/393.png index e0f3e389b..bc3f325a0 100644 Binary files a/diylc-regression-data/input/cloud/png/393.png and b/diylc-regression-data/input/cloud/png/393.png differ diff --git a/diylc-regression-data/input/cloud/png/394.png b/diylc-regression-data/input/cloud/png/394.png index 186f09e34..afc5ad433 100644 Binary files a/diylc-regression-data/input/cloud/png/394.png and b/diylc-regression-data/input/cloud/png/394.png differ diff --git a/diylc-regression-data/input/cloud/png/395.png b/diylc-regression-data/input/cloud/png/395.png index a144428bb..d42297607 100644 Binary files a/diylc-regression-data/input/cloud/png/395.png and b/diylc-regression-data/input/cloud/png/395.png differ diff --git a/diylc-regression-data/input/cloud/png/396.png b/diylc-regression-data/input/cloud/png/396.png index 79719887b..a6b7e0956 100644 Binary files a/diylc-regression-data/input/cloud/png/396.png and b/diylc-regression-data/input/cloud/png/396.png differ diff --git a/diylc-regression-data/input/cloud/png/397.png b/diylc-regression-data/input/cloud/png/397.png index 46b4a977e..03df67668 100644 Binary files a/diylc-regression-data/input/cloud/png/397.png and b/diylc-regression-data/input/cloud/png/397.png differ diff --git a/diylc-regression-data/input/cloud/png/398.png b/diylc-regression-data/input/cloud/png/398.png index 6aa97a3fe..b6adaa7c8 100644 Binary files a/diylc-regression-data/input/cloud/png/398.png and b/diylc-regression-data/input/cloud/png/398.png differ diff --git a/diylc-regression-data/input/cloud/png/399.png b/diylc-regression-data/input/cloud/png/399.png index 83aae4e31..d9de295c0 100644 Binary files a/diylc-regression-data/input/cloud/png/399.png and b/diylc-regression-data/input/cloud/png/399.png differ diff --git a/diylc-regression-data/input/cloud/png/400.png b/diylc-regression-data/input/cloud/png/400.png index 983ab9355..38f869b97 100644 Binary files a/diylc-regression-data/input/cloud/png/400.png and b/diylc-regression-data/input/cloud/png/400.png differ diff --git a/diylc-regression-data/input/cloud/png/401.png b/diylc-regression-data/input/cloud/png/401.png index d286314bc..6838515e6 100644 Binary files a/diylc-regression-data/input/cloud/png/401.png and b/diylc-regression-data/input/cloud/png/401.png differ diff --git a/diylc-regression-data/input/cloud/png/402.png b/diylc-regression-data/input/cloud/png/402.png index bbb12d64c..a975e649d 100644 Binary files a/diylc-regression-data/input/cloud/png/402.png and b/diylc-regression-data/input/cloud/png/402.png differ diff --git a/diylc-regression-data/input/cloud/png/403.png b/diylc-regression-data/input/cloud/png/403.png index b9849f6a2..aaf6eb6a9 100644 Binary files a/diylc-regression-data/input/cloud/png/403.png and b/diylc-regression-data/input/cloud/png/403.png differ diff --git a/diylc-regression-data/input/cloud/png/404.png b/diylc-regression-data/input/cloud/png/404.png index c56643198..63233e09d 100644 Binary files a/diylc-regression-data/input/cloud/png/404.png and b/diylc-regression-data/input/cloud/png/404.png differ diff --git a/diylc-regression-data/input/cloud/png/405.png b/diylc-regression-data/input/cloud/png/405.png index ad300fc54..580076501 100644 Binary files a/diylc-regression-data/input/cloud/png/405.png and b/diylc-regression-data/input/cloud/png/405.png differ diff --git a/diylc-regression-data/input/cloud/png/406.png b/diylc-regression-data/input/cloud/png/406.png index 91ad04d8f..84f59a737 100644 Binary files a/diylc-regression-data/input/cloud/png/406.png and b/diylc-regression-data/input/cloud/png/406.png differ diff --git a/diylc-regression-data/input/cloud/png/407.png b/diylc-regression-data/input/cloud/png/407.png index 04a6e5c4e..20f4f714c 100644 Binary files a/diylc-regression-data/input/cloud/png/407.png and b/diylc-regression-data/input/cloud/png/407.png differ diff --git a/diylc-regression-data/input/cloud/png/408.png b/diylc-regression-data/input/cloud/png/408.png index 3667cfb14..7094a7294 100644 Binary files a/diylc-regression-data/input/cloud/png/408.png and b/diylc-regression-data/input/cloud/png/408.png differ diff --git a/diylc-regression-data/input/cloud/png/409.png b/diylc-regression-data/input/cloud/png/409.png index 475ee0a08..905ee5180 100644 Binary files a/diylc-regression-data/input/cloud/png/409.png and b/diylc-regression-data/input/cloud/png/409.png differ diff --git a/diylc-regression-data/input/cloud/png/41.png b/diylc-regression-data/input/cloud/png/41.png index ee00a7669..0fc25c842 100644 Binary files a/diylc-regression-data/input/cloud/png/41.png and b/diylc-regression-data/input/cloud/png/41.png differ diff --git a/diylc-regression-data/input/cloud/png/410.png b/diylc-regression-data/input/cloud/png/410.png index 6a26c1a27..c5c9559df 100644 Binary files a/diylc-regression-data/input/cloud/png/410.png and b/diylc-regression-data/input/cloud/png/410.png differ diff --git a/diylc-regression-data/input/cloud/png/411.png b/diylc-regression-data/input/cloud/png/411.png index 8d85cd47a..73a803458 100644 Binary files a/diylc-regression-data/input/cloud/png/411.png and b/diylc-regression-data/input/cloud/png/411.png differ diff --git a/diylc-regression-data/input/cloud/png/412.png b/diylc-regression-data/input/cloud/png/412.png index bfafd3af6..6e83f0b29 100644 Binary files a/diylc-regression-data/input/cloud/png/412.png and b/diylc-regression-data/input/cloud/png/412.png differ diff --git a/diylc-regression-data/input/cloud/png/413.png b/diylc-regression-data/input/cloud/png/413.png index b0d99a9be..6af7c525e 100644 Binary files a/diylc-regression-data/input/cloud/png/413.png and b/diylc-regression-data/input/cloud/png/413.png differ diff --git a/diylc-regression-data/input/cloud/png/414.png b/diylc-regression-data/input/cloud/png/414.png index 4ffe07956..c8d1fcb68 100644 Binary files a/diylc-regression-data/input/cloud/png/414.png and b/diylc-regression-data/input/cloud/png/414.png differ diff --git a/diylc-regression-data/input/cloud/png/415.png b/diylc-regression-data/input/cloud/png/415.png index da5ae23c3..dab6086d8 100644 Binary files a/diylc-regression-data/input/cloud/png/415.png and b/diylc-regression-data/input/cloud/png/415.png differ diff --git a/diylc-regression-data/input/cloud/png/416.png b/diylc-regression-data/input/cloud/png/416.png index 0dc0486ca..436243cf0 100644 Binary files a/diylc-regression-data/input/cloud/png/416.png and b/diylc-regression-data/input/cloud/png/416.png differ diff --git a/diylc-regression-data/input/cloud/png/417.png b/diylc-regression-data/input/cloud/png/417.png index b72cf8f77..3d1eabe4e 100644 Binary files a/diylc-regression-data/input/cloud/png/417.png and b/diylc-regression-data/input/cloud/png/417.png differ diff --git a/diylc-regression-data/input/cloud/png/418.png b/diylc-regression-data/input/cloud/png/418.png index 7f7f46c67..1581e99ec 100644 Binary files a/diylc-regression-data/input/cloud/png/418.png and b/diylc-regression-data/input/cloud/png/418.png differ diff --git a/diylc-regression-data/input/cloud/png/419.png b/diylc-regression-data/input/cloud/png/419.png index 3cd276217..ff6f0d9ad 100644 Binary files a/diylc-regression-data/input/cloud/png/419.png and b/diylc-regression-data/input/cloud/png/419.png differ diff --git a/diylc-regression-data/input/cloud/png/42.png b/diylc-regression-data/input/cloud/png/42.png index 49d141860..0dca964d9 100644 Binary files a/diylc-regression-data/input/cloud/png/42.png and b/diylc-regression-data/input/cloud/png/42.png differ diff --git a/diylc-regression-data/input/cloud/png/43.png b/diylc-regression-data/input/cloud/png/43.png index cca59ea90..fa8720dc1 100644 Binary files a/diylc-regression-data/input/cloud/png/43.png and b/diylc-regression-data/input/cloud/png/43.png differ diff --git a/diylc-regression-data/input/cloud/png/44.png b/diylc-regression-data/input/cloud/png/44.png index 72a805b26..05cc7fb4e 100644 Binary files a/diylc-regression-data/input/cloud/png/44.png and b/diylc-regression-data/input/cloud/png/44.png differ diff --git a/diylc-regression-data/input/cloud/png/45.png b/diylc-regression-data/input/cloud/png/45.png index bd9d64dcf..2a5bae84a 100644 Binary files a/diylc-regression-data/input/cloud/png/45.png and b/diylc-regression-data/input/cloud/png/45.png differ diff --git a/diylc-regression-data/input/cloud/png/46.png b/diylc-regression-data/input/cloud/png/46.png index bb9c58468..565caac66 100644 Binary files a/diylc-regression-data/input/cloud/png/46.png and b/diylc-regression-data/input/cloud/png/46.png differ diff --git a/diylc-regression-data/input/cloud/png/47.png b/diylc-regression-data/input/cloud/png/47.png index 3e7bc3c27..ceee2cfa6 100644 Binary files a/diylc-regression-data/input/cloud/png/47.png and b/diylc-regression-data/input/cloud/png/47.png differ diff --git a/diylc-regression-data/input/cloud/png/48.png b/diylc-regression-data/input/cloud/png/48.png index 281023281..38be92628 100644 Binary files a/diylc-regression-data/input/cloud/png/48.png and b/diylc-regression-data/input/cloud/png/48.png differ diff --git a/diylc-regression-data/input/cloud/png/49.png b/diylc-regression-data/input/cloud/png/49.png index 6f48daf9b..1e827ee4e 100644 Binary files a/diylc-regression-data/input/cloud/png/49.png and b/diylc-regression-data/input/cloud/png/49.png differ diff --git a/diylc-regression-data/input/cloud/png/50.png b/diylc-regression-data/input/cloud/png/50.png index b4bc15cc7..2a44afc05 100644 Binary files a/diylc-regression-data/input/cloud/png/50.png and b/diylc-regression-data/input/cloud/png/50.png differ diff --git a/diylc-regression-data/input/cloud/png/51.png b/diylc-regression-data/input/cloud/png/51.png index 075101fc5..68c0e529a 100644 Binary files a/diylc-regression-data/input/cloud/png/51.png and b/diylc-regression-data/input/cloud/png/51.png differ diff --git a/diylc-regression-data/input/cloud/png/52.png b/diylc-regression-data/input/cloud/png/52.png index eefe9c4c0..8b205d1a8 100644 Binary files a/diylc-regression-data/input/cloud/png/52.png and b/diylc-regression-data/input/cloud/png/52.png differ diff --git a/diylc-regression-data/input/cloud/png/53.png b/diylc-regression-data/input/cloud/png/53.png index 97f9ce1eb..0c9f3fbe6 100644 Binary files a/diylc-regression-data/input/cloud/png/53.png and b/diylc-regression-data/input/cloud/png/53.png differ diff --git a/diylc-regression-data/input/cloud/png/54.png b/diylc-regression-data/input/cloud/png/54.png index 772177a89..df423c2a3 100644 Binary files a/diylc-regression-data/input/cloud/png/54.png and b/diylc-regression-data/input/cloud/png/54.png differ diff --git a/diylc-regression-data/input/cloud/png/55.png b/diylc-regression-data/input/cloud/png/55.png index 5c62b3651..ae326ad8b 100644 Binary files a/diylc-regression-data/input/cloud/png/55.png and b/diylc-regression-data/input/cloud/png/55.png differ diff --git a/diylc-regression-data/input/cloud/png/56.png b/diylc-regression-data/input/cloud/png/56.png index 6fa45f564..5eafd1f5f 100644 Binary files a/diylc-regression-data/input/cloud/png/56.png and b/diylc-regression-data/input/cloud/png/56.png differ diff --git a/diylc-regression-data/input/cloud/png/57.png b/diylc-regression-data/input/cloud/png/57.png index eb04b63be..0fe01f775 100644 Binary files a/diylc-regression-data/input/cloud/png/57.png and b/diylc-regression-data/input/cloud/png/57.png differ diff --git a/diylc-regression-data/input/cloud/png/58.png b/diylc-regression-data/input/cloud/png/58.png index bb09fc890..9c0baa16a 100644 Binary files a/diylc-regression-data/input/cloud/png/58.png and b/diylc-regression-data/input/cloud/png/58.png differ diff --git a/diylc-regression-data/input/cloud/png/59.png b/diylc-regression-data/input/cloud/png/59.png index bb09fc890..9c0baa16a 100644 Binary files a/diylc-regression-data/input/cloud/png/59.png and b/diylc-regression-data/input/cloud/png/59.png differ diff --git a/diylc-regression-data/input/cloud/png/60.png b/diylc-regression-data/input/cloud/png/60.png index ce854d2c0..2d85aebbc 100644 Binary files a/diylc-regression-data/input/cloud/png/60.png and b/diylc-regression-data/input/cloud/png/60.png differ diff --git a/diylc-regression-data/input/cloud/png/61.png b/diylc-regression-data/input/cloud/png/61.png index 387952fa5..ef68e6377 100644 Binary files a/diylc-regression-data/input/cloud/png/61.png and b/diylc-regression-data/input/cloud/png/61.png differ diff --git a/diylc-regression-data/input/cloud/png/62.png b/diylc-regression-data/input/cloud/png/62.png index 78fb01d1a..668956545 100644 Binary files a/diylc-regression-data/input/cloud/png/62.png and b/diylc-regression-data/input/cloud/png/62.png differ diff --git a/diylc-regression-data/input/cloud/png/63.png b/diylc-regression-data/input/cloud/png/63.png index 035571789..0eeae2a9d 100644 Binary files a/diylc-regression-data/input/cloud/png/63.png and b/diylc-regression-data/input/cloud/png/63.png differ diff --git a/diylc-regression-data/input/cloud/png/64.png b/diylc-regression-data/input/cloud/png/64.png index 91a454cb0..919fa2713 100644 Binary files a/diylc-regression-data/input/cloud/png/64.png and b/diylc-regression-data/input/cloud/png/64.png differ diff --git a/diylc-regression-data/input/cloud/png/65.png b/diylc-regression-data/input/cloud/png/65.png index 6d97aee9c..52ec16d41 100644 Binary files a/diylc-regression-data/input/cloud/png/65.png and b/diylc-regression-data/input/cloud/png/65.png differ diff --git a/diylc-regression-data/input/cloud/png/66.png b/diylc-regression-data/input/cloud/png/66.png index 4090a4fea..7a592dd80 100644 Binary files a/diylc-regression-data/input/cloud/png/66.png and b/diylc-regression-data/input/cloud/png/66.png differ diff --git a/diylc-regression-data/input/cloud/png/67.png b/diylc-regression-data/input/cloud/png/67.png index 14b298996..bcd39ef0a 100644 Binary files a/diylc-regression-data/input/cloud/png/67.png and b/diylc-regression-data/input/cloud/png/67.png differ diff --git a/diylc-regression-data/input/cloud/png/68.png b/diylc-regression-data/input/cloud/png/68.png index ddb80392f..2b9f9fa9c 100644 Binary files a/diylc-regression-data/input/cloud/png/68.png and b/diylc-regression-data/input/cloud/png/68.png differ diff --git a/diylc-regression-data/input/cloud/png/69.png b/diylc-regression-data/input/cloud/png/69.png index 91979dbf3..47cd04aef 100644 Binary files a/diylc-regression-data/input/cloud/png/69.png and b/diylc-regression-data/input/cloud/png/69.png differ diff --git a/diylc-regression-data/input/cloud/png/70.png b/diylc-regression-data/input/cloud/png/70.png index 8b7e63432..eed8280a3 100644 Binary files a/diylc-regression-data/input/cloud/png/70.png and b/diylc-regression-data/input/cloud/png/70.png differ diff --git a/diylc-regression-data/input/cloud/png/71.png b/diylc-regression-data/input/cloud/png/71.png index d3f1988f0..02a45c1da 100644 Binary files a/diylc-regression-data/input/cloud/png/71.png and b/diylc-regression-data/input/cloud/png/71.png differ diff --git a/diylc-regression-data/input/cloud/png/72.png b/diylc-regression-data/input/cloud/png/72.png index 820fd782b..507343798 100644 Binary files a/diylc-regression-data/input/cloud/png/72.png and b/diylc-regression-data/input/cloud/png/72.png differ diff --git a/diylc-regression-data/input/cloud/png/73.png b/diylc-regression-data/input/cloud/png/73.png index 6ba3cae05..481945503 100644 Binary files a/diylc-regression-data/input/cloud/png/73.png and b/diylc-regression-data/input/cloud/png/73.png differ diff --git a/diylc-regression-data/input/cloud/png/74.png b/diylc-regression-data/input/cloud/png/74.png index 59b1bf6f8..4104c2cea 100644 Binary files a/diylc-regression-data/input/cloud/png/74.png and b/diylc-regression-data/input/cloud/png/74.png differ diff --git a/diylc-regression-data/input/cloud/png/75.png b/diylc-regression-data/input/cloud/png/75.png index 66c204bab..abdb86e29 100644 Binary files a/diylc-regression-data/input/cloud/png/75.png and b/diylc-regression-data/input/cloud/png/75.png differ diff --git a/diylc-regression-data/input/cloud/png/76.png b/diylc-regression-data/input/cloud/png/76.png index 3a26dfdf5..659bab771 100644 Binary files a/diylc-regression-data/input/cloud/png/76.png and b/diylc-regression-data/input/cloud/png/76.png differ diff --git a/diylc-regression-data/input/cloud/png/77.png b/diylc-regression-data/input/cloud/png/77.png index d8bfe37bb..2cfec7941 100644 Binary files a/diylc-regression-data/input/cloud/png/77.png and b/diylc-regression-data/input/cloud/png/77.png differ diff --git a/diylc-regression-data/input/cloud/png/78.png b/diylc-regression-data/input/cloud/png/78.png index bfc625399..701dfac2c 100644 Binary files a/diylc-regression-data/input/cloud/png/78.png and b/diylc-regression-data/input/cloud/png/78.png differ diff --git a/diylc-regression-data/input/cloud/png/79.png b/diylc-regression-data/input/cloud/png/79.png index 150a9f2ba..91ca3b58d 100644 Binary files a/diylc-regression-data/input/cloud/png/79.png and b/diylc-regression-data/input/cloud/png/79.png differ diff --git a/diylc-regression-data/input/cloud/png/80.png b/diylc-regression-data/input/cloud/png/80.png index 68ce6857f..883b3da22 100644 Binary files a/diylc-regression-data/input/cloud/png/80.png and b/diylc-regression-data/input/cloud/png/80.png differ diff --git a/diylc-regression-data/input/cloud/png/81.png b/diylc-regression-data/input/cloud/png/81.png index 5a4645f1e..9f12ee0d0 100644 Binary files a/diylc-regression-data/input/cloud/png/81.png and b/diylc-regression-data/input/cloud/png/81.png differ diff --git a/diylc-regression-data/input/cloud/png/82.png b/diylc-regression-data/input/cloud/png/82.png index 674d6cf35..0cb7afaf6 100644 Binary files a/diylc-regression-data/input/cloud/png/82.png and b/diylc-regression-data/input/cloud/png/82.png differ diff --git a/diylc-regression-data/input/cloud/png/83.png b/diylc-regression-data/input/cloud/png/83.png index 9a1329225..ae6758470 100644 Binary files a/diylc-regression-data/input/cloud/png/83.png and b/diylc-regression-data/input/cloud/png/83.png differ diff --git a/diylc-regression-data/input/cloud/png/84.png b/diylc-regression-data/input/cloud/png/84.png index 442fc3842..b7013e0ea 100644 Binary files a/diylc-regression-data/input/cloud/png/84.png and b/diylc-regression-data/input/cloud/png/84.png differ diff --git a/diylc-regression-data/input/cloud/png/85.png b/diylc-regression-data/input/cloud/png/85.png index c4cc5024f..9983f5aff 100644 Binary files a/diylc-regression-data/input/cloud/png/85.png and b/diylc-regression-data/input/cloud/png/85.png differ diff --git a/diylc-regression-data/input/cloud/png/86.png b/diylc-regression-data/input/cloud/png/86.png index e2b793321..cb62b4e33 100644 Binary files a/diylc-regression-data/input/cloud/png/86.png and b/diylc-regression-data/input/cloud/png/86.png differ diff --git a/diylc-regression-data/input/cloud/png/87.png b/diylc-regression-data/input/cloud/png/87.png index 14ffbc1ba..66a82c870 100644 Binary files a/diylc-regression-data/input/cloud/png/87.png and b/diylc-regression-data/input/cloud/png/87.png differ diff --git a/diylc-regression-data/input/cloud/png/88.png b/diylc-regression-data/input/cloud/png/88.png index 9224612ae..8673bca87 100644 Binary files a/diylc-regression-data/input/cloud/png/88.png and b/diylc-regression-data/input/cloud/png/88.png differ diff --git a/diylc-regression-data/input/cloud/png/89.png b/diylc-regression-data/input/cloud/png/89.png index 8ff176fb2..2f5f722bb 100644 Binary files a/diylc-regression-data/input/cloud/png/89.png and b/diylc-regression-data/input/cloud/png/89.png differ diff --git a/diylc-regression-data/input/cloud/png/90.png b/diylc-regression-data/input/cloud/png/90.png index be2d2c54b..541fa10b5 100644 Binary files a/diylc-regression-data/input/cloud/png/90.png and b/diylc-regression-data/input/cloud/png/90.png differ diff --git a/diylc-regression-data/input/cloud/png/91.png b/diylc-regression-data/input/cloud/png/91.png index a50e57bfb..67109c9e7 100644 Binary files a/diylc-regression-data/input/cloud/png/91.png and b/diylc-regression-data/input/cloud/png/91.png differ diff --git a/diylc-regression-data/input/cloud/png/92.png b/diylc-regression-data/input/cloud/png/92.png index 65d84fb88..22b88f871 100644 Binary files a/diylc-regression-data/input/cloud/png/92.png and b/diylc-regression-data/input/cloud/png/92.png differ diff --git a/diylc-regression-data/input/cloud/png/93.png b/diylc-regression-data/input/cloud/png/93.png index 50520a6ff..18f85aff7 100644 Binary files a/diylc-regression-data/input/cloud/png/93.png and b/diylc-regression-data/input/cloud/png/93.png differ diff --git a/diylc-regression-data/input/cloud/png/94.png b/diylc-regression-data/input/cloud/png/94.png index 3b8a8896f..8fecfe24c 100644 Binary files a/diylc-regression-data/input/cloud/png/94.png and b/diylc-regression-data/input/cloud/png/94.png differ diff --git a/diylc-regression-data/input/cloud/png/95.png b/diylc-regression-data/input/cloud/png/95.png index d0e0c42d2..2e5289e01 100644 Binary files a/diylc-regression-data/input/cloud/png/95.png and b/diylc-regression-data/input/cloud/png/95.png differ diff --git a/diylc-regression-data/input/cloud/png/96.png b/diylc-regression-data/input/cloud/png/96.png index 5e8dea5f7..50aae8f49 100644 Binary files a/diylc-regression-data/input/cloud/png/96.png and b/diylc-regression-data/input/cloud/png/96.png differ diff --git a/diylc-regression-data/input/cloud/png/97.png b/diylc-regression-data/input/cloud/png/97.png index 31c60a967..97adbae3d 100644 Binary files a/diylc-regression-data/input/cloud/png/97.png and b/diylc-regression-data/input/cloud/png/97.png differ diff --git a/diylc-regression-data/input/cloud/png/98.png b/diylc-regression-data/input/cloud/png/98.png index 477390022..415e3c9cc 100644 Binary files a/diylc-regression-data/input/cloud/png/98.png and b/diylc-regression-data/input/cloud/png/98.png differ diff --git a/diylc-regression-data/input/cloud/png/99.png b/diylc-regression-data/input/cloud/png/99.png index c04fa0098..c1e527580 100644 Binary files a/diylc-regression-data/input/cloud/png/99.png and b/diylc-regression-data/input/cloud/png/99.png differ diff --git a/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt index b5a149e22..f386d6f58 100644 --- a/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R10.2 <-> R2.1 <-> R9.2 - C1.2 <-> C19.1 <-> C2.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> D3.1 <-> D5.1 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1 <-> VR4.2 <-> VR4.3 + C1.+ <-> R10.2 <-> R2.1 <-> R9.2 + C1.- <-> C19.1 <-> C2.- <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.- <-> C4.- <-> C5.- <-> D3.A <-> D5.A <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.3 <-> VR2.3 <-> VR4.1 <-> VR4.2 C10.1 <-> R22.1 <-> R30.2 C10.2 <-> R16.1 <-> V3.7 C11.1 <-> IC3.9 @@ -16,38 +16,38 @@ Switch setup: [Default] C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - C18.1 <-> IC1.4 <-> Q2.1 - C18.2 <-> C29.2 <-> IC1.3 <-> Q2.2 <-> SW1.2 + C18.+ <-> IC1.4 <-> Q2.1 + C18.- <-> C29.- <-> IC1.3 <-> Q2.2 <-> SW1.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 - C2.1 <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 + C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 C24.1 <-> R20.1 <-> R9.1 <-> V1.3 - C24.2 <-> VR3.3 + C24.2 <-> VR3.1 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> VR3.1 <-> VR5.1 - C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 + C25.2 <-> VR3.3 <-> VR5.3 + C26.2 <-> VR4.3 <-> VR5.1 <-> VR5.2 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 - C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 - C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 - C30.1 <-> VR2.3 <-> VR3.2 + C29.+ <-> D6.K <-> D7.K <-> D8.K <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 + C3.+ <-> D1.A <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.1 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 - C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 - C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 + C4.+ <-> D1.K <-> D2.K <-> D4.K <-> Q1.1 + C5.+ <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 C6.1 <-> C9.2 <-> R12.1 <-> V2.8 C7.1 <-> R7.1 <-> V2.6 C7.2 <-> R6.1 C8.1 <-> R10.1 <-> V1.8 - D2.1 <-> D3.2 - D4.1 <-> D5.2 - D6.1 <-> D7.1 <-> D8.1 <-> D9.2 <-> IC2.16 <-> IC3.16 <-> IC4.16 <-> SW1.1 - D9.1 <-> R37.2 + D2.A <-> D3.K + D4.A <-> D5.K + D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.16 <-> IC3.16 <-> IC4.16 <-> SW1.1 + D9.A <-> R37.2 IC3.13 <-> R36.2 - IC4.11 <-> VR6.1 <-> VR6.2 - IC4.9 <-> VR7.1 <-> VR7.2 + IC4.11 <-> VR6.2 <-> VR6.3 + IC4.9 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 - R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 + R22.2 <-> R34.2 <-> VR6.1 <-> VR7.1 R23.1 <-> V3.1 - R36.1 <-> VR1.3 + R36.1 <-> VR1.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt index e811c6134..c47a853da 100644 --- a/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [SW1.ON1] +Switch setup: [ SW1.ON1 ] - C1.1 <-> R10.2 <-> R2.1 <-> R9.2 - C1.2 <-> C19.1 <-> C2.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> D3.1 <-> D5.1 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1 <-> VR4.2 <-> VR4.3 + C1.+ <-> R10.2 <-> R2.1 <-> R9.2 + C1.- <-> C19.1 <-> C2.- <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.- <-> C4.- <-> C5.- <-> D3.A <-> D5.A <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.3 <-> VR2.3 <-> VR4.1 <-> VR4.2 C10.1 <-> R22.1 <-> R30.2 C10.2 <-> R16.1 <-> V3.7 C11.1 <-> IC3.9 @@ -16,44 +16,44 @@ Switch setup: [SW1.ON1] C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - C18.1 <-> IC1.4 <-> Q2.1 - C18.2 <-> C29.2 <-> D6.1 <-> D7.1 <-> D8.1 <-> D9.2 <-> IC1.3 <-> IC2.16 <-> IC3.16 <-> IC4.16 <-> Q2.2 + C18.+ <-> IC1.4 <-> Q2.1 + C18.- <-> C29.- <-> D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC1.3 <-> IC2.16 <-> IC3.16 <-> IC4.16 <-> Q2.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 - C2.1 <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 + C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 C24.1 <-> R20.1 <-> R9.1 <-> V1.3 - C24.2 <-> VR3.3 + C24.2 <-> VR3.1 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> VR3.1 <-> VR5.1 - C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 + C25.2 <-> VR3.3 <-> VR5.3 + C26.2 <-> VR4.3 <-> VR5.1 <-> VR5.2 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 - C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 - C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 - C30.1 <-> VR2.3 <-> VR3.2 + C29.+ <-> D6.K <-> D7.K <-> D8.K <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 + C3.+ <-> D1.A <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.1 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 - C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 - C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 + C4.+ <-> D1.K <-> D2.K <-> D4.K <-> Q1.1 + C5.+ <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 C6.1 <-> C9.2 <-> R12.1 <-> V2.8 C7.1 <-> R7.1 <-> V2.6 C7.2 <-> R6.1 C8.1 <-> R10.1 <-> V1.8 - D2.1 <-> D3.2 - D4.1 <-> D5.2 - D9.1 <-> R37.2 + D2.A <-> D3.K + D4.A <-> D5.K + D9.A <-> R37.2 IC3.13 <-> R36.2 - IC4.11 <-> VR6.1 <-> VR6.2 - IC4.9 <-> VR7.1 <-> VR7.2 + IC4.11 <-> VR6.2 <-> VR6.3 + IC4.9 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 - R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 + R22.2 <-> R34.2 <-> VR6.1 <-> VR7.1 R23.1 <-> V3.1 - R36.1 <-> VR1.3 + R36.1 <-> VR1.1 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] - C1.1 <-> R10.2 <-> R2.1 <-> R9.2 - C1.2 <-> C19.1 <-> C2.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> D3.1 <-> D5.1 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1 <-> VR4.2 <-> VR4.3 + C1.+ <-> R10.2 <-> R2.1 <-> R9.2 + C1.- <-> C19.1 <-> C2.- <-> C20.2 <-> C21.2 <-> C22.2 <-> C23.2 <-> C28.2 <-> C3.- <-> C4.- <-> C5.- <-> D3.A <-> D5.A <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC3.1 <-> IC3.11 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.13 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> R23.2 <-> R24.2 <-> R25.1 <-> R26.1 <-> R27.2 <-> R28.1 <-> R29.2 <-> R30.1 <-> R31.1 <-> R32.1 <-> R33.2 <-> R35.2 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 <-> VR1.3 <-> VR2.3 <-> VR4.1 <-> VR4.2 C10.1 <-> R22.1 <-> R30.2 C10.2 <-> R16.1 <-> V3.7 C11.1 <-> IC3.9 @@ -68,38 +68,38 @@ Switch setup: [SW1.ON2] C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - C18.1 <-> IC1.4 <-> Q2.1 - C18.2 <-> C29.2 <-> IC1.3 <-> Q2.2 + C18.+ <-> IC1.4 <-> Q2.1 + C18.- <-> C29.- <-> IC1.3 <-> Q2.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 - C2.1 <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 + C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 C24.1 <-> R20.1 <-> R9.1 <-> V1.3 - C24.2 <-> VR3.3 + C24.2 <-> VR3.1 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> VR3.1 <-> VR5.1 - C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 + C25.2 <-> VR3.3 <-> VR5.3 + C26.2 <-> VR4.3 <-> VR5.1 <-> VR5.2 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 - C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 - C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 - C30.1 <-> VR2.3 <-> VR3.2 + C29.+ <-> D6.K <-> D7.K <-> D8.K <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 + C3.+ <-> D1.A <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.1 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 - C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 - C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 + C4.+ <-> D1.K <-> D2.K <-> D4.K <-> Q1.1 + C5.+ <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 C6.1 <-> C9.2 <-> R12.1 <-> V2.8 C7.1 <-> R7.1 <-> V2.6 C7.2 <-> R6.1 C8.1 <-> R10.1 <-> V1.8 - D2.1 <-> D3.2 - D4.1 <-> D5.2 - D6.1 <-> D7.1 <-> D8.1 <-> D9.2 <-> IC2.16 <-> IC3.16 <-> IC4.16 - D9.1 <-> R37.2 + D2.A <-> D3.K + D4.A <-> D5.K + D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.16 <-> IC3.16 <-> IC4.16 + D9.A <-> R37.2 IC3.13 <-> R36.2 - IC4.11 <-> VR6.1 <-> VR6.2 - IC4.9 <-> VR7.1 <-> VR7.2 + IC4.11 <-> VR6.2 <-> VR6.3 + IC4.9 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 - R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 + R22.2 <-> R34.2 <-> VR6.1 <-> VR7.1 R23.1 <-> V3.1 - R36.1 <-> VR1.3 + R36.1 <-> VR1.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/deacy_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/deacy_excl_switches.txt index a4e98cfc7..9069b82ca 100644 --- a/diylc-regression-data/input/diy-fever/netlist/deacy_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/deacy_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> C3.1 <-> C4.1 <-> C6.1 <-> C9.1 <-> D1.2 <-> D2.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R18.2 <-> R19.2 - C1.2 <-> R10.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R5.2 <-> R7.2 <-> R8.1 - C10.2 <-> Q4.3 <-> R18.1 + C1.+ <-> C10.+ <-> C3.+ <-> C4.+ <-> C6.+ <-> C9.+ <-> D1.K <-> D2.K <-> R12.2 <-> R13.2 <-> R14.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R18.2 <-> R19.2 + C1.- <-> R10.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R5.2 <-> R7.2 <-> R8.1 + C10.- <-> Q4.3 <-> R18.1 C2.1 <-> Q3.1 <-> R4.2 C2.2 <-> R5.1 - C3.2 <-> Q2.1 <-> R1.2 <-> R9.1 - C4.2 <-> R1.1 <-> R2.1 <-> R4.1 <-> R6.1 <-> R7.1 + C3.- <-> Q2.1 <-> R1.2 <-> R9.1 + C4.- <-> R1.1 <-> R2.1 <-> R4.1 <-> R6.1 <-> R7.1 C5.1 <-> R11.1 C5.2 <-> Q1.1 <-> R3.2 - C6.2 <-> D3.1 <-> D4.1 <-> R10.2 + C6.- <-> D3.A <-> D4.A <-> R10.2 C7.2 <-> R13.1 <-> R9.2 C8.2 <-> Q2.3 <-> R15.1 - C9.2 <-> Q3.3 <-> R17.1 - D1.1 <-> D4.2 - D2.1 <-> D3.2 + C9.- <-> Q3.3 <-> R17.1 + D1.A <-> D4.K + D2.A <-> D3.K Q1.3 <-> Q5.1 <-> R19.1 Q5.3 <-> R11.2 R14.1 <-> R8.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/deacy_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/deacy_incl_switches.txt index a4e98cfc7..9069b82ca 100644 --- a/diylc-regression-data/input/diy-fever/netlist/deacy_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/deacy_incl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> C3.1 <-> C4.1 <-> C6.1 <-> C9.1 <-> D1.2 <-> D2.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R18.2 <-> R19.2 - C1.2 <-> R10.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R5.2 <-> R7.2 <-> R8.1 - C10.2 <-> Q4.3 <-> R18.1 + C1.+ <-> C10.+ <-> C3.+ <-> C4.+ <-> C6.+ <-> C9.+ <-> D1.K <-> D2.K <-> R12.2 <-> R13.2 <-> R14.2 <-> R15.2 <-> R16.2 <-> R17.2 <-> R18.2 <-> R19.2 + C1.- <-> R10.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R5.2 <-> R7.2 <-> R8.1 + C10.- <-> Q4.3 <-> R18.1 C2.1 <-> Q3.1 <-> R4.2 C2.2 <-> R5.1 - C3.2 <-> Q2.1 <-> R1.2 <-> R9.1 - C4.2 <-> R1.1 <-> R2.1 <-> R4.1 <-> R6.1 <-> R7.1 + C3.- <-> Q2.1 <-> R1.2 <-> R9.1 + C4.- <-> R1.1 <-> R2.1 <-> R4.1 <-> R6.1 <-> R7.1 C5.1 <-> R11.1 C5.2 <-> Q1.1 <-> R3.2 - C6.2 <-> D3.1 <-> D4.1 <-> R10.2 + C6.- <-> D3.A <-> D4.A <-> R10.2 C7.2 <-> R13.1 <-> R9.2 C8.2 <-> Q2.3 <-> R15.1 - C9.2 <-> Q3.3 <-> R17.1 - D1.1 <-> D4.2 - D2.1 <-> D3.2 + C9.- <-> Q3.3 <-> R17.1 + D1.A <-> D4.K + D2.A <-> D3.K Q1.3 <-> Q5.1 <-> R19.1 Q5.3 <-> R11.2 R14.1 <-> R8.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt index 019950db7..6876e8856 100644 --- a/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> R2.2 C1.1 <-> R2.2 - C1.2 <-> C2.2 <-> GND <-> R2.2 - C2.1 <-> R2.1 <-> R2.2 + C1.2 <-> C2.- <-> GND <-> R2.2 + C2.+ <-> R2.1 <-> R2.2 Q1.3 <-> R1.1 R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt index 019950db7..6876e8856 100644 --- a/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> R2.2 C1.1 <-> R2.2 - C1.2 <-> C2.2 <-> GND <-> R2.2 - C2.1 <-> R2.1 <-> R2.2 + C1.2 <-> C2.- <-> GND <-> R2.2 + C2.+ <-> R2.1 <-> R2.2 Q1.3 <-> R1.1 R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_excl_switches.txt index ae03b6bbe..2c53bcaf1 100644 --- a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> Bucker.North Finish <-> Bucker.South Finish - .2 <-> Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> SW1.1 <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 + Bucker.North Finish <-> Bucker.South Finish <-> SW2.1 + Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> SW1.1 <-> SW2.2 <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 C1.1 <-> VR3.2 - J1.Tip <-> SW1.3 <-> VR3.3 - Single.North Finish <-> VR2.1 + J1.Tip <-> SW1.3 <-> VR3.1 + Single.North Finish <-> VR2.3 SW1.2 <-> VR1.2 SW1.4 <-> VR2.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt index cd9a1eca6..a45094e26 100644 --- a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt @@ -1,51 +1,51 @@ -Switch setup: [.ON1:SW1.Middle] +Switch setup: [ SW1.Middle:SW2.ON1 ] - Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 + Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR2.2 <-> VR3.3 - Single.North Finish <-> VR2.1 + J1.Tip <-> VR1.2 <-> VR2.2 <-> VR3.1 + Single.North Finish <-> VR2.3 -Switch setup: [.ON1:SW1.Rhythm] - - Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 - C1.1 <-> VR3.2 - J1.Tip <-> VR2.2 <-> VR3.3 - Single.North Finish <-> VR2.1 - -Switch setup: [.ON1:SW1.Treble] - - Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 - C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR3.3 - Single.North Finish <-> VR2.1 - -Switch setup: [.ON2:SW1.Middle] +Switch setup: [ SW1.Middle:SW2.ON2 ] Bucker.North Finish <-> Bucker.South Finish - Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 + Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR2.2 <-> VR3.3 - Single.North Finish <-> VR2.1 + J1.Tip <-> VR1.2 <-> VR2.2 <-> VR3.1 + Single.North Finish <-> VR2.3 -Switch setup: [.ON2:SW1.Rhythm] +Switch setup: [ SW1.Rhythm:SW2.ON1 ] + + Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 + C1.1 <-> VR3.2 + J1.Tip <-> VR2.2 <-> VR3.1 + Single.North Finish <-> VR2.3 + +Switch setup: [ SW1.Rhythm:SW2.ON2 ] Bucker.North Finish <-> Bucker.South Finish - Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 + Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 C1.1 <-> VR3.2 - J1.Tip <-> VR2.2 <-> VR3.3 - Single.North Finish <-> VR2.1 + J1.Tip <-> VR2.2 <-> VR3.1 + Single.North Finish <-> VR2.3 -Switch setup: [.ON2:SW1.Treble] +Switch setup: [ SW1.Treble:SW2.ON1 ] + + Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 + C1.1 <-> VR3.2 + J1.Tip <-> VR1.2 <-> VR3.1 + Single.North Finish <-> VR2.3 + +Switch setup: [ SW1.Treble:SW2.ON2 ] Bucker.North Finish <-> Bucker.South Finish - Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.3 <-> VR2.3 - Bucker.South Start <-> VR1.1 + Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR3.3 - Single.North Finish <-> VR2.1 + J1.Tip <-> VR1.2 <-> VR3.1 + Single.North Finish <-> VR2.3 diff --git a/diylc-regression-data/input/diy-fever/netlist/rangemaster_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/rangemaster_excl_switches.txt index bb93bf762..da51983a3 100644 --- a/diylc-regression-data/input/diy-fever/netlist/rangemaster_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/rangemaster_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C4.1 <-> R1.2 <-> R3.1 <-> VR1.1 <-> VR1.2 - C1.2 <-> VR1.3 + C1.+ <-> C4.+ <-> R1.2 <-> R3.1 <-> VR1.1 <-> VR1.2 + C1.- <-> VR1.3 C2.2 <-> VR2.2 C3.1 <-> R1.1 <-> R2.2 C3.2 <-> R3.2 - C4.2 <-> R2.1 <-> VR2.3 + C4.- <-> R2.1 <-> VR2.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/rangemaster_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/rangemaster_incl_switches.txt index bb93bf762..da51983a3 100644 --- a/diylc-regression-data/input/diy-fever/netlist/rangemaster_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/rangemaster_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C4.1 <-> R1.2 <-> R3.1 <-> VR1.1 <-> VR1.2 - C1.2 <-> VR1.3 + C1.+ <-> C4.+ <-> R1.2 <-> R3.1 <-> VR1.1 <-> VR1.2 + C1.- <-> VR1.3 C2.2 <-> VR2.2 C3.1 <-> R1.1 <-> R2.2 C3.2 <-> R3.2 - C4.2 <-> R2.1 <-> VR2.3 + C4.- <-> R2.1 <-> VR2.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/ruby_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/ruby_excl_switches.txt index 3b9b353eb..e5305809f 100644 --- a/diylc-regression-data/input/diy-fever/netlist/ruby_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/ruby_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> R2.1 - C1.2 <-> VR2.1 - C2.1 <-> IC1.8 <-> R3.1 - C2.2 <-> R4.2 <-> SW1.2 + C1.2 <-> VR2.3 + C2.+ <-> IC1.8 <-> R3.1 + C2.- <-> R4.2 <-> SW1.2 C3.1 <-> IC1.6 - C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.3 - C4.1 <-> IC1.7 <-> J3.1 <-> Q1.1 + C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.1 + C4.+ <-> IC1.7 <-> J3.1 <-> Q1.1 C5.1 <-> R3.2 - IC1.1 <-> VR1.1 + IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 IC1.5 <-> VR1.2 J1.Tip <-> R4.1 <-> R5.1 <-> SW1.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/ruby_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/ruby_incl_switches.txt index 529c0c390..b61af5e26 100644 --- a/diylc-regression-data/input/diy-fever/netlist/ruby_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/ruby_incl_switches.txt @@ -1,45 +1,45 @@ -Switch setup: [SW1.OFF] +Switch setup: [ SW1.OFF ] C1.1 <-> Q1.2 <-> R2.1 - C1.2 <-> VR2.1 - C2.1 <-> IC1.8 <-> R3.1 - C2.2 <-> R4.2 + C1.2 <-> VR2.3 + C2.+ <-> IC1.8 <-> R3.1 + C2.- <-> R4.2 C3.1 <-> IC1.6 - C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.3 - C4.1 <-> IC1.7 <-> J3.1 <-> Q1.1 + C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.1 + C4.+ <-> IC1.7 <-> J3.1 <-> Q1.1 C5.1 <-> R3.2 - IC1.1 <-> VR1.1 + IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 IC1.5 <-> VR1.2 J1.Tip <-> R4.1 <-> R5.1 J2.Tip <-> Q1.3 <-> R1.2 -Switch setup: [SW1.ON1] +Switch setup: [ SW1.ON1 ] C1.1 <-> Q1.2 <-> R2.1 - C1.2 <-> VR2.1 - C2.1 <-> IC1.8 <-> R3.1 - C2.2 <-> J1.Tip <-> R4.1 <-> R4.2 <-> R5.1 + C1.2 <-> VR2.3 + C2.+ <-> IC1.8 <-> R3.1 + C2.- <-> J1.Tip <-> R4.1 <-> R4.2 <-> R5.1 C3.1 <-> IC1.6 - C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.3 - C4.1 <-> IC1.7 <-> J3.1 <-> Q1.1 + C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.1 + C4.+ <-> IC1.7 <-> J3.1 <-> Q1.1 C5.1 <-> R3.2 - IC1.1 <-> VR1.1 + IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 IC1.5 <-> VR1.2 J2.Tip <-> Q1.3 <-> R1.2 -Switch setup: [SW1.ON2] +Switch setup: [ SW1.ON2 ] C1.1 <-> Q1.2 <-> R2.1 - C1.2 <-> VR2.1 - C2.1 <-> IC1.8 <-> R3.1 - C2.2 <-> R4.2 <-> R5.2 + C1.2 <-> VR2.3 + C2.+ <-> IC1.8 <-> R3.1 + C2.- <-> R4.2 <-> R5.2 C3.1 <-> IC1.6 - C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.3 - C4.1 <-> IC1.7 <-> J3.1 <-> Q1.1 + C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.3 <-> R1.1 <-> R2.2 <-> VR2.1 + C4.+ <-> IC1.7 <-> J3.1 <-> Q1.1 C5.1 <-> R3.2 - IC1.1 <-> VR1.1 + IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 IC1.5 <-> VR1.2 J1.Tip <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/slo2_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/slo2_excl_switches.txt index 32c8a9edf..4cc5f15e3 100644 --- a/diylc-regression-data/input/diy-fever/netlist/slo2_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/slo2_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -19,25 +19,25 @@ Switch setup: [Default] C18.2 <-> R30.2 <-> SW2.3 <-> VR2.3 C19.1 <-> SW2.1 <-> SW2.2 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve <-> SW5.2 - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> SW4.2 J18.Ring <-> SW5.3 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/slo2_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/slo2_incl_switches.txt index fa2ffcdf0..cc8b6f280 100644 --- a/diylc-regression-data/input/diy-fever/netlist/slo2_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/slo2_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -17,24 +17,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -48,10 +48,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -67,24 +67,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -98,10 +98,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -117,24 +117,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -148,10 +148,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -167,24 +167,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -198,10 +198,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -217,24 +217,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -249,10 +249,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -268,24 +268,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -300,10 +300,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -319,24 +319,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -351,10 +351,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -370,24 +370,24 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -402,10 +402,10 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -421,24 +421,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -452,10 +452,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -471,24 +471,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -502,10 +502,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -521,24 +521,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -552,10 +552,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -571,24 +571,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -602,10 +602,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -621,24 +621,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -653,10 +653,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -672,24 +672,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -704,10 +704,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -723,24 +723,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -755,10 +755,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -774,24 +774,24 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> R31.1 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -806,10 +806,10 @@ Switch setup: [SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -825,24 +825,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -856,10 +856,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -875,24 +875,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -906,10 +906,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -925,24 +925,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -956,10 +956,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -975,24 +975,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1006,10 +1006,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1026,24 +1026,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1057,10 +1057,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1077,24 +1077,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1108,10 +1108,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1128,24 +1128,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1159,10 +1159,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1179,24 +1179,24 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1210,10 +1210,10 @@ Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1229,24 +1229,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1260,10 +1260,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1279,24 +1279,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1310,10 +1310,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1329,24 +1329,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1360,10 +1360,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1379,24 +1379,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] C17.1 <-> R29.2 <-> VR1.3 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1410,10 +1410,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1430,24 +1430,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1461,10 +1461,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1481,24 +1481,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR4.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1512,10 +1512,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1:SW5.ON2] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1532,24 +1532,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 @@ -1563,10 +1563,10 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON1] R9.2 <-> V1.3 V1.2 <-> VR1.2 -Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2] +Switch setup: [ SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2 ] - BR.1 <-> C6.1 <-> R5.2 - BR.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 + BR.+ <-> C6.+ <-> R5.2 + BR.- <-> C2.- <-> C3.- <-> C4.- <-> C5.- <-> C6.- <-> C7.1 <-> C8.1 <-> C9.1 <-> R1.1 <-> R10.1 <-> R11.1 <-> R12.1 <-> R13.1 <-> R8.1 <-> R9.1 C10.1 <-> R23.2 <-> R27.1 C10.2 <-> VR3.3 <-> VR4.3 C11.1 <-> R18.1 <-> V1.6 @@ -1583,24 +1583,24 @@ Switch setup: [SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2:SW5.ON2] C17.2 <-> R28.1 <-> R29.1 C18.2 <-> C19.1 <-> R30.2 <-> VR2.3 C19.2 <-> R16.2 <-> VR2.2 - C2.1 <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 + C2.+ <-> R1.2 <-> R2.1 <-> R6.2 <-> R7.2 C20.1 <-> J18.Ring <-> J18.Sleeve - C20.2 <-> C21.2 <-> C22.2 <-> Q2.2 - C21.1 <-> C22.1 - C3.1 <-> R2.2 <-> R3.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 + C20.2 <-> C21.- <-> C22.- <-> Q2.2 + C21.+ <-> C22.+ + C3.+ <-> R2.2 <-> R3.1 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 C7.2 <-> R8.2 <-> V1.8 C8.2 <-> R10.2 <-> V2.8 C9.2 <-> R13.2 <-> V3.8 - D1.1 <-> RY1.5 - D1.2 <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 - D2.1 <-> R33.1 - D2.2 <-> R34.1 + D1.A <-> RY1.5 + D1.K <-> J18.Tip <-> Q1.2 <-> R34.2 <-> RY1.1 + D2.A <-> R33.1 + D2.K <-> R34.1 J16.Sleeve <-> R32.2 J16.Tip <-> R15.2 <-> R32.1 J17.Tip <-> VR3.2 - R11.2 <-> V2.2 + R11.2 <-> R20.1 <-> V2.2 R12.2 <-> V2.3 R14.1 <-> V3.2 <-> V3.6 R14.2 <-> V3.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt index c07beb772..27d4613fe 100644 --- a/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt @@ -1,27 +1,27 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .2 <-> .4 <-> .5 - .1 <-> .6 <-> L4.1 <-> L7.1 <-> Level.3 - .1 <-> C1.2 - .1 <-> L3.2 - .2 <-> .2 <-> C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> R1.1 <-> R1.2 <-> TL072.4 - .2 <-> .3 <-> J2.Sleeve - .2 <-> J4.Tip - .3 <-> .4 <-> .5 - .3 <-> .6 - .3 <-> L6.2 - .3 <-> Level.1 - .4 <-> L4.2 - .4 <-> R1.2 - .5 <-> J2.Tip - .5 <-> J5.Tip <-> L3.1 <-> L6.1 - .6 <-> Impedance.2 - .6 <-> L7.2 - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> SW1.1 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> R1.1 <-> R1.2 <-> SW1.2 <-> SW1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + Impedance.2 <-> SW1.6 + J2.Sleeve <-> SW1.2 <-> SW1.3 + J2.Tip <-> SW1.5 + J4.Tip <-> SW1.2 + J5.Tip <-> L3.1 <-> L6.1 <-> SW1.5 + L3.2 <-> SW1.1 + L4.1 <-> L7.1 <-> Level.1 <-> SW1.1 <-> SW1.6 + L4.2 <-> SW1.4 + L6.2 <-> SW1.3 + L7.2 <-> SW1.6 + Level.3 <-> SW1.3 + R1.2 <-> SW1.4 + SW1.1 <-> SW1.2 <-> SW1.4 <-> SW1.5 + SW1.3 <-> SW1.4 <-> SW1.5 + SW1.3 <-> SW1.6 diff --git a/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt index 5eb7feb5c..8ebe4aacb 100644 --- a/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt @@ -1,464 +1,464 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON1] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J2.Tip <-> L4.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON2] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J2.Tip <-> L4.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON1:.ON1:.ON2:.ON1] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Tip <-> L4.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON1:.ON1:.ON2:.ON2] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Tip <-> L4.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON1:.ON2:.ON1:.ON1] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J2.Tip <-> L7.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON1:.ON2:.ON1:.ON2] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J2.Tip <-> L7.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON1:.ON2:.ON2:.ON1] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Tip <-> L7.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON1:.ON2:.ON2:.ON2] +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Tip <-> L7.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON2:.ON1:.ON1:.ON1] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Sleeve <-> L4.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON2:.ON1:.ON1:.ON2] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Sleeve <-> L4.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON2:.ON1:.ON2:.ON1] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON2:.ON1:.ON2:.ON2] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON2:.ON2:.ON1:.ON1] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Sleeve <-> L7.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON2:.ON2:.ON1:.ON2] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 J2.Sleeve <-> L7.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON1:.ON2:.ON2:.ON2:.ON1] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 -Switch setup: [.ON1:.ON2:.ON2:.ON2:.ON2] +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [.ON2:.ON1:.ON1:.ON1:.ON1] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON1:.ON1:.ON2] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON1:.ON2:.ON1] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON1:.ON2:.ON2] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON2:.ON1:.ON1] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON2:.ON1:.ON2] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.3 + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON2:.ON2:.ON1] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON1:.ON2:.ON2:.ON2] +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.3 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip - Impedance.3 <-> Level.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON1:.ON1:.ON1] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Sleeve - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON1:.ON1:.ON2] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Sleeve - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON1:.ON2:.ON1] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON1:.ON2:.ON2] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.1 + L4.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON2:.ON1:.ON1] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Sleeve - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON2:.ON1:.ON2] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 Impedance.2 <-> J2.Sleeve - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON2:.ON2:.ON1] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.1 + L7.2 <-> Level.3 -Switch setup: [.ON2:.ON2:.ON2:.ON2:.ON2] +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ] - 4001.1 <-> C2.1 <-> J6.1 - 4001.2 <-> R1.1 <-> TL072.5 + 4001.A <-> C2.+ <-> J6.1 + 4001.K <-> R1.1 <-> TL072.5 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 - C2.1 <-> R1.2 <-> R1.2 <-> R1.2 - C2.2 <-> C2.2 <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.3 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.3 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.3 <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L7.2 <-> Level.1 + L7.2 <-> Level.3 diff --git a/diylc-regression-data/input/diy-fever/netlist/standard strat_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/standard strat_excl_switches.txt index 14fd877c1..e54d04e7c 100644 --- a/diylc-regression-data/input/diy-fever/netlist/standard strat_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/standard strat_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 Bridge.North Start <-> SW1.1 - Cb.1 <-> SW1.2 <-> SW1.7 <-> Volume.1 + Cb.1 <-> SW1.2 <-> SW1.7 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 Middle.South Start <-> SW1.3 Neck.North Start <-> SW1.5 diff --git a/diylc-regression-data/input/diy-fever/netlist/standard strat_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/standard strat_incl_switches.txt index 93a998b90..8fbc3bfb4 100644 --- a/diylc-regression-data/input/diy-fever/netlist/standard strat_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/standard strat_incl_switches.txt @@ -1,40 +1,40 @@ -Switch setup: [SW1.1] +Switch setup: [ SW1.1 ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 - Bridge.North Start <-> Cb.1 <-> Volume.1 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 + Bridge.North Start <-> Cb.1 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 -Switch setup: [SW1.2] +Switch setup: [ SW1.2 ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 - Bridge.North Start <-> Cb.1 <-> Middle.South Start <-> Tone Middle.2 <-> Volume.1 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 + Bridge.North Start <-> Cb.1 <-> Middle.South Start <-> Tone Middle.2 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 -Switch setup: [SW1.3] +Switch setup: [ SW1.3 ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 - Cb.1 <-> Middle.South Start <-> Tone Middle.2 <-> Volume.1 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 + Cb.1 <-> Middle.South Start <-> Tone Middle.2 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 -Switch setup: [SW1.4] +Switch setup: [ SW1.4 ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 - Cb.1 <-> Middle.South Start <-> Neck.North Start <-> Tone Middle.2 <-> Tone Neck.2 <-> Volume.1 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 + Cb.1 <-> Middle.South Start <-> Neck.North Start <-> Tone Middle.2 <-> Tone Neck.2 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 -Switch setup: [SW1.5] +Switch setup: [ SW1.5 ] - Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.3 - Cb.1 <-> Neck.North Start <-> Tone Neck.2 <-> Volume.1 + Bridge.North Finish <-> Ct.2 <-> J1.Sleeve <-> Middle.South Finish <-> Neck.North Finish <-> Volume.1 + Cb.1 <-> Neck.North Start <-> Tone Neck.2 <-> Volume.3 Cb.2 <-> Rb.2 - Ct.1 <-> Tone Middle.3 <-> Tone Neck.3 + Ct.1 <-> Tone Middle.1 <-> Tone Neck.1 J1.Tip <-> Rb.1 <-> Volume.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_excl_switches.txt index 2fe9b3517..b8b0bcc96 100644 --- a/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C10.1 <-> C12.1 <-> C14.1 <-> C4.2 <-> D1.2 <-> D2.2 <-> IC1.7 - C10.2 <-> C11.1 <-> C12.2 <-> C13.1 <-> C14.2 <-> C9.1 <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 - C11.2 <-> C13.2 <-> C4.1 <-> C9.2 <-> D3.1 <-> D4.1 <-> IC1.5 + C10.+ <-> C12.+ <-> C14.+ <-> C4.2 <-> D1.K <-> D2.K <-> IC1.7 + C10.- <-> C11.+ <-> C12.- <-> C13.+ <-> C14.- <-> C9.+ <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 + C11.- <-> C13.- <-> C4.1 <-> C9.- <-> D3.A <-> D4.A <-> IC1.5 C5.2 <-> IC1.1 C6.2 <-> IC1.9 C7.1 <-> R1.1 C7.2 <-> IC1.4 C8.1 <-> IC1.6 C8.2 <-> R1.1 - D1.1 <-> D3.2 - D2.1 <-> D4.2 + D1.A <-> D3.K + D2.A <-> D4.K diff --git a/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_incl_switches.txt index 2fe9b3517..b8b0bcc96 100644 --- a/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/tda1521a-2_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C10.1 <-> C12.1 <-> C14.1 <-> C4.2 <-> D1.2 <-> D2.2 <-> IC1.7 - C10.2 <-> C11.1 <-> C12.2 <-> C13.1 <-> C14.2 <-> C9.1 <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 - C11.2 <-> C13.2 <-> C4.1 <-> C9.2 <-> D3.1 <-> D4.1 <-> IC1.5 + C10.+ <-> C12.+ <-> C14.+ <-> C4.2 <-> D1.K <-> D2.K <-> IC1.7 + C10.- <-> C11.+ <-> C12.- <-> C13.+ <-> C14.- <-> C9.+ <-> IC1.2 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R1.2 + C11.- <-> C13.- <-> C4.1 <-> C9.- <-> D3.A <-> D4.A <-> IC1.5 C5.2 <-> IC1.1 C6.2 <-> IC1.9 C7.1 <-> R1.1 C7.2 <-> IC1.4 C8.1 <-> IC1.6 C8.2 <-> R1.1 - D1.1 <-> D3.2 - D2.1 <-> D4.2 + D1.A <-> D3.K + D2.A <-> D4.K diff --git a/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt index 009d4b4c1..ebfe1484e 100644 --- a/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt @@ -1,34 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.8 <-> IC2.16 <-> IC3.2 <-> R3.2 <-> VR1.1 - C1.2 <-> D14.1 <-> D7.2 <-> IC1.1 <-> IC2.9 <-> IC3.1 <-> R1.2 <-> VR1.3 <-> VR4.1 <-> VR4.2 + C1.1 <-> IC1.8 <-> IC2.16 <-> IC3.2 <-> R3.2 <-> VR1.3 + C1.2 <-> D14.A <-> D7.K <-> IC1.1 <-> IC2.9 <-> IC3.1 <-> R1.2 <-> VR1.1 <-> VR4.2 <-> VR4.3 C2.1 <-> IC3.6 <-> R2.2 - C2.2 <-> VR2.1 + C2.2 <-> VR2.3 C3.1 <-> R3.1 <-> VR3.2 - C3.2 <-> C6.2 <-> C8.1 <-> R4.1 <-> R5.2 <-> R7.2 <-> R9.1 - C4.1 <-> C7.2 <-> C8.2 <-> D16.1 <-> IC3.4 <-> R7.1 <-> R8.1 <-> VR2.3 + C3.2 <-> C6.2 <-> C8.+ <-> R4.1 <-> R5.2 <-> R7.2 <-> R9.1 + C4.1 <-> C7.- <-> C8.- <-> D16.A <-> IC3.4 <-> R7.1 <-> R8.1 <-> VR2.1 C4.2 <-> IC3.8 <-> R6.1 C5.1 <-> IC3.3 <-> R4.2 C5.2 <-> R8.2 - C6.1 <-> VR3.1 - C7.1 <-> D16.2 <-> IC3.5 <-> R9.2 - D1.1 <-> IC1.15 <-> IC1.16 - D1.2 <-> D2.1 <-> IC1.6 <-> IC1.7 - D10.1 <-> D11.2 <-> IC2.12 <-> IC2.13 - D10.2 <-> D9.1 <-> IC2.5 <-> IC2.6 - D11.1 <-> D12.2 <-> IC2.3 <-> IC2.4 - D12.1 <-> D13.2 <-> IC2.10 <-> IC2.11 - D13.1 <-> D14.2 <-> IC2.1 <-> IC2.2 - D15.2 <-> Q1.1 - D2.2 <-> D3.1 <-> IC1.13 <-> IC1.14 - D3.2 <-> D4.1 <-> IC1.4 <-> IC1.5 - D4.2 <-> D5.1 <-> IC1.11 <-> IC1.12 - D5.2 <-> D6.1 <-> IC1.2 <-> IC1.3 - D6.2 <-> D7.1 <-> IC1.10 <-> IC1.9 - D8.1 <-> D9.2 <-> IC2.14 <-> IC2.15 - D8.2 <-> IC2.7 <-> IC2.8 + C6.1 <-> VR3.3 + C7.+ <-> D16.K <-> IC3.5 <-> R9.2 + D1.A <-> IC1.15 <-> IC1.16 + D1.K <-> D2.A <-> IC1.6 <-> IC1.7 + D10.A <-> D11.K <-> IC2.12 <-> IC2.13 + D10.K <-> D9.A <-> IC2.5 <-> IC2.6 + D11.A <-> D12.K <-> IC2.3 <-> IC2.4 + D12.A <-> D13.K <-> IC2.10 <-> IC2.11 + D13.A <-> D14.K <-> IC2.1 <-> IC2.2 + D15.K <-> Q1.1 + D2.K <-> D3.A <-> IC1.13 <-> IC1.14 + D3.K <-> D4.A <-> IC1.4 <-> IC1.5 + D4.K <-> D5.A <-> IC1.11 <-> IC1.12 + D5.K <-> D6.A <-> IC1.2 <-> IC1.3 + D6.K <-> D7.A <-> IC1.10 <-> IC1.9 + D8.A <-> D9.K <-> IC2.14 <-> IC2.15 + D8.K <-> IC2.7 <-> IC2.8 IC3.7 <-> R2.1 <-> R5.1 Q1.2 <-> Q1.3 R1.1 <-> VR1.2 - R6.2 <-> VR4.3 + R6.2 <-> VR4.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt index acf2a0dc7..ebfe1484e 100644 --- a/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt @@ -1,34 +1,34 @@ -Switch setup: [SW1.ON1, SW1.ON2] +Switch setup: [ ALL ] - C1.1 <-> IC1.8 <-> IC2.16 <-> IC3.2 <-> R3.2 <-> VR1.1 - C1.2 <-> D14.1 <-> D7.2 <-> IC1.1 <-> IC2.9 <-> IC3.1 <-> R1.2 <-> VR1.3 <-> VR4.1 <-> VR4.2 + C1.1 <-> IC1.8 <-> IC2.16 <-> IC3.2 <-> R3.2 <-> VR1.3 + C1.2 <-> D14.A <-> D7.K <-> IC1.1 <-> IC2.9 <-> IC3.1 <-> R1.2 <-> VR1.1 <-> VR4.2 <-> VR4.3 C2.1 <-> IC3.6 <-> R2.2 - C2.2 <-> VR2.1 + C2.2 <-> VR2.3 C3.1 <-> R3.1 <-> VR3.2 - C3.2 <-> C6.2 <-> C8.1 <-> R4.1 <-> R5.2 <-> R7.2 <-> R9.1 - C4.1 <-> C7.2 <-> C8.2 <-> D16.1 <-> IC3.4 <-> R7.1 <-> R8.1 <-> VR2.3 + C3.2 <-> C6.2 <-> C8.+ <-> R4.1 <-> R5.2 <-> R7.2 <-> R9.1 + C4.1 <-> C7.- <-> C8.- <-> D16.A <-> IC3.4 <-> R7.1 <-> R8.1 <-> VR2.1 C4.2 <-> IC3.8 <-> R6.1 C5.1 <-> IC3.3 <-> R4.2 C5.2 <-> R8.2 - C6.1 <-> VR3.1 - C7.1 <-> D16.2 <-> IC3.5 <-> R9.2 - D1.1 <-> IC1.15 <-> IC1.16 - D1.2 <-> D2.1 <-> IC1.6 <-> IC1.7 - D10.1 <-> D11.2 <-> IC2.12 <-> IC2.13 - D10.2 <-> D9.1 <-> IC2.5 <-> IC2.6 - D11.1 <-> D12.2 <-> IC2.3 <-> IC2.4 - D12.1 <-> D13.2 <-> IC2.10 <-> IC2.11 - D13.1 <-> D14.2 <-> IC2.1 <-> IC2.2 - D15.2 <-> Q1.1 - D2.2 <-> D3.1 <-> IC1.13 <-> IC1.14 - D3.2 <-> D4.1 <-> IC1.4 <-> IC1.5 - D4.2 <-> D5.1 <-> IC1.11 <-> IC1.12 - D5.2 <-> D6.1 <-> IC1.2 <-> IC1.3 - D6.2 <-> D7.1 <-> IC1.10 <-> IC1.9 - D8.1 <-> D9.2 <-> IC2.14 <-> IC2.15 - D8.2 <-> IC2.7 <-> IC2.8 + C6.1 <-> VR3.3 + C7.+ <-> D16.K <-> IC3.5 <-> R9.2 + D1.A <-> IC1.15 <-> IC1.16 + D1.K <-> D2.A <-> IC1.6 <-> IC1.7 + D10.A <-> D11.K <-> IC2.12 <-> IC2.13 + D10.K <-> D9.A <-> IC2.5 <-> IC2.6 + D11.A <-> D12.K <-> IC2.3 <-> IC2.4 + D12.A <-> D13.K <-> IC2.10 <-> IC2.11 + D13.A <-> D14.K <-> IC2.1 <-> IC2.2 + D15.K <-> Q1.1 + D2.K <-> D3.A <-> IC1.13 <-> IC1.14 + D3.K <-> D4.A <-> IC1.4 <-> IC1.5 + D4.K <-> D5.A <-> IC1.11 <-> IC1.12 + D5.K <-> D6.A <-> IC1.2 <-> IC1.3 + D6.K <-> D7.A <-> IC1.10 <-> IC1.9 + D8.A <-> D9.K <-> IC2.14 <-> IC2.15 + D8.K <-> IC2.7 <-> IC2.8 IC3.7 <-> R2.1 <-> R5.1 Q1.2 <-> Q1.3 R1.1 <-> VR1.2 - R6.2 <-> VR4.3 + R6.2 <-> VR4.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_excl_switches.txt index 673e647b3..7c8c05146 100644 --- a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Bridge.North Finish <-> Bridge.South Finish <-> Split.2 Bridge.North Start <-> SW1.2 - Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Split.3 <-> Split.6 <-> Volume.3 - Cbleed.1 <-> SW1.3 <-> Volume.1 + Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Split.3 <-> Split.6 <-> Volume.1 + Cbleed.1 <-> SW1.3 <-> Volume.3 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 Neck.North Start <-> Neck.South Start <-> Split.5 diff --git a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt index ab4fab2cf..e6dfa822e 100644 --- a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt @@ -1,48 +1,48 @@ -Switch setup: [Split.ON1:SW1.Middle] +Switch setup: [ Split.ON1:SW1.Middle ] Bridge.North Finish <-> Bridge.South Finish - Bridge.North Start <-> Cbleed.1 <-> Neck.South Finish <-> Volume.1 - Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.3 + Bridge.North Start <-> Cbleed.1 <-> Neck.South Finish <-> Volume.3 + Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 Neck.North Start <-> Neck.South Start -Switch setup: [Split.ON1:SW1.Rhythm] +Switch setup: [ Split.ON1:SW1.Rhythm ] Bridge.North Finish <-> Bridge.South Finish - Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.3 - Cbleed.1 <-> Neck.South Finish <-> Volume.1 + Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1 + Cbleed.1 <-> Neck.South Finish <-> Volume.3 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 Neck.North Start <-> Neck.South Start -Switch setup: [Split.ON1:SW1.Treble] +Switch setup: [ Split.ON1:SW1.Treble ] Bridge.North Finish <-> Bridge.South Finish - Bridge.North Start <-> Cbleed.1 <-> Volume.1 - Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.3 + Bridge.North Start <-> Cbleed.1 <-> Volume.3 + Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 Neck.North Start <-> Neck.South Start -Switch setup: [Split.ON2:SW1.Middle] +Switch setup: [ Split.ON2:SW1.Middle ] - Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.3 - Bridge.North Start <-> Cbleed.1 <-> Neck.South Finish <-> Volume.1 + Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1 + Bridge.North Start <-> Cbleed.1 <-> Neck.South Finish <-> Volume.3 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 -Switch setup: [Split.ON2:SW1.Rhythm] +Switch setup: [ Split.ON2:SW1.Rhythm ] - Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.3 - Cbleed.1 <-> Neck.South Finish <-> Volume.1 + Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1 + Cbleed.1 <-> Neck.South Finish <-> Volume.3 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 -Switch setup: [Split.ON2:SW1.Treble] +Switch setup: [ Split.ON2:SW1.Treble ] - Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.3 - Bridge.North Start <-> Cbleed.1 <-> Volume.1 + Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1 + Bridge.North Start <-> Cbleed.1 <-> Volume.3 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 diff --git a/diylc-regression-data/input/diy-fever/png/IIc+.png b/diylc-regression-data/input/diy-fever/png/IIc+.png index 24bb4be28..3fa672025 100644 Binary files a/diylc-regression-data/input/diy-fever/png/IIc+.png and b/diylc-regression-data/input/diy-fever/png/IIc+.png differ diff --git a/diylc-regression-data/input/diy-fever/png/deacy.png b/diylc-regression-data/input/diy-fever/png/deacy.png index 4ed325929..3fef0a9db 100644 Binary files a/diylc-regression-data/input/diy-fever/png/deacy.png and b/diylc-regression-data/input/diy-fever/png/deacy.png differ diff --git a/diylc-regression-data/input/diy-fever/png/jfet boost.png b/diylc-regression-data/input/diy-fever/png/jfet boost.png index 4e58b2101..bc0df1ae2 100644 Binary files a/diylc-regression-data/input/diy-fever/png/jfet boost.png and b/diylc-regression-data/input/diy-fever/png/jfet boost.png differ diff --git a/diylc-regression-data/input/diy-fever/png/lp switch + pots.png b/diylc-regression-data/input/diy-fever/png/lp switch + pots.png index 3a374bf55..3d2d48435 100644 Binary files a/diylc-regression-data/input/diy-fever/png/lp switch + pots.png and b/diylc-regression-data/input/diy-fever/png/lp switch + pots.png differ diff --git a/diylc-regression-data/input/diy-fever/png/rangemaster.png b/diylc-regression-data/input/diy-fever/png/rangemaster.png index d67a17a1f..04a3fa533 100644 Binary files a/diylc-regression-data/input/diy-fever/png/rangemaster.png and b/diylc-regression-data/input/diy-fever/png/rangemaster.png differ diff --git a/diylc-regression-data/input/diy-fever/png/ruby.png b/diylc-regression-data/input/diy-fever/png/ruby.png index b917dfa74..ee7274f17 100644 Binary files a/diylc-regression-data/input/diy-fever/png/ruby.png and b/diylc-regression-data/input/diy-fever/png/ruby.png differ diff --git a/diylc-regression-data/input/diy-fever/png/slo2.png b/diylc-regression-data/input/diy-fever/png/slo2.png index 49385b2b7..b9e898662 100644 Binary files a/diylc-regression-data/input/diy-fever/png/slo2.png and b/diylc-regression-data/input/diy-fever/png/slo2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/splitter2.png b/diylc-regression-data/input/diy-fever/png/splitter2.png index 8cc33c706..58c405110 100644 Binary files a/diylc-regression-data/input/diy-fever/png/splitter2.png and b/diylc-regression-data/input/diy-fever/png/splitter2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/standard strat.png b/diylc-regression-data/input/diy-fever/png/standard strat.png index 4aca49004..2af09f688 100644 Binary files a/diylc-regression-data/input/diy-fever/png/standard strat.png and b/diylc-regression-data/input/diy-fever/png/standard strat.png differ diff --git a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png index 1827567ce..7f14e8170 100644 Binary files a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png and b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/timmy7.png b/diylc-regression-data/input/diy-fever/png/timmy7.png index aec4a3e79..5c0ce951d 100644 Binary files a/diylc-regression-data/input/diy-fever/png/timmy7.png and b/diylc-regression-data/input/diy-fever/png/timmy7.png differ diff --git a/diylc-regression-data/input/diy-fever/png/travelcaster3 (new format).png b/diylc-regression-data/input/diy-fever/png/travelcaster3 (new format).png index 376034888..6847058cd 100644 Binary files a/diylc-regression-data/input/diy-fever/png/travelcaster3 (new format).png and b/diylc-regression-data/input/diy-fever/png/travelcaster3 (new format).png differ diff --git a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt index 8a5ff06b1..25cb54703 100644 --- a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt @@ -1,20 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .047 uF.1 <-> J1.2 .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> .2 <-> .2 <-> .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.2 <-> C2.1 <-> C20.2 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.2 <-> D13.2 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> D7.2 <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 - .1 <-> C31.2 <-> R42.2 - .1 <-> C5.1 - .1 <-> IEC1.2 .1 <-> R2.1 - .2 <-> CP RY.1 <-> D12.2 - .2 <-> R54.1 - .3 <-> C34.1 - .5 <-> AUX RELAY HEATER TXR.1 - 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.7 <-> RY2.8 <-> SW1.1 <-> SW2.2 <-> SW6.2 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + AUX RELAY HEATER TXR.1 <-> SW4.5 BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 - C1.1 <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 C10.2 <-> DUAL BASS 2--LEAD.3 C11.1 <-> C14.2 <-> R23.2 @@ -35,7 +31,7 @@ Switch setup: [Default] C24.1 <-> MASTER VOL.2 C24.2 <-> R30.2 C25.1 <-> R32.2 <-> V3.7 - C25.2 <-> R33.2 <-> R38.1 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 C26.1 <-> R36.2 C26.2 <-> C28.1 <-> R34.1 C27.1 <-> R37.2 @@ -44,35 +40,42 @@ Switch setup: [Default] C29.2 <-> PRESENCE.1 C3.1 <-> R8.2 <-> R9.2 C3.2 <-> C4.2 <-> R5.2 <-> V1.6 - C30.1 <-> C31.1 <-> C33.1 <-> D10.1 <-> D9.1 <-> J30.J30Sleeve <-> R43.1 <-> V1.4 <-> V1.5 - C30.2 <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C30.+ <-> C31.+ <-> C33.1 <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 C32.1 <-> J29.J29Sleeve C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C34.2 <-> C5.2 <-> R6.1 - C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C32.3 <-> R41.1 <-> R48.1 <-> V6.6 + C33.2 <-> C33.3 <-> D6.K <-> D8.K <-> FH2.1 + C34.1 <-> SW6.3 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.2 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.2 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C5.1 <-> SW6.1 C7.1 <-> J59.J59Sleeve C9.1 <-> R18.1 C9.2 <-> R17.1 <-> R20.1 <-> V2.7 CLEAN GAIN.2 <-> RY1.3 - D1.1 <-> D3.2 <-> D4.2 <-> D5.1 - D1.2 <-> D2.1 - D10.2 <-> D6.1 - D12.1 <-> R39.2 - D6.2 <-> D8.2 <-> FH2.1 - D8.1 <-> D9.2 + CP RY.1 <-> D12.K <-> SW1.2 + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A <-> SW5.1 + D12.A <-> R39.2 + D8.A <-> D9.K DUAL BASS 2--LEAD.1 <-> R24.1 DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 FH1.1 <-> IEC1.3 IEC1.1 <-> J32.J32Sleeve + IEC1.2 <-> SW4.1 J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 J38.J38Sleeve <-> V7.1 <-> V7.8 J60.2 <-> J61.2 + LEAD GAIN.2 <-> RY1.4 LEAD VOL.2 <-> R16.1 R13.2 <-> R14.1 R14.2 <-> R15.1 <-> R16.2 <-> R17.2 R30.1 <-> R31.1 <-> R32.1 <-> R33.1 R31.2 <-> V3.8 - R41.1 <-> R48.1 <-> V6.6 R46.1 <-> R47.1 R46.2 <-> V4.4 R47.2 <-> V5.4 @@ -81,6 +84,7 @@ Switch setup: [Default] R51.1 <-> V4.5 R52.1 <-> V6.5 R52.2 <-> R53.2 + RY2.4 <-> TREBLE-LEAD.2 V4.3 <-> V5.3 V6.3 <-> V7.3 diff --git a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt index 1ff96b3c9..f282c0ca4 100644 --- a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt @@ -1 +1,342 @@ -org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 96 \ No newline at end of file +Switch setup: [ SW1.OFF:SW6.ON1,SW1.ON2:SW6.ON1 ] + + .047 uF.1 <-> J1.2 + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.7 <-> RY2.8 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.1 <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.1 <-> J29.J29Sleeve + C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.3 <-> R41.1 <-> R48.1 <-> V6.6 + C33.2 <-> C33.3 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.2 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.2 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.1 <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.3 + CP RY.1 <-> D12.K + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.3 + IEC1.1 <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.2 <-> J61.2 + LEAD GAIN.2 <-> RY1.4 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.4 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + +Switch setup: [ SW1.OFF:SW6.ON2,SW1.ON2:SW6.ON2 ] + + .047 uF.1 <-> J1.2 + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.7 <-> RY2.8 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.1 <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.1 <-> J29.J29Sleeve + C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.3 <-> R41.1 <-> R48.1 <-> V6.6 + C33.2 <-> C33.3 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.2 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.2 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.1 <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.3 + CP RY.1 <-> D12.K + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.3 + IEC1.1 <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.2 <-> J61.2 + LEAD GAIN.2 <-> RY1.4 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.4 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + +Switch setup: [ SW1.ON1:SW6.ON1 ] + + .047 uF.1 <-> J1.2 + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.7 <-> RY2.8 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.1 <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.1 <-> J29.J29Sleeve + C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.3 <-> R41.1 <-> R48.1 <-> V6.6 + C33.2 <-> C33.3 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.2 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.2 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.1 <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.3 + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.3 + IEC1.1 <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.2 <-> J61.2 + LEAD GAIN.2 <-> RY1.4 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.4 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + +Switch setup: [ SW1.ON1:SW6.ON2 ] + + .047 uF.1 <-> J1.2 + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.1 <-> J1.4 <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.7 <-> RY2.8 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.1 <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.1 <-> J29.J29Sleeve + C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.3 <-> R41.1 <-> R48.1 <-> V6.6 + C33.2 <-> C33.3 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.2 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.2 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.1 <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.3 + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.3 + IEC1.1 <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.2 <-> J61.2 + LEAD GAIN.2 <-> RY1.4 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.4 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt index fcfffaaf0..08bff5a7b 100644 --- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt @@ -1,49 +1,47 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C6.1 - .2 <-> 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 - .2 <-> V1.2 <-> Volume.2 - .3 <-> C7.1 - .4 <-> C6.2 - .5 <-> Treble.2 <-> Volume.1 <-> VR1.2 - .6 <-> C7.2 - 250K Lin.3 <-> Bias.1 <-> Bias.1 - Bass.1 <-> VR1.1 - Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 - Bass.3 <-> C1.2 <-> Middle.2 <-> VR1.2 <-> VR1.3 + 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C5.+ <-> C5.+ <-> C5.+ <-> C5.- <-> C5.- <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.1 <-> Presence.1 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> SW2.2 <-> V1.7 <-> Volume.1 <-> VR1.1 <-> VR1.1 + 250K Lin.3 <-> Bias.3 <-> Bias.3 + Bass.1 <-> C1.2 <-> Middle.2 <-> VR1.1 <-> VR1.2 + Bass.2 <-> C1.2 <-> C1.2 <-> Treble.1 <-> VR1.1 <-> VR1.2 + Bass.3 <-> VR1.3 + Bias.1 <-> Bias.1 <-> C5.- <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 Bias.2 <-> R30.1 Bias.2 <-> R30.1 <-> R30.1 - Bias.3 <-> Bias.3 <-> C5.2 <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 - C1.2 <-> Presence.1 <-> R12.2 <-> R22.1 <-> VR1.1 C1.2 <-> Presence.2 <-> VR1.2 + C1.2 <-> Presence.3 <-> R12.2 <-> R22.1 <-> VR1.3 C1.2 <-> R13.1 <-> R23.2 C1.2 <-> R7.2 - C2.1 <-> C2.1 <-> R10.2 <-> R7.1 - C2.1 <-> D2.2 <-> D4.2 <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 - C2.1 <-> R1.2 <-> R2.1 <-> R4.2 - C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 - C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> R26.1 - C3.1 <-> Treble.1 <-> VR1.1 + C2.+ <-> C2.+ <-> R10.2 <-> R7.1 + C2.+ <-> D2.K <-> D4.K <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 + C2.+ <-> R1.2 <-> R2.1 <-> R4.2 + C2.+ <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 + C2.+ <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 + C2.- <-> R26.1 + C3.1 <-> Treble.3 <-> VR1.3 C3.2 <-> R1.1 <-> R3.2 C4.1 <-> R5.1 <-> V1.2 C4.2 <-> R2.2 - C5.1 <-> C5.1 <-> C5.1 <-> R21.2 <-> R21.2 <-> V1.3 - C5.1 <-> C5.1 <-> R21.2 <-> V1.8 - C5.2 <-> C5.2 <-> C5.2 <-> R21.1 <-> R21.1 - C5.2 <-> C5.2 <-> D5.1 <-> R20.2 - D1.1 <-> D3.1 <-> R19.1 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - D5.2 <-> R19.2 + C5.+ <-> C5.+ <-> C5.+ <-> R21.2 <-> R21.2 <-> V1.3 + C5.+ <-> C5.+ <-> R21.2 <-> V1.8 + C5.- <-> C5.- <-> C5.- <-> R21.1 <-> R21.1 + C5.- <-> C5.- <-> D5.A <-> R20.2 + C6.1 <-> SW1.1 + C6.2 <-> SW1.4 + C7.1 <-> SW1.3 + C7.2 <-> SW1.6 + D1.A <-> D3.A <-> R19.1 + D1.K <-> D2.A + D3.K <-> D4.A + D5.K <-> R19.2 J20.Ring <-> J20.Sleeve <-> J20.Tip <-> R22.2 - Middle.1 <-> VR1.1 + Middle.3 <-> VR1.3 R11.1 <-> R12.1 <-> R8.2 <-> R9.1 R11.2 <-> V1.3 <-> V1.8 R23.1 <-> R23.1 @@ -51,6 +49,8 @@ Switch setup: [Default] R26.2 <-> R27.1 R29.2 <-> V2.1 <-> V2.1 <-> V2.8 <-> V2.8 R6.2 <-> V1.3 + SW1.2 <-> V1.2 <-> Volume.2 + SW1.5 <-> Treble.2 <-> Volume.3 <-> VR1.2 V2.2 <-> V2.2 V2.4 <-> V2.4 V2.5 <-> V2.5 diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt index f94c29ec2..dd421df30 100644 --- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt @@ -1,45 +1,45 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2] +Switch setup: [ SW1.ON1 ] - 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 - 250K Lin.3 <-> Bias.1 <-> Bias.1 - Bass.1 <-> VR1.1 - Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 - Bass.3 <-> C1.2 <-> Middle.2 <-> VR1.2 <-> VR1.3 + 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C5.+ <-> C5.+ <-> C5.+ <-> C5.- <-> C5.- <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.1 <-> Presence.1 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.1 <-> VR1.1 <-> VR1.1 + 250K Lin.3 <-> Bias.3 <-> Bias.3 + Bass.1 <-> C1.2 <-> Middle.2 <-> VR1.1 <-> VR1.2 + Bass.2 <-> C1.2 <-> C1.2 <-> Treble.1 <-> VR1.1 <-> VR1.2 + Bass.3 <-> VR1.3 + Bias.1 <-> Bias.1 <-> C5.- <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 Bias.2 <-> R30.1 Bias.2 <-> R30.1 <-> R30.1 - Bias.3 <-> Bias.3 <-> C5.2 <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 - C1.2 <-> Presence.1 <-> R12.2 <-> R22.1 <-> VR1.1 C1.2 <-> Presence.2 <-> VR1.2 + C1.2 <-> Presence.3 <-> R12.2 <-> R22.1 <-> VR1.3 C1.2 <-> R13.1 <-> R23.2 C1.2 <-> R7.2 - C2.1 <-> C2.1 <-> R10.2 <-> R7.1 - C2.1 <-> D2.2 <-> D4.2 <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 - C2.1 <-> R1.2 <-> R2.1 <-> R4.2 - C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 - C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> R26.1 - C3.1 <-> Treble.1 <-> VR1.1 + C2.+ <-> C2.+ <-> R10.2 <-> R7.1 + C2.+ <-> D2.K <-> D4.K <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 + C2.+ <-> R1.2 <-> R2.1 <-> R4.2 + C2.+ <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 + C2.+ <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 + C2.- <-> R26.1 + C3.1 <-> Treble.3 <-> VR1.3 C3.2 <-> R1.1 <-> R3.2 C4.1 <-> R5.1 <-> V1.2 C4.2 <-> R2.2 - C5.1 <-> C5.1 <-> C5.1 <-> R21.2 <-> R21.2 <-> V1.3 - C5.1 <-> C5.1 <-> R21.2 <-> V1.8 - C5.2 <-> C5.2 <-> C5.2 <-> R21.1 <-> R21.1 - C5.2 <-> C5.2 <-> D5.1 <-> R20.2 + C5.+ <-> C5.+ <-> C5.+ <-> R21.2 <-> R21.2 <-> V1.3 + C5.+ <-> C5.+ <-> R21.2 <-> V1.8 + C5.- <-> C5.- <-> C5.- <-> R21.1 <-> R21.1 + C5.- <-> C5.- <-> D5.A <-> R20.2 C6.1 <-> V1.2 <-> Volume.2 - C6.2 <-> Treble.2 <-> Volume.1 <-> VR1.2 - D1.1 <-> D3.1 <-> R19.1 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - D5.2 <-> R19.2 + C6.2 <-> Treble.2 <-> Volume.3 <-> VR1.2 + D1.A <-> D3.A <-> R19.1 + D1.K <-> D2.A + D3.K <-> D4.A + D5.K <-> R19.2 J20.Ring <-> J20.Sleeve <-> J20.Tip <-> R22.2 - Middle.1 <-> VR1.1 + Middle.3 <-> VR1.3 R11.1 <-> R12.1 <-> R8.2 <-> R9.1 R11.2 <-> V1.3 <-> V1.8 R23.1 <-> R23.1 @@ -53,48 +53,48 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] V2.6 <-> V2.6 V2.7 <-> V2.7 -Switch setup: [.ON2:.ON1, .ON2:.ON2] +Switch setup: [ SW1.ON2 ] - 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 - 250K Lin.3 <-> Bias.1 <-> Bias.1 - Bass.1 <-> VR1.1 - Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 - Bass.3 <-> C1.2 <-> Middle.2 <-> VR1.2 <-> VR1.3 + 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C2.- <-> C5.+ <-> C5.+ <-> C5.+ <-> C5.- <-> C5.- <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.1 <-> Presence.1 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.1 <-> VR1.1 <-> VR1.1 + 250K Lin.3 <-> Bias.3 <-> Bias.3 + Bass.1 <-> C1.2 <-> Middle.2 <-> VR1.1 <-> VR1.2 + Bass.2 <-> C1.2 <-> C1.2 <-> Treble.1 <-> VR1.1 <-> VR1.2 + Bass.3 <-> VR1.3 + Bias.1 <-> Bias.1 <-> C5.- <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 Bias.2 <-> R30.1 Bias.2 <-> R30.1 <-> R30.1 - Bias.3 <-> Bias.3 <-> C5.2 <-> R20.1 <-> R30.2 <-> R30.2 <-> R30.2 C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 - C1.2 <-> Presence.1 <-> R12.2 <-> R22.1 <-> VR1.1 C1.2 <-> Presence.2 <-> VR1.2 + C1.2 <-> Presence.3 <-> R12.2 <-> R22.1 <-> VR1.3 C1.2 <-> R13.1 <-> R23.2 C1.2 <-> R7.2 - C2.1 <-> C2.1 <-> R10.2 <-> R7.1 - C2.1 <-> D2.2 <-> D4.2 <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 - C2.1 <-> R1.2 <-> R2.1 <-> R4.2 - C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 - C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> R26.1 - C3.1 <-> Treble.1 <-> VR1.1 + C2.+ <-> C2.+ <-> R10.2 <-> R7.1 + C2.+ <-> D2.K <-> D4.K <-> R18.1 <-> R27.2 <-> V2.3 <-> V2.3 <-> V2.3 + C2.+ <-> R1.2 <-> R2.1 <-> R4.2 + C2.+ <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 + C2.+ <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 + C2.- <-> R26.1 + C3.1 <-> Treble.3 <-> VR1.3 C3.2 <-> R1.1 <-> R3.2 C4.1 <-> R5.1 <-> V1.2 C4.2 <-> R2.2 - C5.1 <-> C5.1 <-> C5.1 <-> R21.2 <-> R21.2 <-> V1.3 - C5.1 <-> C5.1 <-> R21.2 <-> V1.8 - C5.2 <-> C5.2 <-> C5.2 <-> R21.1 <-> R21.1 - C5.2 <-> C5.2 <-> D5.1 <-> R20.2 + C5.+ <-> C5.+ <-> C5.+ <-> R21.2 <-> R21.2 <-> V1.3 + C5.+ <-> C5.+ <-> R21.2 <-> V1.8 + C5.- <-> C5.- <-> C5.- <-> R21.1 <-> R21.1 + C5.- <-> C5.- <-> D5.A <-> R20.2 C7.1 <-> V1.2 <-> Volume.2 - C7.2 <-> Treble.2 <-> Volume.1 <-> VR1.2 - D1.1 <-> D3.1 <-> R19.1 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - D5.2 <-> R19.2 + C7.2 <-> Treble.2 <-> Volume.3 <-> VR1.2 + D1.A <-> D3.A <-> R19.1 + D1.K <-> D2.A + D3.K <-> D4.A + D5.K <-> R19.2 J20.Ring <-> J20.Sleeve <-> J20.Tip <-> R22.2 - Middle.1 <-> VR1.1 + Middle.3 <-> VR1.3 R11.1 <-> R12.1 <-> R8.2 <-> R9.1 R11.2 <-> V1.3 <-> V1.8 R23.1 <-> R23.1 diff --git a/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt index 1fe35ca75..ba22d4a40 100644 --- a/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> R1.1 <-> R1.2 + C1.1 <-> R1.1 diff --git a/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt index 1fe35ca75..ba22d4a40 100644 --- a/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> R1.1 <-> R1.2 + C1.1 <-> R1.1 diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt index 3888eab0b..56ca6a1c1 100644 --- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt @@ -1,26 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] VR1.1 <-> C25.2 VR1.2 <-> C2.2 VR1.2 <-> C4.1 <-> C4.2 <-> R19.2 <-> R8.1 <-> V5.2 - VR1.3 <-> VR1.3 <-> VR1.3 <-> VR1.3 <-> C12.1 <-> R1.1 <-> R19.1 <-> R20.1 <-> R3.1 <-> R42.2 <-> R44.1 <-> V1.1 <-> VR2.1 + VR1.3 <-> VR1.3 <-> VR1.3 <-> VR1.3 <-> C12.+ <-> R1.1 <-> R19.1 <-> R20.1 <-> R3.1 <-> R42.2 <-> R44.1 <-> V1.1 <-> VR2.1 0,6W.1 <-> C19.1 <-> R32.2 0,6W.2 <-> C22.1 2W.1 <-> C45.1 <-> VR4.1 <-> VR4.3 + C1.- <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.- <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.+ <-> C57.+ <-> C58.2 <-> C59.+ <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 C1.1 <-> R11.2 <-> V9.2 - C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3 C10.1 <-> C11.1 <-> R31.2 C10.2 <-> VR1.3 <-> VR7.2 C11.2 <-> VR8.1 - C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2 + C12.- <-> C17.- <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.- <-> C46.1 <-> C56.- <-> C57.- <-> C59.- <-> C6.+ <-> C61.- <-> C8.- <-> D7.A <-> D9.A <-> GND <-> R34.2 <-> R38.1 <-> R76.2 C13.1 <-> R9.2 C13.2 <-> VR2.2 C14.1 <-> R21.2 <-> R8.2 C14.2 <-> V5.1 C16.1 <-> R28.2 <-> R29.1 <-> V6.2 C16.2 <-> VR3.2 - C17.1 <-> R26.1 <-> R28.1 - C18.1 <-> D3.2 <-> D8.2 <-> R32.1 + C17.+ <-> R26.1 <-> R28.1 <-> R66.1 + C18.1 <-> D3.K <-> D8.K <-> R32.1 C2.1 <-> R1.2 <-> V1.2 C20.1 <-> R33.1 C21.1 <-> R35.1 @@ -35,7 +35,7 @@ Switch setup: [Default] C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4 C28.2 <-> R17.2 <-> R50.2 C29.1 <-> R2.1 <-> V14.3 - C3.1 <-> R18.1 <-> V5.3 + C3.+ <-> R18.1 <-> V5.3 C30.1 <-> R84.1 <-> R85.1 <-> VR12.3 <-> VR4.2 <-> VR9.3 C31.1 <-> R89.2 <-> V27.2 C31.2 <-> C51.1 <-> R63.1 @@ -46,30 +46,32 @@ Switch setup: [Default] C34.1 <-> R37.2 <-> V7.1 C36.1 <-> R69.2 <-> V7.2 C36.2 <-> R70.1 - C37.1 <-> C6.2 <-> R10.2 <-> R69.1 <-> R73.1 + C37.1 <-> C6.- <-> R10.2 <-> R69.1 <-> R73.1 C37.2 <-> C38.1 <-> R73.2 <-> V8.2 - C38.2 <-> C41.2 <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3 + C38.2 <-> C41.- <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3 C39.2 <-> R90.2 <-> VR10.2 C40.1 <-> R17.1 <-> V3.2 C40.2 <-> R6.1 C42.1 <-> R66.2 <-> V10.2 C43.1 <-> Cl Gain.2 C43.2 <-> Cl Gain.1 <-> V10.1 - C44.1 <-> R11.1 <-> R89.1 <-> R91.1 + C44.+ <-> R11.1 <-> R89.1 <-> R91.1 C47.1 <-> R78.2 <-> V16.2 C47.2 <-> VR18.2 C49.2 <-> R86.1 <-> V19.1 C54.2 <-> R40.2 <-> V23.3 C60.1 <-> R104.2 <-> R106.2 <-> R41.1 C60.2 <-> R108.2 <-> V25.1 - C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 + C61.+ <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 C62.2 <-> L195.2 <-> R110.2 <-> VR21.2 C7.1 <-> R27.2 <-> V15.2 - C8.1 <-> R22.1 <-> R5.1 <-> V22.2 - C9.1 <-> R25.2 <-> R92.1 - D3.1 <-> D7.2 - D4.1 <-> R43.2 - D8.1 <-> D9.2 + C7.2 <-> R39.1 + C8.+ <-> R22.1 <-> R5.1 <-> V22.2 + C9.1 <-> R25.2 <-> R31.1 <-> R92.1 + C9.2 <-> VR1.2 + D3.A <-> D7.K + D4.A <-> R43.2 + D8.A <-> D9.K F1.2 <-> L29.1 <-> L29.2 L109.2 <-> VR11.2 L129.1 <-> L130.2 @@ -89,6 +91,7 @@ Switch setup: [Default] R16.1 <-> V6.3 R2.2 <-> R40.1 <-> VR6.1 R22.2 <-> V21.2 + R24.1 <-> V15.3 R25.1 <-> V22.3 R30.2 <-> V9.3 R33.2 <-> R34.1 diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt index 3888eab0b..56ca6a1c1 100644 --- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt @@ -1,26 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] VR1.1 <-> C25.2 VR1.2 <-> C2.2 VR1.2 <-> C4.1 <-> C4.2 <-> R19.2 <-> R8.1 <-> V5.2 - VR1.3 <-> VR1.3 <-> VR1.3 <-> VR1.3 <-> C12.1 <-> R1.1 <-> R19.1 <-> R20.1 <-> R3.1 <-> R42.2 <-> R44.1 <-> V1.1 <-> VR2.1 + VR1.3 <-> VR1.3 <-> VR1.3 <-> VR1.3 <-> C12.+ <-> R1.1 <-> R19.1 <-> R20.1 <-> R3.1 <-> R42.2 <-> R44.1 <-> V1.1 <-> VR2.1 0,6W.1 <-> C19.1 <-> R32.2 0,6W.2 <-> C22.1 2W.1 <-> C45.1 <-> VR4.1 <-> VR4.3 + C1.- <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.- <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.+ <-> C57.+ <-> C58.2 <-> C59.+ <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 C1.1 <-> R11.2 <-> V9.2 - C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3 C10.1 <-> C11.1 <-> R31.2 C10.2 <-> VR1.3 <-> VR7.2 C11.2 <-> VR8.1 - C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2 + C12.- <-> C17.- <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.- <-> C46.1 <-> C56.- <-> C57.- <-> C59.- <-> C6.+ <-> C61.- <-> C8.- <-> D7.A <-> D9.A <-> GND <-> R34.2 <-> R38.1 <-> R76.2 C13.1 <-> R9.2 C13.2 <-> VR2.2 C14.1 <-> R21.2 <-> R8.2 C14.2 <-> V5.1 C16.1 <-> R28.2 <-> R29.1 <-> V6.2 C16.2 <-> VR3.2 - C17.1 <-> R26.1 <-> R28.1 - C18.1 <-> D3.2 <-> D8.2 <-> R32.1 + C17.+ <-> R26.1 <-> R28.1 <-> R66.1 + C18.1 <-> D3.K <-> D8.K <-> R32.1 C2.1 <-> R1.2 <-> V1.2 C20.1 <-> R33.1 C21.1 <-> R35.1 @@ -35,7 +35,7 @@ Switch setup: [Default] C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4 C28.2 <-> R17.2 <-> R50.2 C29.1 <-> R2.1 <-> V14.3 - C3.1 <-> R18.1 <-> V5.3 + C3.+ <-> R18.1 <-> V5.3 C30.1 <-> R84.1 <-> R85.1 <-> VR12.3 <-> VR4.2 <-> VR9.3 C31.1 <-> R89.2 <-> V27.2 C31.2 <-> C51.1 <-> R63.1 @@ -46,30 +46,32 @@ Switch setup: [Default] C34.1 <-> R37.2 <-> V7.1 C36.1 <-> R69.2 <-> V7.2 C36.2 <-> R70.1 - C37.1 <-> C6.2 <-> R10.2 <-> R69.1 <-> R73.1 + C37.1 <-> C6.- <-> R10.2 <-> R69.1 <-> R73.1 C37.2 <-> C38.1 <-> R73.2 <-> V8.2 - C38.2 <-> C41.2 <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3 + C38.2 <-> C41.- <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3 C39.2 <-> R90.2 <-> VR10.2 C40.1 <-> R17.1 <-> V3.2 C40.2 <-> R6.1 C42.1 <-> R66.2 <-> V10.2 C43.1 <-> Cl Gain.2 C43.2 <-> Cl Gain.1 <-> V10.1 - C44.1 <-> R11.1 <-> R89.1 <-> R91.1 + C44.+ <-> R11.1 <-> R89.1 <-> R91.1 C47.1 <-> R78.2 <-> V16.2 C47.2 <-> VR18.2 C49.2 <-> R86.1 <-> V19.1 C54.2 <-> R40.2 <-> V23.3 C60.1 <-> R104.2 <-> R106.2 <-> R41.1 C60.2 <-> R108.2 <-> V25.1 - C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 + C61.+ <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 C62.2 <-> L195.2 <-> R110.2 <-> VR21.2 C7.1 <-> R27.2 <-> V15.2 - C8.1 <-> R22.1 <-> R5.1 <-> V22.2 - C9.1 <-> R25.2 <-> R92.1 - D3.1 <-> D7.2 - D4.1 <-> R43.2 - D8.1 <-> D9.2 + C7.2 <-> R39.1 + C8.+ <-> R22.1 <-> R5.1 <-> V22.2 + C9.1 <-> R25.2 <-> R31.1 <-> R92.1 + C9.2 <-> VR1.2 + D3.A <-> D7.K + D4.A <-> R43.2 + D8.A <-> D9.K F1.2 <-> L29.1 <-> L29.2 L109.2 <-> VR11.2 L129.1 <-> L130.2 @@ -89,6 +91,7 @@ Switch setup: [Default] R16.1 <-> V6.3 R2.2 <-> R40.1 <-> VR6.1 R22.2 <-> V21.2 + R24.1 <-> V15.3 R25.1 <-> V22.3 R30.2 <-> V9.3 R33.2 <-> R34.1 diff --git a/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt index 0d0dd9e1d..c3f72e4be 100644 --- a/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .02.1 <-> 33k.1 .02.1 <-> 33k.1 .02.2 <-> 470K.1 .02.2 <-> 470K.1 0.1.1 <-> 820K.1 - 0.1.2 <-> 1k2.1 <-> 3u3 50v.1 - 180k.1 <-> 1k2.2 <-> 3u3 50v.2 <-> 560R.1 - 1k5.1 <-> 22k.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22uF 450v.2 <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.2 <-> 80u 450v.2 <-> D1.1 <-> D3.1 - 1k5.2 <-> 80u 450v.1 <-> D2.2 <-> D4.2 - 220K.2 <-> 22k.1 <-> 22uF 450v.1 <-> 820K.2 - 270R.1 <-> 47u 50v.1 - D1.2 <-> D2.1 - D3.2 <-> D4.1 + 0.1.2 <-> 1k2.1 <-> 3u3 50v.+ + 180k.1 <-> 1k2.2 <-> 3u3 50v.- <-> 560R.1 + 1k5.1 <-> 22k.2 <-> 22u 450v.+ <-> 22u 450v.- <-> 22uF 450v.- <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.- <-> 80u 450v.- <-> D1.A <-> D3.A + 1k5.2 <-> 80u 450v.+ <-> D2.K <-> D4.K + 220K.2 <-> 22k.1 <-> 22uF 450v.+ <-> 820K.2 + 270R.1 <-> 47u 50v.+ + D1.K <-> D2.A + D3.K <-> D4.A diff --git a/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt index 0d0dd9e1d..c3f72e4be 100644 --- a/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .02.1 <-> 33k.1 .02.1 <-> 33k.1 .02.2 <-> 470K.1 .02.2 <-> 470K.1 0.1.1 <-> 820K.1 - 0.1.2 <-> 1k2.1 <-> 3u3 50v.1 - 180k.1 <-> 1k2.2 <-> 3u3 50v.2 <-> 560R.1 - 1k5.1 <-> 22k.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22uF 450v.2 <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.2 <-> 80u 450v.2 <-> D1.1 <-> D3.1 - 1k5.2 <-> 80u 450v.1 <-> D2.2 <-> D4.2 - 220K.2 <-> 22k.1 <-> 22uF 450v.1 <-> 820K.2 - 270R.1 <-> 47u 50v.1 - D1.2 <-> D2.1 - D3.2 <-> D4.1 + 0.1.2 <-> 1k2.1 <-> 3u3 50v.+ + 180k.1 <-> 1k2.2 <-> 3u3 50v.- <-> 560R.1 + 1k5.1 <-> 22k.2 <-> 22u 450v.+ <-> 22u 450v.- <-> 22uF 450v.- <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.- <-> 80u 450v.- <-> D1.A <-> D3.A + 1k5.2 <-> 80u 450v.+ <-> D2.K <-> D4.K + 220K.2 <-> 22k.1 <-> 22uF 450v.+ <-> 820K.2 + 270R.1 <-> 47u 50v.+ + D1.K <-> D2.A + D3.K <-> D4.A diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt index 44a578b0b..c95d4af54 100644 --- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 + .1 <-> .1 <-> C1.- <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.- <-> C24.- <-> C27.- <-> C31.- <-> C32.- <-> C39.- <-> C40.- <-> C41.- <-> C42.2 <-> C44.2 <-> C5.- <-> D1.K <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 .1 <-> .2 .1 <-> .2 Bass.1 <-> R60.2 @@ -19,10 +19,10 @@ Switch setup: [Default] C20.1 <-> C25.1 <-> V5B.1 C21.1 <-> R23.1 <-> V5A.1 C22.1 <-> R35.2 - C23.1 <-> R26.1 - C24.1 <-> R27.1 + C23.+ <-> R26.1 + C24.+ <-> R27.1 C25.2 <-> C26.1 - C27.1 <-> R26.2 + C27.+ <-> R26.2 C28.1 <-> R32.2 <-> R33.2 C29.1 <-> R52.1 <-> R53.1 C3.2 <-> R9.1 @@ -36,9 +36,9 @@ Switch setup: [Default] C36.2 <-> R51.1 <-> R54.1 C37.1 <-> V6a.2 C37.2 <-> R50.1 <-> V6b.2 - C38.1 <-> V8.3 - C39.1 <-> R59.1 - C40.1 <-> R27.2 <-> R59.2 + C38.+ <-> V8.3 + C39.+ <-> R59.1 + C40.+ <-> R27.2 <-> R59.2 C42.1 <-> Choke.2 C43.1 <-> C46.2 C43.2 <-> Treble.2 @@ -48,9 +48,9 @@ Switch setup: [Default] C49.1 <-> R10.1 <-> V1B.2 C49.2 <-> R64.1 C6.1 <-> R35.1 - C8.1 <-> V4B.3 + C8.+ <-> V4B.3 C9.2 <-> R12.2 - D1.1 <-> V5A.3 + D1.A <-> V5A.3 Dwell.1 <-> V2A.1 Mix.1 <-> R42.1 NFB.2 <-> R1.2 diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt index 44a578b0b..c95d4af54 100644 --- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 + .1 <-> .1 <-> C1.- <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.- <-> C24.- <-> C27.- <-> C31.- <-> C32.- <-> C39.- <-> C40.- <-> C41.- <-> C42.2 <-> C44.2 <-> C5.- <-> D1.K <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 .1 <-> .2 .1 <-> .2 Bass.1 <-> R60.2 @@ -19,10 +19,10 @@ Switch setup: [Default] C20.1 <-> C25.1 <-> V5B.1 C21.1 <-> R23.1 <-> V5A.1 C22.1 <-> R35.2 - C23.1 <-> R26.1 - C24.1 <-> R27.1 + C23.+ <-> R26.1 + C24.+ <-> R27.1 C25.2 <-> C26.1 - C27.1 <-> R26.2 + C27.+ <-> R26.2 C28.1 <-> R32.2 <-> R33.2 C29.1 <-> R52.1 <-> R53.1 C3.2 <-> R9.1 @@ -36,9 +36,9 @@ Switch setup: [Default] C36.2 <-> R51.1 <-> R54.1 C37.1 <-> V6a.2 C37.2 <-> R50.1 <-> V6b.2 - C38.1 <-> V8.3 - C39.1 <-> R59.1 - C40.1 <-> R27.2 <-> R59.2 + C38.+ <-> V8.3 + C39.+ <-> R59.1 + C40.+ <-> R27.2 <-> R59.2 C42.1 <-> Choke.2 C43.1 <-> C46.2 C43.2 <-> Treble.2 @@ -48,9 +48,9 @@ Switch setup: [Default] C49.1 <-> R10.1 <-> V1B.2 C49.2 <-> R64.1 C6.1 <-> R35.1 - C8.1 <-> V4B.3 + C8.+ <-> V4B.3 C9.2 <-> R12.2 - D1.1 <-> V5A.3 + D1.A <-> V5A.3 Dwell.1 <-> V2A.1 Mix.1 <-> R42.1 NFB.2 <-> R1.2 diff --git a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt index 3d9ed5621..eb3be42b2 100644 --- a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt @@ -1,6 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.32 <-> IC1.33 <-> IC1.34 <-> IC1.35 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.41 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC1.46 <-> IC1.47 <-> IC1.48 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.23 <-> IC2.24 <-> IC2.25 <-> IC2.26 <-> IC2.27 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.32 <-> IC2.33 <-> IC2.34 <-> IC2.35 <-> IC2.36 <-> IC2.37 <-> IC2.38 <-> IC2.39 <-> IC2.4 <-> IC2.40 <-> IC2.41 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC2.46 <-> IC2.47 <-> IC2.48 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.8 <-> IC4.9 - IC3.15 <-> IC3.7 - IC4.15 <-> IC4.7 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.4 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.33 <-> IC2.4 <-> IC3.4 <-> IC3.8 <-> IC4.8 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.32 <-> IC1.42 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.32 <-> IC2.42 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.9 <-> IC4.6 <-> IC4.9 + IC1.1 <-> IC2.1 + IC1.12 <-> IC2.12 + IC1.13 <-> IC2.13 + IC1.14 <-> IC2.14 + IC1.15 <-> IC2.15 + IC1.16 <-> IC2.16 + IC1.17 <-> IC2.17 + IC1.18 <-> IC2.18 + IC1.19 <-> IC2.19 + IC1.2 <-> IC2.2 + IC1.25 <-> IC2.25 + IC1.26 <-> IC2.26 + IC1.27 <-> IC2.27 <-> IC3.5 <-> IC4.5 + IC3.1 <-> IC4.1 + IC3.2 <-> IC4.2 + IC3.3 <-> IC4.3 + IC3.6 <-> IC4.4 diff --git a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt index 3d9ed5621..eb3be42b2 100644 --- a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt @@ -1,6 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.32 <-> IC1.33 <-> IC1.34 <-> IC1.35 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.41 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC1.46 <-> IC1.47 <-> IC1.48 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.23 <-> IC2.24 <-> IC2.25 <-> IC2.26 <-> IC2.27 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.32 <-> IC2.33 <-> IC2.34 <-> IC2.35 <-> IC2.36 <-> IC2.37 <-> IC2.38 <-> IC2.39 <-> IC2.4 <-> IC2.40 <-> IC2.41 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC2.46 <-> IC2.47 <-> IC2.48 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.8 <-> IC4.9 - IC3.15 <-> IC3.7 - IC4.15 <-> IC4.7 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.4 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.33 <-> IC2.4 <-> IC3.4 <-> IC3.8 <-> IC4.8 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.32 <-> IC1.42 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.32 <-> IC2.42 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.9 <-> IC4.6 <-> IC4.9 + IC1.1 <-> IC2.1 + IC1.12 <-> IC2.12 + IC1.13 <-> IC2.13 + IC1.14 <-> IC2.14 + IC1.15 <-> IC2.15 + IC1.16 <-> IC2.16 + IC1.17 <-> IC2.17 + IC1.18 <-> IC2.18 + IC1.19 <-> IC2.19 + IC1.2 <-> IC2.2 + IC1.25 <-> IC2.25 + IC1.26 <-> IC2.26 + IC1.27 <-> IC2.27 <-> IC3.5 <-> IC4.5 + IC3.1 <-> IC4.1 + IC3.2 <-> IC4.2 + IC3.3 <-> IC4.3 + IC3.6 <-> IC4.4 diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt index ca367ba21..349be53e9 100644 --- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt @@ -1,64 +1,66 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R2.2 <-> V7.2 <-> V7.8 - C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> C8.1 <-> C9.1 + C1.+ <-> C2.+ <-> R2.2 <-> V7.2 <-> V7.8 + C1.- <-> C3.- <-> C4.- <-> C6.- <-> C7.- <-> C8.+ <-> C9.+ C10.1 <-> R13.1 <-> V3.2 - C10.2 <-> C11.2 <-> C18.2 <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R53.1 - C11.1 <-> V3.3 + C10.2 <-> C11.- <-> C18.- <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R49.2 <-> R51.2 <-> R53.1 + C11.+ <-> V3.3 C12.1 <-> R14.1 C12.2 <-> R16.1 - C13.1 <-> R16.2 <-> VR1 Gain.1 + C13.1 <-> R16.2 <-> VR1 Gain.3 C13.2 <-> V3.7 <-> VR1 Gain.2 - C14.1 <-> R18.1 <-> V3.8 - C14.2 <-> R18.2 <-> R20.2 - C15.1 <-> R17.1 <-> V3.6 - C15.2 <-> C16.2 <-> R19.1 <-> VR3 MID.1 + C14.+ <-> R18.1 + C14.- <-> R18.2 <-> R20.2 + C15.1 <-> R17.1 + C15.2 <-> C16.2 <-> R19.1 <-> VR3 MID.3 C16.1 <-> C17.2 <-> R20.1 - C18.1 <-> R23.1 - C19.1 <-> D1.2 <-> R26.1 <-> V2.8 + C17.1 <-> VR3 MID.1 + C18.+ <-> R23.1 + C19.1 <-> D1.K <-> R26.1 <-> V2.8 C19.2 <-> C20.1 <-> R27.1 - C2.2 <-> C5.2 - C20.2 <-> VR4 TREBLE.1 + C2.- <-> C5.- + C20.2 <-> VR4 TREBLE.3 + C21.1 <-> R27.2 <-> VR3 BASS.1 <-> VR4 TREBLE.1 C21.2 <-> R28.2 <-> VR3 BASS.2 C22.1 <-> C33.1 <-> R29.2 C22.2 <-> R34.1 <-> V4.2 C23.1 <-> R31.1 <-> R32.2 <-> R33.1 - C23.2 <-> VR6 PRESENCE.3 + C23.2 <-> VR6 PRESENCE.1 C25.2 <-> R35.2 <-> V4.7 C26.1 <-> R37.1 <-> V4.1 C26.2 <-> R39.1 <-> R41.1 C27.1 <-> R38.2 C27.2 <-> R40.1 <-> R42.1 C28.1 <-> R29.1 <-> VR5 VOLUME.2 - C28.2 <-> V1.2 <-> VR6 DWELL.1 <-> VR6 DWELL.2 - C29.1 <-> R49.1 - C3.1 <-> R3.1 + C28.2 <-> V1.2 <-> VR6 DWELL.2 <-> VR6 DWELL.3 + C29.+ <-> R49.1 + C3.+ <-> R3.1 C30.2 <-> R48.2 <-> V1.1 C31.2 <-> R53.2 C32.1 <-> R52.1 C32.2 <-> VR7 LEVEL.2 C33.2 <-> R54.1 - C34.1 <-> VR8 TONE.1 <-> VR8 TONE.2 - C34.2 <-> R54.2 <-> VR7 LEVEL.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 - C6.1 <-> R5.2 - C7.1 <-> R6.2 - C8.2 <-> D2.1 - C9.2 <-> R10.2 <-> R9.2 <-> VR10 BIAS.1 - D1.1 <-> R25.2 - D2.2 <-> R8.1 + C34.1 <-> VR8 TONE.2 <-> VR8 TONE.3 + C34.2 <-> R54.2 <-> VR7 LEVEL.3 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 + C6.+ <-> R5.2 + C7.+ <-> R6.2 + C8.- <-> D2.A <-> R9.1 + C9.- <-> R10.2 <-> R9.2 <-> VR10 BIAS.3 + D1.A <-> R25.2 + D2.K <-> R8.1 + J2.Sleeve <-> R33.2 R10.1 <-> R39.2 <-> R40.2 <-> VR10 BIAS.2 - R11.1 <-> VR10 BIAS.3 + R11.1 <-> VR10 BIAS.1 R11.2 <-> R43.2 <-> R44.1 R12.1 <-> R13.2 - R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 + R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.1 <-> VR3 BASS.3 <-> VR5 VOLUME.1 <-> VR6 PRESENCE.2 <-> VR6 PRESENCE.3 <-> VR7 LEVEL.1 <-> VR8 TONE.1 R14.2 <-> R17.2 R21.1 <-> V2.2 R21.2 <-> VR3 MID.2 R22.1 <-> R24.2 R24.1 <-> R25.1 <-> V2.7 - R27.2 <-> VR3 BASS.3 <-> VR4 TREBLE.3 R32.1 <-> R34.2 <-> R35.1 <-> R36.2 R41.2 <-> V5.5 R42.2 <-> V6.5 @@ -67,10 +69,9 @@ Switch setup: [Default] R45.1 <-> V5.4 R45.2 <-> R46.2 R46.1 <-> V6.4 - R47.1 <-> VR6 DWELL.3 - R49.2 <-> R51.2 + R47.1 <-> VR6 DWELL.1 R50.1 <-> R51.1 <-> V1.7 R8.2 <-> V7.4 <-> V7.6 V5.3 <-> V6.3 - VR4 TREBLE.2 <-> VR5 VOLUME.1 + VR4 TREBLE.2 <-> VR5 VOLUME.3 diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt index ca367ba21..349be53e9 100644 --- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt @@ -1,64 +1,66 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R2.2 <-> V7.2 <-> V7.8 - C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> C8.1 <-> C9.1 + C1.+ <-> C2.+ <-> R2.2 <-> V7.2 <-> V7.8 + C1.- <-> C3.- <-> C4.- <-> C6.- <-> C7.- <-> C8.+ <-> C9.+ C10.1 <-> R13.1 <-> V3.2 - C10.2 <-> C11.2 <-> C18.2 <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R53.1 - C11.1 <-> V3.3 + C10.2 <-> C11.- <-> C18.- <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R49.2 <-> R51.2 <-> R53.1 + C11.+ <-> V3.3 C12.1 <-> R14.1 C12.2 <-> R16.1 - C13.1 <-> R16.2 <-> VR1 Gain.1 + C13.1 <-> R16.2 <-> VR1 Gain.3 C13.2 <-> V3.7 <-> VR1 Gain.2 - C14.1 <-> R18.1 <-> V3.8 - C14.2 <-> R18.2 <-> R20.2 - C15.1 <-> R17.1 <-> V3.6 - C15.2 <-> C16.2 <-> R19.1 <-> VR3 MID.1 + C14.+ <-> R18.1 + C14.- <-> R18.2 <-> R20.2 + C15.1 <-> R17.1 + C15.2 <-> C16.2 <-> R19.1 <-> VR3 MID.3 C16.1 <-> C17.2 <-> R20.1 - C18.1 <-> R23.1 - C19.1 <-> D1.2 <-> R26.1 <-> V2.8 + C17.1 <-> VR3 MID.1 + C18.+ <-> R23.1 + C19.1 <-> D1.K <-> R26.1 <-> V2.8 C19.2 <-> C20.1 <-> R27.1 - C2.2 <-> C5.2 - C20.2 <-> VR4 TREBLE.1 + C2.- <-> C5.- + C20.2 <-> VR4 TREBLE.3 + C21.1 <-> R27.2 <-> VR3 BASS.1 <-> VR4 TREBLE.1 C21.2 <-> R28.2 <-> VR3 BASS.2 C22.1 <-> C33.1 <-> R29.2 C22.2 <-> R34.1 <-> V4.2 C23.1 <-> R31.1 <-> R32.2 <-> R33.1 - C23.2 <-> VR6 PRESENCE.3 + C23.2 <-> VR6 PRESENCE.1 C25.2 <-> R35.2 <-> V4.7 C26.1 <-> R37.1 <-> V4.1 C26.2 <-> R39.1 <-> R41.1 C27.1 <-> R38.2 C27.2 <-> R40.1 <-> R42.1 C28.1 <-> R29.1 <-> VR5 VOLUME.2 - C28.2 <-> V1.2 <-> VR6 DWELL.1 <-> VR6 DWELL.2 - C29.1 <-> R49.1 - C3.1 <-> R3.1 + C28.2 <-> V1.2 <-> VR6 DWELL.2 <-> VR6 DWELL.3 + C29.+ <-> R49.1 + C3.+ <-> R3.1 C30.2 <-> R48.2 <-> V1.1 C31.2 <-> R53.2 C32.1 <-> R52.1 C32.2 <-> VR7 LEVEL.2 C33.2 <-> R54.1 - C34.1 <-> VR8 TONE.1 <-> VR8 TONE.2 - C34.2 <-> R54.2 <-> VR7 LEVEL.1 - C4.1 <-> R3.2 <-> R4.1 - C5.1 <-> R4.2 <-> R5.1 - C6.1 <-> R5.2 - C7.1 <-> R6.2 - C8.2 <-> D2.1 - C9.2 <-> R10.2 <-> R9.2 <-> VR10 BIAS.1 - D1.1 <-> R25.2 - D2.2 <-> R8.1 + C34.1 <-> VR8 TONE.2 <-> VR8 TONE.3 + C34.2 <-> R54.2 <-> VR7 LEVEL.3 + C4.+ <-> R3.2 <-> R4.1 + C5.+ <-> R4.2 <-> R5.1 + C6.+ <-> R5.2 + C7.+ <-> R6.2 + C8.- <-> D2.A <-> R9.1 + C9.- <-> R10.2 <-> R9.2 <-> VR10 BIAS.3 + D1.A <-> R25.2 + D2.K <-> R8.1 + J2.Sleeve <-> R33.2 R10.1 <-> R39.2 <-> R40.2 <-> VR10 BIAS.2 - R11.1 <-> VR10 BIAS.3 + R11.1 <-> VR10 BIAS.1 R11.2 <-> R43.2 <-> R44.1 R12.1 <-> R13.2 - R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 + R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.1 <-> VR3 BASS.3 <-> VR5 VOLUME.1 <-> VR6 PRESENCE.2 <-> VR6 PRESENCE.3 <-> VR7 LEVEL.1 <-> VR8 TONE.1 R14.2 <-> R17.2 R21.1 <-> V2.2 R21.2 <-> VR3 MID.2 R22.1 <-> R24.2 R24.1 <-> R25.1 <-> V2.7 - R27.2 <-> VR3 BASS.3 <-> VR4 TREBLE.3 R32.1 <-> R34.2 <-> R35.1 <-> R36.2 R41.2 <-> V5.5 R42.2 <-> V6.5 @@ -67,10 +69,9 @@ Switch setup: [Default] R45.1 <-> V5.4 R45.2 <-> R46.2 R46.1 <-> V6.4 - R47.1 <-> VR6 DWELL.3 - R49.2 <-> R51.2 + R47.1 <-> VR6 DWELL.1 R50.1 <-> R51.1 <-> V1.7 R8.2 <-> V7.4 <-> V7.6 V5.3 <-> V6.3 - VR4 TREBLE.2 <-> VR5 VOLUME.1 + VR4 TREBLE.2 <-> VR5 VOLUME.3 diff --git a/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_excl_switches.txt index cacbad02b..b1d6d3238 100644 --- a/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022uF 600V Coupling.1 <-> Grid Leak V2B.1 <-> V2.7 .022uF 600V Coupling.2 <-> Load V2A.2 <-> V2.1 @@ -12,21 +12,21 @@ Switch setup: [Default] .1uF 600V Coupling.2 <-> Cathode V2B.1 <-> V2.8 6.3v CT.1 <-> V4.4 6.3v CT.1 <-> V4.5 - 6.3v CT.2 <-> 6.3v CT.2 <-> Bypass V3 & V4.1 <-> Cathode 3W.2 <-> V3.1 <-> V3.6 <-> V3.9 <-> V4.1 <-> V4.6 <-> V4.9 - Aux Speaker.Tip <-> Speaker.Shunt <-> Speaker.Tip - Bright Volume.1 <-> Normal Volume.1 <-> Tone.2 <-> V2.2 - Bright Volume.3 <-> Tone Mica.2 - Brite Mica.1 <-> Tone.1 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 <-> V1.8 - Bypass V1.2 <-> Filter B+3.2 <-> Grid Leak V3.2 <-> Grid Leak V4.2 <-> Input Jack.Shunt <-> Input.1 <-> Tail Load V2B.2 - Bypass V2A.1 <-> Cathode V2A.2 <-> V2.3 - Bypass V2A.2 <-> Cathode V2A.1 - Bypass V3 & V4.2 <-> Cathode 3W.1 <-> Filter B+2.2 + 6.3v CT.2 <-> 6.3v CT.2 <-> Bypass V3 & V4.+ <-> Cathode 3W.2 <-> V3.1 <-> V3.6 <-> V3.9 <-> V4.1 <-> V4.6 <-> V4.9 + Aux Speaker.Tip <-> Speaker.Shunt <-> Speaker.Sleeve <-> Speaker.Tip + Bright Volume.1 <-> Tone Mica.2 + Bright Volume.3 <-> Normal Volume.3 <-> Tone.2 <-> V2.2 + Brite Mica.1 <-> Tone.3 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 <-> V1.8 + Bypass V1.- <-> Filter B+3.- <-> Grid Leak V3.2 <-> Grid Leak V4.2 <-> Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 <-> Tail Load V2B.2 + Bypass V2A.+ <-> Cathode V2A.2 <-> V2.3 + Bypass V2A.- <-> Cathode V2A.1 + Bypass V3 & V4.- <-> Cathode 3W.1 <-> Filter B+2.- Cathode V2B.2 <-> Grid Leak V2B.2 <-> Tail Load V2B.1 - Dropping B+2.1 <-> Filter B+1.1 <-> Rectifier1.2 <-> Rectifier2.2 <-> V4.7 - Dropping B+2.2 <-> Dropping B+3.1 <-> Filter B+2.1 <-> V3.8 <-> V4.8 - Dropping B+3.2 <-> Filter B+3.1 <-> Load V1A.1 <-> Load V1B.1 <-> Load V2A.1 <-> Load V2B.1 - Filter B+1.2 <-> Rectifier3.1 <-> Rectifier4.1 + Dropping B+2.1 <-> Filter B+1.+ <-> Rectifier1.K <-> Rectifier2.K <-> V4.7 + Dropping B+2.2 <-> Dropping B+3.1 <-> Filter B+2.+ <-> V3.8 <-> V4.8 + Dropping B+3.2 <-> Filter B+3.+ <-> Load V1A.1 <-> Load V1B.1 <-> Load V2A.1 <-> Load V2B.1 + Filter B+1.- <-> Rectifier3.A <-> Rectifier4.A Grid Leak V3.1 <-> Grid Stop V3.1 <-> V3.2 Grid Leak V4.1 <-> Grid Stop V4.1 <-> V4.2 Grid Stopper.1 <-> Input Jack.Shunt <-> Input Jack.Tip <-> Input.2 @@ -35,8 +35,9 @@ Switch setup: [Default] Grid Stopper.1 <-> Input Jack.Tip Grid Stopper.2 <-> Grid Stopper.2 <-> V1.2 Grid Stopper.2 <-> Grid Stopper.2 <-> V1.7 - Rectifier1.1 <-> Rectifier2.1 <-> Rectifier3.2 <-> Rectifier4.2 - Tone Mica.1 <-> Tone.3 + Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 + Rectifier1.A <-> Rectifier2.A <-> Rectifier3.K <-> Rectifier4.K + Tone Mica.1 <-> Tone.1 V1.4 <-> V1.5 V2.4 <-> V2.5 diff --git a/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_incl_switches.txt index 291bc466b..b1d6d3238 100644 --- a/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Deluxe_Micro_EF80_Layout_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Power.ON1, Power.ON2] +Switch setup: [ ALL ] .022uF 600V Coupling.1 <-> Grid Leak V2B.1 <-> V2.7 .022uF 600V Coupling.2 <-> Load V2A.2 <-> V2.1 @@ -12,21 +12,21 @@ Switch setup: [Power.ON1, Power.ON2] .1uF 600V Coupling.2 <-> Cathode V2B.1 <-> V2.8 6.3v CT.1 <-> V4.4 6.3v CT.1 <-> V4.5 - 6.3v CT.2 <-> 6.3v CT.2 <-> Bypass V3 & V4.1 <-> Cathode 3W.2 <-> V3.1 <-> V3.6 <-> V3.9 <-> V4.1 <-> V4.6 <-> V4.9 - Aux Speaker.Tip <-> Speaker.Shunt <-> Speaker.Tip - Bright Volume.1 <-> Normal Volume.1 <-> Tone.2 <-> V2.2 - Bright Volume.3 <-> Tone Mica.2 - Brite Mica.1 <-> Tone.1 - Bypass V1.1 <-> Cathode V1.2 <-> V1.3 <-> V1.8 - Bypass V1.2 <-> Filter B+3.2 <-> Grid Leak V3.2 <-> Grid Leak V4.2 <-> Input Jack.Shunt <-> Input.1 <-> Tail Load V2B.2 - Bypass V2A.1 <-> Cathode V2A.2 <-> V2.3 - Bypass V2A.2 <-> Cathode V2A.1 - Bypass V3 & V4.2 <-> Cathode 3W.1 <-> Filter B+2.2 + 6.3v CT.2 <-> 6.3v CT.2 <-> Bypass V3 & V4.+ <-> Cathode 3W.2 <-> V3.1 <-> V3.6 <-> V3.9 <-> V4.1 <-> V4.6 <-> V4.9 + Aux Speaker.Tip <-> Speaker.Shunt <-> Speaker.Sleeve <-> Speaker.Tip + Bright Volume.1 <-> Tone Mica.2 + Bright Volume.3 <-> Normal Volume.3 <-> Tone.2 <-> V2.2 + Brite Mica.1 <-> Tone.3 + Bypass V1.+ <-> Cathode V1.2 <-> V1.3 <-> V1.8 + Bypass V1.- <-> Filter B+3.- <-> Grid Leak V3.2 <-> Grid Leak V4.2 <-> Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 <-> Tail Load V2B.2 + Bypass V2A.+ <-> Cathode V2A.2 <-> V2.3 + Bypass V2A.- <-> Cathode V2A.1 + Bypass V3 & V4.- <-> Cathode 3W.1 <-> Filter B+2.- Cathode V2B.2 <-> Grid Leak V2B.2 <-> Tail Load V2B.1 - Dropping B+2.1 <-> Filter B+1.1 <-> Rectifier1.2 <-> Rectifier2.2 <-> V4.7 - Dropping B+2.2 <-> Dropping B+3.1 <-> Filter B+2.1 <-> V3.8 <-> V4.8 - Dropping B+3.2 <-> Filter B+3.1 <-> Load V1A.1 <-> Load V1B.1 <-> Load V2A.1 <-> Load V2B.1 - Filter B+1.2 <-> Rectifier3.1 <-> Rectifier4.1 + Dropping B+2.1 <-> Filter B+1.+ <-> Rectifier1.K <-> Rectifier2.K <-> V4.7 + Dropping B+2.2 <-> Dropping B+3.1 <-> Filter B+2.+ <-> V3.8 <-> V4.8 + Dropping B+3.2 <-> Filter B+3.+ <-> Load V1A.1 <-> Load V1B.1 <-> Load V2A.1 <-> Load V2B.1 + Filter B+1.- <-> Rectifier3.A <-> Rectifier4.A Grid Leak V3.1 <-> Grid Stop V3.1 <-> V3.2 Grid Leak V4.1 <-> Grid Stop V4.1 <-> V4.2 Grid Stopper.1 <-> Input Jack.Shunt <-> Input Jack.Tip <-> Input.2 @@ -35,8 +35,9 @@ Switch setup: [Power.ON1, Power.ON2] Grid Stopper.1 <-> Input Jack.Tip Grid Stopper.2 <-> Grid Stopper.2 <-> V1.2 Grid Stopper.2 <-> Grid Stopper.2 <-> V1.7 - Rectifier1.1 <-> Rectifier2.1 <-> Rectifier3.2 <-> Rectifier4.2 - Tone Mica.1 <-> Tone.3 + Input Jack.Shunt <-> Input Jack.Sleeve <-> Input.1 + Rectifier1.A <-> Rectifier2.A <-> Rectifier3.K <-> Rectifier4.K + Tone Mica.1 <-> Tone.1 V1.4 <-> V1.5 V2.4 <-> V2.5 diff --git a/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Fender_Bassman_5F6_5F6A_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt index d8e66307b..9d5c118ad 100644 --- a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Balance.1 <-> Balance.2 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.3 <-> VR2.3 - Balance.3 <-> Volume.1 <-> VR2.1 - C1.2 <-> Tone.3 + Balance.1 <-> Volume.3 <-> VR2.3 + Balance.2 <-> Balance.3 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.1 <-> VR2.1 <-> VR2.2 + C1.2 <-> Tone.1 Tone.2 <-> Volume.2 diff --git a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt index d8e66307b..9d5c118ad 100644 --- a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Balance.1 <-> Balance.2 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.3 <-> VR2.3 - Balance.3 <-> Volume.1 <-> VR2.1 - C1.2 <-> Tone.3 + Balance.1 <-> Volume.3 <-> VR2.3 + Balance.2 <-> Balance.3 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.1 <-> VR2.1 <-> VR2.2 + C1.2 <-> Tone.1 Tone.2 <-> Volume.2 diff --git a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt index f9a082f1b..34213a8b7 100644 --- a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt @@ -1,11 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R1.1 - C1.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 - C10.1 <-> C12.1 <-> C14.1 <-> C2.2 <-> C9.1 <-> C9.2 <-> IC2.4 <-> IC2.8 <-> R4.2 <-> R5.2 <-> R6.2 - C10.2 <-> C12.2 <-> C2.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> IC2.2 <-> IC2.6 <-> R5.1 - C14.2 <-> D5.1 <-> IC2.3 <-> IC2.7 <-> R4.1 <-> R6.1 - C3.2 <-> D1.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R3.1 - C6.2 <-> C8.2 <-> D3.1 <-> D4.1 <-> D4.2 <-> IC1.1 <-> IC1.5 + C1.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C3.- <-> C7.- <-> C8.+ <-> D3.K <-> IC1.4 <-> R3.2 + C10.+ <-> D5.K <-> D6.A + C10.- <-> C9.+ <-> IC2.8 + C12.+ <-> D6.K + C12.- <-> C14.- <-> C2.2 <-> IC2.4 <-> R4.2 + C14.+ <-> D5.A <-> IC2.7 + C2.1 <-> IC2.2 <-> R5.1 + C3.+ <-> D1.A <-> IC1.7 + C4.+ <-> C5.- <-> C6.+ <-> IC1.8 + C4.- <-> R1.2 <-> R2.2 + C5.+ <-> D1.K <-> D2.A + C6.- <-> D3.A <-> D4.K + C7.+ <-> D2.K + C8.- <-> D4.A + C9.- <-> R5.2 <-> R6.2 + IC1.1 <-> IC1.5 + IC1.3 <-> R2.1 <-> R3.1 IC2.1 <-> IC2.5 + IC2.3 <-> R4.1 <-> R6.1 diff --git a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt index f9a082f1b..34213a8b7 100644 --- a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt @@ -1,11 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R1.1 - C1.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 - C10.1 <-> C12.1 <-> C14.1 <-> C2.2 <-> C9.1 <-> C9.2 <-> IC2.4 <-> IC2.8 <-> R4.2 <-> R5.2 <-> R6.2 - C10.2 <-> C12.2 <-> C2.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> IC2.2 <-> IC2.6 <-> R5.1 - C14.2 <-> D5.1 <-> IC2.3 <-> IC2.7 <-> R4.1 <-> R6.1 - C3.2 <-> D1.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R3.1 - C6.2 <-> C8.2 <-> D3.1 <-> D4.1 <-> D4.2 <-> IC1.1 <-> IC1.5 + C1.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C3.- <-> C7.- <-> C8.+ <-> D3.K <-> IC1.4 <-> R3.2 + C10.+ <-> D5.K <-> D6.A + C10.- <-> C9.+ <-> IC2.8 + C12.+ <-> D6.K + C12.- <-> C14.- <-> C2.2 <-> IC2.4 <-> R4.2 + C14.+ <-> D5.A <-> IC2.7 + C2.1 <-> IC2.2 <-> R5.1 + C3.+ <-> D1.A <-> IC1.7 + C4.+ <-> C5.- <-> C6.+ <-> IC1.8 + C4.- <-> R1.2 <-> R2.2 + C5.+ <-> D1.K <-> D2.A + C6.- <-> D3.A <-> D4.K + C7.+ <-> D2.K + C8.- <-> D4.A + C9.- <-> R5.2 <-> R6.2 + IC1.1 <-> IC1.5 + IC1.3 <-> R2.1 <-> R3.1 IC2.1 <-> IC2.5 + IC2.3 <-> R4.1 <-> R6.1 diff --git a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt index b6ed65526..40d4bac67 100644 --- a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001uF 630v.1 <-> R1.2 <-> R1.2 .001uF 630v.1 <-> R1.2 <-> R1.2 .001uF 630v.1 <-> R1.2 <-> R1.2 .001uF 630v.1 <-> R1.2 <-> R1.2 - .001uF 630v.2 <-> R1.1 - .001uF 630v.2 <-> R1.1 - .001uF 630v.2 <-> R1.1 - .001uF 630v.2 <-> R1.1 - .003uF 630v.1 <-> Reverb.1 - .003uF 630v.1 <-> Reverb.1 - .003uF 630v.1 <-> Reverb.1 - .003uF 630v.1 <-> Reverb.1 + .001uF 630v.2 <-> R1.1 <-> V1.2 + .001uF 630v.2 <-> R1.1 <-> V1.2 + .001uF 630v.2 <-> R1.1 <-> V1.2 + .001uF 630v.2 <-> R1.1 <-> V1.2 + .003uF 630v.1 <-> Reverb.3 + .003uF 630v.1 <-> Reverb.3 + .003uF 630v.1 <-> Reverb.3 + .003uF 630v.1 <-> Reverb.3 .003uF 630v.2 <-> R1.2 .003uF 630v.2 <-> R1.2 .003uF 630v.2 <-> R1.2 .003uF 630v.2 <-> R1.2 - .022uF 630v Mid.1 <-> Normal Bass.3 <-> R1.1 - .022uF 630v Mid.1 <-> Normal Bass.3 <-> R1.1 - .022uF 630v Mid.1 <-> Normal Bass.3 <-> R1.1 - .022uF 630v Mid.1 <-> Normal Bass.3 <-> R1.1 - .022uF 630v Mid.1 <-> Vibrato Bass.3 <-> Vibrato Mid.2 - .022uF 630v Mid.1 <-> Vibrato Bass.3 <-> Vibrato Mid.2 - .022uF 630v Mid.1 <-> Vibrato Bass.3 <-> Vibrato Mid.2 - .022uF 630v Mid.1 <-> Vibrato Bass.3 <-> Vibrato Mid.2 + .022uF 630v Mid.1 <-> Normal Bass.1 <-> R1.1 + .022uF 630v Mid.1 <-> Normal Bass.1 <-> R1.1 + .022uF 630v Mid.1 <-> Normal Bass.1 <-> R1.1 + .022uF 630v Mid.1 <-> Normal Bass.1 <-> R1.1 + .022uF 630v Mid.1 <-> Vibrato Bass.1 <-> Vibrato Mid.2 + .022uF 630v Mid.1 <-> Vibrato Bass.1 <-> Vibrato Mid.2 + .022uF 630v Mid.1 <-> Vibrato Bass.1 <-> Vibrato Mid.2 + .022uF 630v Mid.1 <-> Vibrato Bass.1 <-> Vibrato Mid.2 .022uF 630v Mid.2 <-> .1uF 630v Bass.2 <-> R1.2 .022uF 630v Mid.2 <-> .1uF 630v Bass.2 <-> R1.2 .022uF 630v Mid.2 <-> .1uF 630v Bass.2 <-> R1.2 @@ -48,27 +48,11 @@ Switch setup: [Default] .047uF 630v Coupling.2 <-> R1.2 .047uF 630v Coupling.2 <-> R1.2 .047uF 630v Coupling.2 <-> R1.2 - .047uF Class Y.1 <-> .047uF Class Y.1 <-> .047uF Class Y.1 <-> .047uF Class Y.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> GND <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 - .047uF Class Y.2 <-> .2 - .047uF Class Y.2 <-> .2 - .047uF Class Y.2 <-> .2 - .047uF Class Y.2 <-> .2 - .1 <-> .1 <-> .1 <-> .2 <-> 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> V3.6 <-> V4.6 <-> V5.8 - .1 <-> .1 <-> .1 <-> .2 <-> 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> V3.8 <-> V4.8 - .1 <-> .1 <-> .1 <-> .2 <-> 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> V3.8 <-> V4.8 - .1 <-> .1 <-> .1 <-> .2 <-> 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> V3.8 <-> V4.8 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> .2 - .1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 - .1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 - .1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 - .1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 - .1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 - .1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 - .1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 - .1 <-> R1.2 <-> R1.2 <-> Vibrato Volume.2 + .047uF Class Y.+ <-> .047uF Class Y.+ <-> .047uF Class Y.+ <-> .047uF Class Y.+ <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> GND <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> V1.2 <-> V1.2 <-> V1.2 <-> V1.2 + .047uF Class Y.- <-> Standby.2 + .047uF Class Y.- <-> Standby.2 + .047uF Class Y.- <-> Standby.2 + .047uF Class Y.- <-> Standby.2 .1uF 200v AC Shunt.1 <-> R1.1 <-> R1.2 <-> R1.2 .1uF 200v AC Shunt.1 <-> R1.1 <-> R1.2 <-> R1.2 .1uF 200v AC Shunt.1 <-> R1.1 <-> R1.2 <-> R1.2 @@ -77,14 +61,14 @@ Switch setup: [Default] .1uF 200v AC Shunt.2 <-> R1.1 .1uF 200v AC Shunt.2 <-> R1.1 .1uF 200v AC Shunt.2 <-> R1.1 - .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.3 - .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.3 - .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.3 - .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.3 - .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.3 - .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.3 - .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.3 - .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.3 + .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.1 + .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.1 + .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.1 + .1uF 630v Bass.1 <-> Normal Bass.2 <-> Normal Treble.1 + .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.1 + .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.1 + .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.1 + .1uF 630v Bass.1 <-> Vibrato Bass.2 <-> Vibrato Treble.1 .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.1 .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.1 .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.1 @@ -93,10 +77,10 @@ Switch setup: [Default] .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.2 .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.2 .1uF 630v Coupling.1 <-> Grid Stopper V4.2 <-> R1.2 - .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.1 - .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.1 - .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.1 - .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.1 + .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.3 + .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.3 + .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.3 + .1uF 630v Coupling.1 <-> R1.1 <-> Tremolo Intensity.3 .1uF 630v Coupling.2 <-> R1.2 .1uF 630v Coupling.2 <-> R1.2 .1uF 630v Coupling.2 <-> R1.2 @@ -109,86 +93,86 @@ Switch setup: [Default] .1uF 630v Coupling.2 <-> R1.2 .1uF 630v Coupling.2 <-> R1.2 .1uF 630v Coupling.2 <-> R1.2 - .2 <-> .3 - .2 <-> .3 - .2 <-> .3 - .2 <-> .3 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - .2 <-> C1.2 - 1.8K 2W.2 <-> 1N4007.2 - 1.8K 2W.2 <-> 1N4007.2 - 1.8K 2W.2 <-> 1N4007.2 - 1.8K 2W.2 <-> 1N4007.2 - 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.1 <-> 20uF 525v.1 <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.1 - 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.1 <-> 20uF 525v.1 <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.1 - 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.1 <-> 20uF 525v.1 <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.1 - 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.1 <-> 20uF 525v.1 <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.1 - 1N4007.1 <-> 50uF 70v.2 <-> R1.1 - 1N4007.1 <-> 50uF 70v.2 <-> R1.1 - 1N4007.1 <-> 50uF 70v.2 <-> R1.1 - 1N4007.1 <-> 50uF 70v.2 <-> R1.1 - 20uF 525v.1 <-> 4.7K 3W.2 - 20uF 525v.1 <-> 4.7K 3W.2 - 20uF 525v.1 <-> 4.7K 3W.2 - 20uF 525v.1 <-> 4.7K 3W.2 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 - 20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 - 220K 2W.1 <-> 70uF 350v.2 - 220K 2W.1 <-> 70uF 350v.2 - 220K 2W.1 <-> 70uF 350v.2 - 220K 2W.1 <-> 70uF 350v.2 - 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.1 <-> 70uF 350v.2 - 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.1 <-> 70uF 350v.2 - 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.1 <-> 70uF 350v.2 - 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.1 <-> 70uF 350v.2 - 25uF 25v.1 <-> R1.1 - 25uF 25v.1 <-> R1.1 - 25uF 25v.1 <-> R1.1 - 25uF 25v.1 <-> R1.1 <-> V1.8 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 - 25uF 25v.1 <-> R1.2 <-> V1.8 - 25uF 25v.1 <-> R1.2 <-> V1.8 - 25uF 25v.1 <-> R1.2 <-> V1.8 - 25uF 25v.1 <-> R1.2 <-> V1.8 <-> V1.8 - 25uF 25v.1 <-> R1.2 <-> V1.8 <-> V1.8 - 25uF 25v.1 <-> R1.2 <-> V1.8 <-> V1.8 - 25uF 25v.2 <-> 25uF 25v.2 <-> 25uF 25v.2 <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.3 <-> Tremolo Intensity.3 <-> Vibrato Mid.3 - 25uF 25v.2 <-> 25uF 25v.2 <-> 25uF 25v.2 <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.3 <-> Tremolo Intensity.3 <-> Vibrato Mid.3 - 25uF 25v.2 <-> 25uF 25v.2 <-> 25uF 25v.2 <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.3 <-> Tremolo Intensity.3 <-> Vibrato Mid.3 - 25uF 25v.2 <-> 25uF 25v.2 <-> 25uF 25v.2 <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.3 <-> Tremolo Intensity.3 <-> Vibrato Mid.3 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 - 25uF 25v.2 <-> 25uF 25v.2 <-> R1.1 <-> R1.1 <-> R1.1 + 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.+ <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> Standby.1 <-> Standby.1 <-> Standby.1 <-> Standby.2 <-> V3.6 <-> V3.8 <-> V4.6 <-> V4.8 <-> V5.8 + 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.+ <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> Standby.1 <-> Standby.1 <-> Standby.1 <-> Standby.2 <-> V3.6 <-> V3.8 <-> V4.6 <-> V4.8 <-> V5.8 + 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.+ <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> Standby.1 <-> Standby.1 <-> Standby.1 <-> Standby.2 <-> V3.6 <-> V3.8 <-> V4.6 <-> V4.8 <-> V5.8 + 1.8K 2W.1 <-> 470 3W.2 <-> 470 3W.2 <-> 50uF 70v.+ <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> Standby.1 <-> Standby.1 <-> Standby.1 <-> Standby.2 <-> V3.6 <-> V3.8 <-> V4.6 <-> V4.8 <-> V5.8 + 1.8K 2W.2 <-> 1N4007.K + 1.8K 2W.2 <-> 1N4007.K + 1.8K 2W.2 <-> 1N4007.K + 1.8K 2W.2 <-> 1N4007.K + 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.+ <-> 20uF 525v.+ <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.+ + 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.+ <-> 20uF 525v.+ <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.+ + 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.+ <-> 20uF 525v.+ <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.+ + 1K 3W.1 <-> 1K 3W.2 <-> 20uF 525v.+ <-> 20uF 525v.+ <-> 220K 2W.1 <-> 4.7K 3W.1 <-> 70uF 350v.+ + 1N4007.A <-> 50uF 70v.- <-> R1.1 + 1N4007.A <-> 50uF 70v.- <-> R1.1 + 1N4007.A <-> 50uF 70v.- <-> R1.1 + 1N4007.A <-> 50uF 70v.- <-> R1.1 + 20uF 525v.+ <-> 4.7K 3W.2 + 20uF 525v.+ <-> 4.7K 3W.2 + 20uF 525v.+ <-> 4.7K 3W.2 + 20uF 525v.+ <-> 4.7K 3W.2 + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- + 20uF 525v.- <-> 20uF 525v.- <-> 20uF 525v.- + 220K 2W.1 <-> 70uF 350v.- + 220K 2W.1 <-> 70uF 350v.- + 220K 2W.1 <-> 70uF 350v.- + 220K 2W.1 <-> 70uF 350v.- + 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.+ <-> 70uF 350v.- + 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.+ <-> 70uF 350v.- + 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.+ <-> 70uF 350v.- + 220K 2W.2 <-> 220K 2W.2 <-> 70uF 350v.+ <-> 70uF 350v.- + 25uF 25v.+ <-> R1.1 <-> V1.8 + 25uF 25v.+ <-> R1.1 <-> V1.8 + 25uF 25v.+ <-> R1.1 <-> V1.8 + 25uF 25v.+ <-> R1.1 <-> V1.8 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 <-> V1.8 + 25uF 25v.+ <-> R1.2 <-> V1.8 <-> V1.8 + 25uF 25v.- <-> 25uF 25v.- <-> 25uF 25v.- <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.1 <-> Tremolo Intensity.1 <-> Vibrato Mid.1 + 25uF 25v.- <-> 25uF 25v.- <-> 25uF 25v.- <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.1 <-> Tremolo Intensity.1 <-> Vibrato Mid.1 + 25uF 25v.- <-> 25uF 25v.- <-> 25uF 25v.- <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.1 <-> Tremolo Intensity.1 <-> Vibrato Mid.1 + 25uF 25v.- <-> 25uF 25v.- <-> 25uF 25v.- <-> C1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> Reverb.1 <-> Tremolo Intensity.1 <-> Vibrato Mid.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 25uF 25v.- <-> 25uF 25v.- <-> R1.1 <-> R1.1 <-> R1.1 + 470 3W.1 <-> V3.4 + 470 3W.1 <-> V3.4 + 470 3W.1 <-> V3.4 + 470 3W.1 <-> V3.4 + 470 3W.1 <-> V4.4 + 470 3W.1 <-> V4.4 + 470 3W.1 <-> V4.4 + 470 3W.1 <-> V4.4 Bias Balance.1 <-> R1.1 Bias Balance.1 <-> R1.1 Bias Balance.1 <-> R1.1 @@ -201,38 +185,54 @@ Switch setup: [Default] Bias Balance.3 <-> R1.2 Bias Balance.3 <-> R1.2 Bias Balance.3 <-> R1.2 + Bright.1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 + Bright.1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 + Bright.1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 + Bright.1 <-> Normal Volume.2 <-> R1.2 <-> R1.2 <-> V1.2 + Bright.1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 + Bright.1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 + Bright.1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 + Bright.1 <-> R1.2 <-> R1.2 <-> V1.2 <-> Vibrato Volume.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 + Bright.2 <-> C1.2 C1.1 <-> C1.2 <-> R1.1 C1.1 <-> C1.2 <-> R1.1 C1.1 <-> C1.2 <-> R1.1 C1.1 <-> C1.2 <-> R1.1 - C1.1 <-> C1.2 <-> Tremolo Speed.1 - C1.1 <-> C1.2 <-> Tremolo Speed.1 - C1.1 <-> C1.2 <-> Tremolo Speed.1 - C1.1 <-> C1.2 <-> Tremolo Speed.1 - C1.1 <-> Normal Treble.1 - C1.1 <-> Normal Treble.1 - C1.1 <-> Normal Treble.1 - C1.1 <-> Normal Treble.1 - C1.1 <-> Normal Treble.2 <-> Normal Volume.1 - C1.1 <-> Normal Treble.2 <-> Normal Volume.1 - C1.1 <-> Normal Treble.2 <-> Normal Volume.1 - C1.1 <-> Normal Treble.2 <-> Normal Volume.1 - C1.1 <-> R1.1 - C1.1 <-> R1.1 - C1.1 <-> R1.1 + C1.1 <-> C1.2 <-> Tremolo Speed.3 + C1.1 <-> C1.2 <-> Tremolo Speed.3 + C1.1 <-> C1.2 <-> Tremolo Speed.3 + C1.1 <-> C1.2 <-> Tremolo Speed.3 + C1.1 <-> Normal Treble.2 <-> Normal Volume.3 + C1.1 <-> Normal Treble.2 <-> Normal Volume.3 + C1.1 <-> Normal Treble.2 <-> Normal Volume.3 + C1.1 <-> Normal Treble.2 <-> Normal Volume.3 + C1.1 <-> Normal Treble.3 + C1.1 <-> Normal Treble.3 + C1.1 <-> Normal Treble.3 + C1.1 <-> Normal Treble.3 + C1.1 <-> R1.1 <-> V1.2 + C1.1 <-> R1.1 <-> V1.2 + C1.1 <-> R1.1 <-> V1.2 C1.1 <-> R1.1 <-> V1.2 - C1.1 <-> R1.2 C1.1 <-> R1.2 <-> V1.2 C1.1 <-> R1.2 <-> V1.2 C1.1 <-> R1.2 <-> V1.2 - C1.1 <-> Vibrato Treble.1 - C1.1 <-> Vibrato Treble.1 - C1.1 <-> Vibrato Treble.1 - C1.1 <-> Vibrato Treble.1 - C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.1 - C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.1 - C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.1 - C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.1 + C1.1 <-> R1.2 <-> V1.2 + C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.3 + C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.3 + C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.3 + C1.1 <-> Vibrato Treble.2 <-> Vibrato Volume.3 + C1.1 <-> Vibrato Treble.3 + C1.1 <-> Vibrato Treble.3 + C1.1 <-> Vibrato Treble.3 + C1.1 <-> Vibrato Treble.3 C1.2 <-> R1.1 <-> R1.2 C1.2 <-> R1.1 <-> R1.2 C1.2 <-> R1.1 <-> R1.2 @@ -269,12 +269,24 @@ Switch setup: [Default] R1.1 <-> Reverb.2 R1.1 <-> Reverb.2 R1.1 <-> Reverb.2 - R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3 - R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3 - R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3 - R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3 + R1.1 <-> Tremolo Speed.1 <-> Tremolo Speed.2 + R1.1 <-> Tremolo Speed.1 <-> Tremolo Speed.2 + R1.1 <-> Tremolo Speed.1 <-> Tremolo Speed.2 + R1.1 <-> Tremolo Speed.1 <-> Tremolo Speed.2 R1.2 <-> R1.2 <-> R1.2 R1.2 <-> R1.2 <-> R1.2 R1.2 <-> R1.2 <-> R1.2 R1.2 <-> R1.2 <-> R1.2 + R1.2 <-> V1.8 + R1.2 <-> V1.8 + R1.2 <-> V1.8 + R1.2 <-> V1.8 + Standby.1 <-> Standby.2 + Standby.1 <-> Standby.2 + Standby.1 <-> Standby.2 + Standby.1 <-> Standby.2 + Standby.2 <-> Standby.3 + Standby.2 <-> Standby.3 + Standby.2 <-> Standby.3 + Standby.2 <-> Standby.3 diff --git a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_incl_switches.txt index da9c81fc2..60ef59fcf 100644 --- a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_incl_switches.txt @@ -1 +1 @@ -org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 16777216 \ No newline at end of file +org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 1024, actual: 16777216 \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt index 56ee894ce..a71042c08 100644 --- a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R10.2 <-> R12.1 C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> GND <-> R1.2 <-> R11.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> Tone.3 diff --git a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt index 56ee894ce..a71042c08 100644 --- a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C10.1 <-> R10.2 <-> R12.1 C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> GND <-> R1.2 <-> R11.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> Tone.3 diff --git a/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/PCF DI Cable Diagram_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt index 7e8d33c78..a37755cb1 100644 --- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt @@ -1,10 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .2 <-> L7.1 Bass.1 <-> R61.1 Bass.2 <-> C3.1 <-> R7.2 Bass.3 <-> C4.1 <-> R60.1 - C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 + C10.1 <-> C23.- <-> C24.- <-> C27.- <-> C38.- <-> C39.- <-> C40.- <-> C41.- <-> C8.- <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 C10.2 <-> C11.1 <-> R12.1 C12.1 <-> R14.2 C12.2 <-> C14.1 @@ -19,8 +18,8 @@ Switch setup: [Default] C2.2 <-> Vol.2 C20.1 <-> C25.1 <-> V2b.1 C21.1 <-> R23.1 <-> V2a.1 - C23.1 <-> R26.1 - C24.1 <-> R27.1 + C23.+ <-> R26.1 + C24.+ <-> R27.1 C25.2 <-> C26.1 <-> Speed.3 C28.1 <-> R32.2 <-> R33.2 C28.2 <-> C29.1 @@ -34,17 +33,18 @@ Switch setup: [Default] C36.2 <-> R51.1 <-> R54.1 C37.1 <-> R50.1 <-> V6b.2 C37.2 <-> R52.1 <-> R53.1 - C38.1 <-> V8.3 - C39.1 <-> R59.1 - C40.1 <-> R59.2 + C38.+ <-> V8.3 + C39.+ <-> R59.1 + C40.+ <-> R59.2 C43.1 <-> Treble.2 C45.1 <-> Presence.1 C7.1 <-> Treble.3 - C8.1 <-> V3b.3 + C8.+ <-> V3b.3 C9.2 <-> R12.2 L5.1 <-> L6.1 L6.1 <-> L6.2 L6.1 <-> L6.2 + L7.1 <-> SW1.2 R1.1 <-> R2.1 <-> V1a.1 R1.2 <-> R3.1 R10.1 <-> R9.2 diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt index 3c7db1f6c..7c530bd81 100644 --- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] +Switch setup: [ ALL ] Bass.1 <-> R61.1 Bass.2 <-> C3.1 <-> R7.2 Bass.3 <-> C4.1 <-> R60.1 - C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 + C10.1 <-> C23.- <-> C24.- <-> C27.- <-> C38.- <-> C39.- <-> C40.- <-> C41.- <-> C8.- <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 C10.2 <-> C11.1 <-> R12.1 C12.1 <-> R14.2 C12.2 <-> C14.1 @@ -18,8 +18,8 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] C2.2 <-> Vol.2 C20.1 <-> C25.1 <-> V2b.1 C21.1 <-> R23.1 <-> V2a.1 - C23.1 <-> R26.1 - C24.1 <-> R27.1 + C23.+ <-> R26.1 + C24.+ <-> R27.1 C25.2 <-> C26.1 <-> Speed.3 C28.1 <-> R32.2 <-> R33.2 C28.2 <-> C29.1 @@ -33,13 +33,13 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] C36.2 <-> R51.1 <-> R54.1 C37.1 <-> R50.1 <-> V6b.2 C37.2 <-> R52.1 <-> R53.1 - C38.1 <-> V8.3 - C39.1 <-> R59.1 - C40.1 <-> R59.2 + C38.+ <-> V8.3 + C39.+ <-> R59.1 + C40.+ <-> R59.2 C43.1 <-> Treble.2 C45.1 <-> Presence.1 C7.1 <-> Treble.3 - C8.1 <-> V3b.3 + C8.+ <-> V3b.3 C9.2 <-> R12.2 L5.1 <-> L6.1 L6.1 <-> L6.2 diff --git a/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt index eacf179ff..d415ed0c6 100644 --- a/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt @@ -1,5 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC1.20 <-> IC2.10 <-> IC2.20 <-> IC5.10 <-> IC5.20 - C1.2 <-> C10.1 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.17 <-> IC4.18 <-> IC4.19 <-> IC4.2 <-> IC4.20 <-> IC4.21 <-> IC4.22 <-> IC4.23 <-> IC4.24 <-> IC4.25 <-> IC4.26 <-> IC4.27 <-> IC4.28 <-> IC4.29 <-> IC4.3 <-> IC4.30 <-> IC4.31 <-> IC4.32 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9 + C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC2.10 <-> IC5.10 + C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.11 <-> IC10.11 <-> IC10.12 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.17 <-> IC5.11 <-> IC6.12 <-> IC6.6 <-> IC6.9 <-> IC7.11 <-> IC9.11 + C10.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.1 <-> IC10.1 <-> IC10.10 <-> IC11.1 <-> IC11.10 <-> IC3.1 <-> IC3.10 <-> IC4.16 <-> IC4.27 <-> IC6.8 <-> IC7.1 <-> IC7.10 <-> IC9.1 <-> IC9.10 + IC1.1 <-> IC2.1 <-> IC5.1 + IC1.2 <-> IC10.13 <-> IC11.13 <-> IC2.2 <-> IC3.20 <-> IC4.13 <-> IC4.22 <-> IC5.2 <-> IC7.19 <-> IC9.13 + IC1.3 <-> IC10.14 <-> IC11.14 <-> IC2.3 <-> IC3.19 <-> IC4.14 <-> IC4.23 <-> IC5.3 <-> IC7.18 <-> IC9.14 + IC1.4 <-> IC10.15 <-> IC11.15 <-> IC2.4 <-> IC3.18 <-> IC4.15 <-> IC4.26 <-> IC5.4 <-> IC7.17 <-> IC9.15 + IC1.5 <-> IC10.16 <-> IC11.16 <-> IC2.5 <-> IC3.17 <-> IC4.32 <-> IC5.5 <-> IC7.16 <-> IC9.16 + IC1.6 <-> IC10.17 <-> IC11.17 <-> IC2.6 <-> IC3.16 <-> IC4.31 <-> IC5.6 <-> IC7.15 <-> IC9.17 + IC1.7 <-> IC10.18 <-> IC11.18 <-> IC2.7 <-> IC3.15 <-> IC4.30 <-> IC5.7 <-> IC7.14 <-> IC9.18 + IC1.8 <-> IC10.19 <-> IC11.19 <-> IC2.8 <-> IC3.14 <-> IC4.29 <-> IC5.8 <-> IC7.13 <-> IC9.19 + IC1.9 <-> IC10.20 <-> IC11.20 <-> IC2.9 <-> IC3.13 <-> IC4.28 <-> IC5.9 <-> IC7.20 <-> IC9.20 + IC11.12 <-> IC6.11 + IC3.12 <-> IC6.14 + IC4.25 <-> IC6.4 <-> IC6.5 + IC6.13 <-> IC9.12 + IC6.15 <-> IC7.12 diff --git a/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt index eacf179ff..d415ed0c6 100644 --- a/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt @@ -1,5 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC1.20 <-> IC2.10 <-> IC2.20 <-> IC5.10 <-> IC5.20 - C1.2 <-> C10.1 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.17 <-> IC4.18 <-> IC4.19 <-> IC4.2 <-> IC4.20 <-> IC4.21 <-> IC4.22 <-> IC4.23 <-> IC4.24 <-> IC4.25 <-> IC4.26 <-> IC4.27 <-> IC4.28 <-> IC4.29 <-> IC4.3 <-> IC4.30 <-> IC4.31 <-> IC4.32 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9 + C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC2.10 <-> IC5.10 + C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.11 <-> IC10.11 <-> IC10.12 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.17 <-> IC5.11 <-> IC6.12 <-> IC6.6 <-> IC6.9 <-> IC7.11 <-> IC9.11 + C10.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.1 <-> IC10.1 <-> IC10.10 <-> IC11.1 <-> IC11.10 <-> IC3.1 <-> IC3.10 <-> IC4.16 <-> IC4.27 <-> IC6.8 <-> IC7.1 <-> IC7.10 <-> IC9.1 <-> IC9.10 + IC1.1 <-> IC2.1 <-> IC5.1 + IC1.2 <-> IC10.13 <-> IC11.13 <-> IC2.2 <-> IC3.20 <-> IC4.13 <-> IC4.22 <-> IC5.2 <-> IC7.19 <-> IC9.13 + IC1.3 <-> IC10.14 <-> IC11.14 <-> IC2.3 <-> IC3.19 <-> IC4.14 <-> IC4.23 <-> IC5.3 <-> IC7.18 <-> IC9.14 + IC1.4 <-> IC10.15 <-> IC11.15 <-> IC2.4 <-> IC3.18 <-> IC4.15 <-> IC4.26 <-> IC5.4 <-> IC7.17 <-> IC9.15 + IC1.5 <-> IC10.16 <-> IC11.16 <-> IC2.5 <-> IC3.17 <-> IC4.32 <-> IC5.5 <-> IC7.16 <-> IC9.16 + IC1.6 <-> IC10.17 <-> IC11.17 <-> IC2.6 <-> IC3.16 <-> IC4.31 <-> IC5.6 <-> IC7.15 <-> IC9.17 + IC1.7 <-> IC10.18 <-> IC11.18 <-> IC2.7 <-> IC3.15 <-> IC4.30 <-> IC5.7 <-> IC7.14 <-> IC9.18 + IC1.8 <-> IC10.19 <-> IC11.19 <-> IC2.8 <-> IC3.14 <-> IC4.29 <-> IC5.8 <-> IC7.13 <-> IC9.19 + IC1.9 <-> IC10.20 <-> IC11.20 <-> IC2.9 <-> IC3.13 <-> IC4.28 <-> IC5.9 <-> IC7.20 <-> IC9.20 + IC11.12 <-> IC6.11 + IC3.12 <-> IC6.14 + IC4.25 <-> IC6.4 <-> IC6.5 + IC6.13 <-> IC9.12 + IC6.15 <-> IC7.12 diff --git a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt index e38cf899e..f578ab695 100644 --- a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022uf.1 <-> 100K 1W.2 .022uf.2 <-> 1 M.1 @@ -23,8 +23,8 @@ Switch setup: [Default] 5.6K 2W.2 <-> V5 6V6GT.1 7.5K.1 <-> Balance.1 7.5K.2 <-> R1.1 - Backup Diode.1 <-> Backup Diode.2 - Backup Diode.1 <-> Backup Diode.2 + Backup Diode.A <-> Backup Diode.K + Backup Diode.A <-> Backup Diode.K Coupling.2 <-> Grid Leak.2 Grid Leak.1 <-> Grid Leak.1 J1.4 <-> J2.3 diff --git a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt index e38cf899e..f578ab695 100644 --- a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022uf.1 <-> 100K 1W.2 .022uf.2 <-> 1 M.1 @@ -23,8 +23,8 @@ Switch setup: [Default] 5.6K 2W.2 <-> V5 6V6GT.1 7.5K.1 <-> Balance.1 7.5K.2 <-> R1.1 - Backup Diode.1 <-> Backup Diode.2 - Backup Diode.1 <-> Backup Diode.2 + Backup Diode.A <-> Backup Diode.K + Backup Diode.A <-> Backup Diode.K Coupling.2 <-> Grid Leak.2 Grid Leak.1 <-> Grid Leak.1 J1.4 <-> J2.3 diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt index 3acc5619b..2c563c84c 100644 --- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt @@ -1,35 +1,37 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - C10.2 <-> C11.2 <-> C12.2 <-> C13.2 <-> C15.2 <-> C9.2 <-> D5.2 <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R9.1 <-> Speed.1 <-> SW2.2 <-> Volume.3 - C11.1 <-> R14.2 <-> R22.1 - C12.1 <-> R15.1 - C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 + C10.+ <-> D3.K <-> D4.K <-> R22.2 + C10.- <-> C11.- <-> C12.- <-> C13.- <-> C15.2 <-> C9.- <-> D5.K <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R23.1 <-> R25.2 <-> R3.2 <-> R9.1 <-> Speed.3 <-> SW2.2 <-> Volume.1 + C11.+ <-> R14.2 <-> R22.1 + C12.+ <-> R15.1 <-> V1.3 + C13.+ <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 C14.1 <-> C4.1 <-> R8.2 <-> SW1.2 - C14.2 <-> C17.2 <-> R7.1 <-> V2.1 - C15.1 <-> R5.1 + C14.2 <-> C17.2 <-> R7.1 <-> V2.1 <-> V2.7 + C15.1 <-> R5.1 <-> V4.3 C17.1 <-> SW1.1 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 - C3.1 <-> Volume.1 + C3.1 <-> Volume.3 C3.2 <-> R17.1 <-> V4.1 C4.2 <-> C5.2 <-> J24.Tip <-> R10.1 - C5.1 <-> R9.2 - C9.1 <-> R14.1 - D1.1 <-> D2.1 <-> R27.1 - D1.2 <-> D4.1 - D2.2 <-> D3.1 - D5.1 <-> R10.2 <-> V2.3 - Intensity.1 <-> R19.1 + C5.1 <-> R9.2 <-> V2.2 + C9.+ <-> R14.1 + D1.A <-> D2.A <-> R26.2 <-> R27.1 + D1.K <-> D4.A + D2.K <-> D3.A + D5.A <-> R10.2 <-> V2.3 Intensity.2 <-> R6.1 + Intensity.3 <-> R19.1 <-> V4.7 J19.Tip <-> R1.2 <-> R3.1 R1.1 <-> V4.9 - R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3 + R12.1 <-> R13.2 <-> R8.1 <-> Speed.1 <-> Speed.2 R13.1 <-> SW1.3 + R16.2 <-> R24.2 R18.1 <-> Volume.2 R18.2 <-> V4.2 R2.1 <-> V4.8 R21.2 <-> V1.2 + R23.2 <-> R25.1 R24.1 <-> V1.9 R26.1 <-> R27.2 R6.2 <-> V2.8 diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt index 40c9e7941..8b17b2793 100644 --- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt @@ -1,68 +1,72 @@ -Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2] +Switch setup: [ SW1.ON1 ] - C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - C10.2 <-> C11.2 <-> C12.2 <-> C13.2 <-> C15.2 <-> C9.2 <-> D5.2 <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R9.1 <-> Speed.1 <-> Volume.3 - C11.1 <-> R14.2 <-> R22.1 - C12.1 <-> R15.1 - C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 + C10.+ <-> D3.K <-> D4.K <-> R22.2 + C10.- <-> C11.- <-> C12.- <-> C13.- <-> C15.2 <-> C9.- <-> D5.K <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R23.1 <-> R25.2 <-> R3.2 <-> R9.1 <-> Speed.3 <-> Volume.1 + C11.+ <-> R14.2 <-> R22.1 + C12.+ <-> R15.1 <-> V1.3 + C13.+ <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 C14.1 <-> C17.1 <-> C4.1 <-> R8.2 - C14.2 <-> C17.2 <-> R7.1 <-> V2.1 - C15.1 <-> R5.1 + C14.2 <-> C17.2 <-> R7.1 <-> V2.1 <-> V2.7 + C15.1 <-> R5.1 <-> V4.3 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 - C3.1 <-> Volume.1 + C3.1 <-> Volume.3 C3.2 <-> R17.1 <-> V4.1 C4.2 <-> C5.2 <-> J24.Tip <-> R10.1 - C5.1 <-> R9.2 - C9.1 <-> R14.1 - D1.1 <-> D2.1 <-> R27.1 - D1.2 <-> D4.1 - D2.2 <-> D3.1 - D5.1 <-> R10.2 <-> V2.3 - Intensity.1 <-> R19.1 + C5.1 <-> R9.2 <-> V2.2 + C9.+ <-> R14.1 + D1.A <-> D2.A <-> R26.2 <-> R27.1 + D1.K <-> D4.A + D2.K <-> D3.A + D5.A <-> R10.2 <-> V2.3 Intensity.2 <-> R6.1 + Intensity.3 <-> R19.1 <-> V4.7 J19.Tip <-> R1.2 <-> R3.1 R1.1 <-> V4.9 - R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3 + R12.1 <-> R13.2 <-> R8.1 <-> Speed.1 <-> Speed.2 + R16.2 <-> R24.2 R18.1 <-> Volume.2 R18.2 <-> V4.2 R2.1 <-> V4.8 R21.2 <-> V1.2 + R23.2 <-> R25.1 R24.1 <-> V1.9 R26.1 <-> R27.2 R6.2 <-> V2.8 R7.2 <-> V2.6 -Switch setup: [SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON2] +Switch setup: [ SW1.ON2 ] - C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - C10.2 <-> C11.2 <-> C12.2 <-> C13.2 <-> C15.2 <-> C9.2 <-> D5.2 <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R9.1 <-> Speed.1 <-> Volume.3 - C11.1 <-> R14.2 <-> R22.1 - C12.1 <-> R15.1 - C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 + C10.+ <-> D3.K <-> D4.K <-> R22.2 + C10.- <-> C11.- <-> C12.- <-> C13.- <-> C15.2 <-> C9.- <-> D5.K <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R23.1 <-> R25.2 <-> R3.2 <-> R9.1 <-> Speed.3 <-> Volume.1 + C11.+ <-> R14.2 <-> R22.1 + C12.+ <-> R15.1 <-> V1.3 + C13.+ <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 C14.1 <-> C4.1 <-> R13.1 <-> R8.2 - C14.2 <-> C17.2 <-> R7.1 <-> V2.1 - C15.1 <-> R5.1 + C14.2 <-> C17.2 <-> R7.1 <-> V2.1 <-> V2.7 + C15.1 <-> R5.1 <-> V4.3 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 - C3.1 <-> Volume.1 + C3.1 <-> Volume.3 C3.2 <-> R17.1 <-> V4.1 C4.2 <-> C5.2 <-> J24.Tip <-> R10.1 - C5.1 <-> R9.2 - C9.1 <-> R14.1 - D1.1 <-> D2.1 <-> R27.1 - D1.2 <-> D4.1 - D2.2 <-> D3.1 - D5.1 <-> R10.2 <-> V2.3 - Intensity.1 <-> R19.1 + C5.1 <-> R9.2 <-> V2.2 + C9.+ <-> R14.1 + D1.A <-> D2.A <-> R26.2 <-> R27.1 + D1.K <-> D4.A + D2.K <-> D3.A + D5.A <-> R10.2 <-> V2.3 Intensity.2 <-> R6.1 + Intensity.3 <-> R19.1 <-> V4.7 J19.Tip <-> R1.2 <-> R3.1 R1.1 <-> V4.9 - R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3 + R12.1 <-> R13.2 <-> R8.1 <-> Speed.1 <-> Speed.2 + R16.2 <-> R24.2 R18.1 <-> Volume.2 R18.2 <-> V4.2 R2.1 <-> V4.8 R21.2 <-> V1.2 + R23.2 <-> R25.1 R24.1 <-> V1.9 R26.1 <-> R27.2 R6.2 <-> V2.8 diff --git a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt index 6f0952846..376b9cea5 100644 --- a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt @@ -1,4 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9 + C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.12 <-> IC11.12 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.12 + C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.11 <-> IC10.11 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.9 <-> IC5.11 <-> IC6.9 <-> IC8.11 <-> IC9.11 + C7.2 <-> C8.2 <-> IC10.10 <-> IC11.10 + IC1.2 <-> IC2.2 <-> IC3.2 <-> IC5.2 <-> IC6.3 <-> IC8.2 + IC1.3 <-> IC2.3 <-> IC3.3 <-> IC5.3 <-> IC6.2 <-> IC8.3 + IC1.4 <-> IC2.4 <-> IC3.4 <-> IC5.4 <-> IC6.6 <-> IC8.4 + IC1.5 <-> IC2.5 <-> IC3.5 <-> IC5.5 <-> IC6.7 <-> IC8.5 + IC1.6 <-> IC2.6 <-> IC3.6 <-> IC4.3 <-> IC5.6 <-> IC8.6 + IC1.7 <-> IC2.7 <-> IC3.7 <-> IC4.2 <-> IC5.7 <-> IC8.7 + IC1.8 <-> IC2.8 <-> IC3.8 <-> IC4.6 <-> IC5.8 <-> IC8.8 + IC1.9 <-> IC2.9 <-> IC3.9 <-> IC4.7 <-> IC5.9 <-> IC8.9 + IC10.13 <-> IC11.13 <-> IC6.10 <-> IC9.13 + IC10.14 <-> IC11.14 <-> IC6.1 <-> IC9.14 + IC10.15 <-> IC11.15 <-> IC6.15 <-> IC9.15 + IC10.16 <-> IC11.16 <-> IC6.16 <-> IC9.16 + IC10.17 <-> IC11.17 <-> IC4.10 <-> IC9.17 + IC10.18 <-> IC11.18 <-> IC4.1 <-> IC9.18 + IC10.19 <-> IC11.19 <-> IC4.15 <-> IC9.19 + IC10.20 <-> IC11.20 <-> IC4.16 <-> IC9.20 + IC4.11 <-> IC6.11 + IC4.14 <-> IC6.14 + IC4.4 <-> IC6.12 + IC4.5 <-> IC6.13 diff --git a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt index 6f0952846..376b9cea5 100644 --- a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt @@ -1,4 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9 + C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.12 <-> IC11.12 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.12 + C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.11 <-> IC10.11 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.9 <-> IC5.11 <-> IC6.9 <-> IC8.11 <-> IC9.11 + C7.2 <-> C8.2 <-> IC10.10 <-> IC11.10 + IC1.2 <-> IC2.2 <-> IC3.2 <-> IC5.2 <-> IC6.3 <-> IC8.2 + IC1.3 <-> IC2.3 <-> IC3.3 <-> IC5.3 <-> IC6.2 <-> IC8.3 + IC1.4 <-> IC2.4 <-> IC3.4 <-> IC5.4 <-> IC6.6 <-> IC8.4 + IC1.5 <-> IC2.5 <-> IC3.5 <-> IC5.5 <-> IC6.7 <-> IC8.5 + IC1.6 <-> IC2.6 <-> IC3.6 <-> IC4.3 <-> IC5.6 <-> IC8.6 + IC1.7 <-> IC2.7 <-> IC3.7 <-> IC4.2 <-> IC5.7 <-> IC8.7 + IC1.8 <-> IC2.8 <-> IC3.8 <-> IC4.6 <-> IC5.8 <-> IC8.8 + IC1.9 <-> IC2.9 <-> IC3.9 <-> IC4.7 <-> IC5.9 <-> IC8.9 + IC10.13 <-> IC11.13 <-> IC6.10 <-> IC9.13 + IC10.14 <-> IC11.14 <-> IC6.1 <-> IC9.14 + IC10.15 <-> IC11.15 <-> IC6.15 <-> IC9.15 + IC10.16 <-> IC11.16 <-> IC6.16 <-> IC9.16 + IC10.17 <-> IC11.17 <-> IC4.10 <-> IC9.17 + IC10.18 <-> IC11.18 <-> IC4.1 <-> IC9.18 + IC10.19 <-> IC11.19 <-> IC4.15 <-> IC9.19 + IC10.20 <-> IC11.20 <-> IC4.16 <-> IC9.20 + IC4.11 <-> IC6.11 + IC4.14 <-> IC6.14 + IC4.4 <-> IC6.12 + IC4.5 <-> IC6.13 diff --git a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt index 74f57159f..155ca88cc 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt @@ -1,17 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .01.1 <-> 470k.2 .01.1 <-> 470k.2 .01.2 <-> 100k.1 .01.2 <-> 100k.1 - .01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.2 <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1 + .01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.- <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1 .022.2 <-> .047.2 <-> 100k.1 .022.2 <-> 100k.1 0.1.1 <-> 47k.1 <-> 4k7.2 <-> 82k.2 0.1.2 <-> 470k.1 100k.2 <-> 100k.2 <-> 39k.1 - 100k.2 <-> 100k.2 <-> 39k.2 <-> 8k2.1 - 100u 100v.1 <-> 100u 100v.2 <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1 + 100k.2 <-> 39k.2 + 100k.2 <-> 8k2.1 + 100u 100v.+ <-> 100u 100v.- <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1 470k.2 <-> 470k.2 <-> 47k.2 <-> 820.2 - D1.2 <-> D2.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt index 74f57159f..155ca88cc 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt @@ -1,17 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .01.1 <-> 470k.2 .01.1 <-> 470k.2 .01.2 <-> 100k.1 .01.2 <-> 100k.1 - .01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.2 <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1 + .01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.- <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1 .022.2 <-> .047.2 <-> 100k.1 .022.2 <-> 100k.1 0.1.1 <-> 47k.1 <-> 4k7.2 <-> 82k.2 0.1.2 <-> 470k.1 100k.2 <-> 100k.2 <-> 39k.1 - 100k.2 <-> 100k.2 <-> 39k.2 <-> 8k2.1 - 100u 100v.1 <-> 100u 100v.2 <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1 + 100k.2 <-> 39k.2 + 100k.2 <-> 8k2.1 + 100u 100v.+ <-> 100u 100v.- <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1 470k.2 <-> 470k.2 <-> 47k.2 <-> 820.2 - D1.2 <-> D2.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt index 77ba15b12..4f0aca1fc 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .0047.1 <-> .01.2 <-> 470k.1 .0047.1 <-> 100k.2 @@ -9,13 +9,13 @@ Switch setup: [Default] .022.1 <-> 470k.1 .022.1 <-> 470k.1 0.1.1 <-> 1M.2 - 0.1.2 <-> 1k5.2 <-> 22u 450v.2 <-> 22u 450v.2 <-> 22u.2 <-> 22uF.2 <-> 2k2.2 <-> 47k.2 + 0.1.2 <-> 1k5.2 <-> 22u 450v.- <-> 22u 450v.- <-> 22u.- <-> 22uF.- <-> 2k2.2 <-> 47k.2 100.1 <-> 8k2.2 - 100k.1 <-> 100k.1 <-> 22u 450v.1 <-> 4k7.2 <-> 8k2.1 - 100k.1 <-> 1M.1 <-> 220k.1 <-> 22u 450v.1 <-> 4k7.1 - 150 10W.1 <-> 47u.1 - 150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.2 - 1k5.1 <-> 22u.1 - 22uF.1 <-> 2k2.1 + 100k.1 <-> 100k.1 <-> 22u 450v.+ <-> 4k7.2 <-> 8k2.1 + 100k.1 <-> 1M.1 <-> 220k.1 <-> 22u 450v.+ <-> 4k7.1 + 150 10W.1 <-> 47u.+ + 150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.- + 1k5.1 <-> 22u.+ + 22uF.+ <-> 2k2.1 470k.2 <-> 470k.2 <-> 47k.1 <-> 820.2 diff --git a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt index 77ba15b12..4f0aca1fc 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .0047.1 <-> .01.2 <-> 470k.1 .0047.1 <-> 100k.2 @@ -9,13 +9,13 @@ Switch setup: [Default] .022.1 <-> 470k.1 .022.1 <-> 470k.1 0.1.1 <-> 1M.2 - 0.1.2 <-> 1k5.2 <-> 22u 450v.2 <-> 22u 450v.2 <-> 22u.2 <-> 22uF.2 <-> 2k2.2 <-> 47k.2 + 0.1.2 <-> 1k5.2 <-> 22u 450v.- <-> 22u 450v.- <-> 22u.- <-> 22uF.- <-> 2k2.2 <-> 47k.2 100.1 <-> 8k2.2 - 100k.1 <-> 100k.1 <-> 22u 450v.1 <-> 4k7.2 <-> 8k2.1 - 100k.1 <-> 1M.1 <-> 220k.1 <-> 22u 450v.1 <-> 4k7.1 - 150 10W.1 <-> 47u.1 - 150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.2 - 1k5.1 <-> 22u.1 - 22uF.1 <-> 2k2.1 + 100k.1 <-> 100k.1 <-> 22u 450v.+ <-> 4k7.2 <-> 8k2.1 + 100k.1 <-> 1M.1 <-> 220k.1 <-> 22u 450v.+ <-> 4k7.1 + 150 10W.1 <-> 47u.+ + 150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.- + 1k5.1 <-> 22u.+ + 22uF.+ <-> 2k2.1 470k.2 <-> 470k.2 <-> 47k.1 <-> 820.2 diff --git a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt index abbe20532..265b75b26 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .001.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 47.1 <-> 820.1 <-> 820.1 + .001.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 1M.1 <-> 2k7.2 <-> 4.7u.- <-> 47.1 <-> 820.1 <-> 820.1 .022.1 <-> 220k.2 .022.1 <-> 220k.2 .022.2 <-> .047.2 <-> 100k.1 @@ -9,12 +9,13 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 33k.1 <-> 47.2 <-> 820.2 0.1.2 <-> 1M.1 - 100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.1 + 100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.+ 100k.2 <-> 100k.2 <-> 39k.1 1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2 - 220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.2 <-> D1.1 <-> D3.1 - 39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1 - D1.2 <-> D4.1 - D2.1 <-> D3.2 - D2.2 <-> D4.2 + 220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.- <-> D1.A <-> D3.A + 39k.2 <-> 82k.2 + 82k.2 <-> 8k2.1 + D1.K <-> D4.A + D2.A <-> D3.K + D2.K <-> D4.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt index abbe20532..265b75b26 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .001.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 47.1 <-> 820.1 <-> 820.1 + .001.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 1M.1 <-> 2k7.2 <-> 4.7u.- <-> 47.1 <-> 820.1 <-> 820.1 .022.1 <-> 220k.2 .022.1 <-> 220k.2 .022.2 <-> .047.2 <-> 100k.1 @@ -9,12 +9,13 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 33k.1 <-> 47.2 <-> 820.2 0.1.2 <-> 1M.1 - 100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.1 + 100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.+ 100k.2 <-> 100k.2 <-> 39k.1 1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2 - 220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.2 <-> D1.1 <-> D3.1 - 39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1 - D1.2 <-> D4.1 - D2.1 <-> D3.2 - D2.2 <-> D4.2 + 220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.- <-> D1.A <-> D3.A + 39k.2 <-> 82k.2 + 82k.2 <-> 8k2.1 + D1.K <-> D4.A + D2.A <-> D3.K + D2.K <-> D4.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt index 009acd849..2bd6203ac 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.2 <-> 100k.2 .022.2 <-> 100k.2 @@ -14,11 +14,11 @@ Switch setup: [Default] 100k.1 <-> 82k.1 100k.2 <-> 250p.2 <-> 47k.2 15k.1 <-> 56k.2 - 15k.2 <-> 33u 160v.1 + 15k.2 <-> 33u 160v.+ 1M.1 <-> 1M.1 <-> 22k.2 <-> 470.1 220k.2 <-> 220k.2 270k.2 <-> 270k.2 - 33u 160v.2 <-> 56k.1 <-> D1.1 + 33u 160v.- <-> 56k.1 <-> D1.A 47k.1 <-> 820.1 68k.2 <-> 68k.2 68k.2 <-> 68k.2 diff --git a/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt index 009acd849..2bd6203ac 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.2 <-> 100k.2 .022.2 <-> 100k.2 @@ -14,11 +14,11 @@ Switch setup: [Default] 100k.1 <-> 82k.1 100k.2 <-> 250p.2 <-> 47k.2 15k.1 <-> 56k.2 - 15k.2 <-> 33u 160v.1 + 15k.2 <-> 33u 160v.+ 1M.1 <-> 1M.1 <-> 22k.2 <-> 470.1 220k.2 <-> 220k.2 270k.2 <-> 270k.2 - 33u 160v.2 <-> 56k.1 <-> D1.1 + 33u 160v.- <-> 56k.1 <-> D1.A 47k.1 <-> 820.1 68k.2 <-> 68k.2 68k.2 <-> 68k.2 diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt index 0a2918382..c3c48d751 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> 100k.1 .001.2 <-> 470k.1 @@ -9,13 +9,13 @@ Switch setup: [Default] .022.1 <-> .047.1 .022.1 <-> 470k.1 .022.2 <-> 47k.1 <-> 4k7.1 <-> 82k.2 - 100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.2 <-> 10k 2W.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22u 450v.2 <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.1 <-> D2.1 + 100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.- <-> 10k 2W.2 <-> 22u 450v.+ <-> 22u 450v.- <-> 22u 450v.- <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.A <-> D2.A 100k.1 <-> 150p.1 - 100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 - 100u 100v.1 <-> 270 3W.1 - 10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1 + 100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 + 100u 100v.+ <-> 270 3W.1 + 10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1 1k5.2 <-> 1k5.2 - D1.2 <-> D3.1 - D2.2 <-> D4.1 - D3.2 <-> D4.2 + D1.K <-> D3.A + D2.K <-> D4.A + D3.K <-> D4.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt index 0a2918382..c3c48d751 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> 100k.1 .001.2 <-> 470k.1 @@ -9,13 +9,13 @@ Switch setup: [Default] .022.1 <-> .047.1 .022.1 <-> 470k.1 .022.2 <-> 47k.1 <-> 4k7.1 <-> 82k.2 - 100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.2 <-> 10k 2W.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22u 450v.2 <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.1 <-> D2.1 + 100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.- <-> 10k 2W.2 <-> 22u 450v.+ <-> 22u 450v.- <-> 22u 450v.- <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.A <-> D2.A 100k.1 <-> 150p.1 - 100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 - 100u 100v.1 <-> 270 3W.1 - 10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1 + 100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 + 100u 100v.+ <-> 270 3W.1 + 10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1 1k5.2 <-> 1k5.2 - D1.2 <-> D3.1 - D2.2 <-> D4.1 - D3.2 <-> D4.2 + D1.K <-> D3.A + D2.K <-> D4.A + D3.K <-> D4.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt index 39dc79269..c523a592e 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> .022.2 <-> .047.2 <-> 150k.1 <-> 150p.1 <-> 15k.1 <-> 82k.2 .001.2 <-> 1M.1 @@ -8,15 +8,15 @@ Switch setup: [Default] .047.2 <-> 82k.1 0.1.1 <-> 22k.1 <-> 47.2 <-> 820.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 47R.1 <-> 47R.1 <-> 56k.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 47R.1 <-> 47R.1 <-> 56k.2 100k.1 <-> 150k.2 <-> 150p.2 - 100k.2 <-> 10K.1 <-> 33k.2 <-> 82k.2 + 100k.2 <-> 10K.1 100k.2 <-> 15k.2 <-> 33k.1 - 1k5.1 <-> 1k5.2 <-> 22u.2 <-> 47.1 <-> 4u7.2 + 1k5.1 <-> 1k5.2 <-> 22u.- <-> 47.1 <-> 4u7.- 1M.2 <-> 1M.2 <-> 22k.2 <-> 470.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 220k.1 <-> D3.2 - 22u 63v.2 <-> D3.1 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 220k.1 <-> D3.K + 22u 63v.- <-> D3.A + 33k.2 <-> 82k.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt index 39dc79269..c523a592e 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> .022.2 <-> .047.2 <-> 150k.1 <-> 150p.1 <-> 15k.1 <-> 82k.2 .001.2 <-> 1M.1 @@ -8,15 +8,15 @@ Switch setup: [Default] .047.2 <-> 82k.1 0.1.1 <-> 22k.1 <-> 47.2 <-> 820.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 47R.1 <-> 47R.1 <-> 56k.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 47R.1 <-> 47R.1 <-> 56k.2 100k.1 <-> 150k.2 <-> 150p.2 - 100k.2 <-> 10K.1 <-> 33k.2 <-> 82k.2 + 100k.2 <-> 10K.1 100k.2 <-> 15k.2 <-> 33k.1 - 1k5.1 <-> 1k5.2 <-> 22u.2 <-> 47.1 <-> 4u7.2 + 1k5.1 <-> 1k5.2 <-> 22u.- <-> 47.1 <-> 4u7.- 1M.2 <-> 1M.2 <-> 22k.2 <-> 470.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 220k.1 <-> D3.2 - 22u 63v.2 <-> D3.1 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 220k.1 <-> D3.K + 22u 63v.- <-> D3.A + 33k.2 <-> 82k.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt index 4a20dad2b..0ee66c85a 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 220k.2 .022.1 <-> 220k.2 @@ -8,15 +8,15 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 39k.1 <-> 68k.2 <-> 8k2.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2 - 100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 820.1 <-> 8k2.1 <-> C1.2 - 100k.1 <-> 27k.1 <-> D5.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 56k.2 + 100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.- <-> 820.1 <-> 8k2.1 <-> C1.2 + 100k.1 <-> 27k.1 <-> D5.K 100k.2 <-> 100k.2 <-> 39k.1 1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 22u 63v.2 <-> D5.1 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 22u 63v.- <-> D5.A 27k.2 <-> 47R.2 <-> 47R.2 - 39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 39k.2 <-> 82k.2 + 82k.2 <-> 8k2.1 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt index 4a20dad2b..0ee66c85a 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 220k.2 .022.1 <-> 220k.2 @@ -8,15 +8,15 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 39k.1 <-> 68k.2 <-> 8k2.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2 - 100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 820.1 <-> 8k2.1 <-> C1.2 - 100k.1 <-> 27k.1 <-> D5.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 56k.2 + 100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.- <-> 820.1 <-> 8k2.1 <-> C1.2 + 100k.1 <-> 27k.1 <-> D5.K 100k.2 <-> 100k.2 <-> 39k.1 1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 22u 63v.2 <-> D5.1 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 22u 63v.- <-> D5.A 27k.2 <-> 47R.2 <-> 47R.2 - 39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 39k.2 <-> 82k.2 + 82k.2 <-> 8k2.1 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt index 428681f8b..d5cbeabb6 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.2 <-> 1M.1 .022.1 <-> 220k.2 @@ -8,14 +8,14 @@ Switch setup: [Default] .022.2 <-> 82k.1 .1 250v.1 <-> 39k.1 <-> 5k6.2 .1 250v.2 <-> 1M.1 - 100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.1 + 100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.+ 10k.1 <-> 10k.1 10k.2 <-> 18K 3w.1 <-> 82k.2 <-> 82k.2 - 10u.1 <-> 10u.1 <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.2 <-> D3.2 - 10u.2 <-> 1R.1 <-> 220k.1 <-> 220kk.1 <-> 47k.1 <-> VR1.1 - 16uF 450v.2 <-> 1k5.2 <-> 22uF.2 <-> 47K.2 <-> 4K7.2 <-> 820R.2 + 10u.+ <-> 10u.+ <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.K <-> D3.K + 10u.- <-> 1R.1 <-> 220k.1 <-> 220kk.1 <-> 47k.1 <-> VR1.1 + 16uF 450v.- <-> 1k5.2 <-> 22uF.- <-> 47K.2 <-> 4K7.2 <-> 820R.2 18K 3w.2 <-> 5H.1 1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2 - 270k.2 <-> D3.1 + 270k.2 <-> D3.A 33k.2 <-> 470p.2 <-> 47K.1 diff --git a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt index 428681f8b..d5cbeabb6 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.2 <-> 1M.1 .022.1 <-> 220k.2 @@ -8,14 +8,14 @@ Switch setup: [Default] .022.2 <-> 82k.1 .1 250v.1 <-> 39k.1 <-> 5k6.2 .1 250v.2 <-> 1M.1 - 100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.1 + 100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.+ 10k.1 <-> 10k.1 10k.2 <-> 18K 3w.1 <-> 82k.2 <-> 82k.2 - 10u.1 <-> 10u.1 <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.2 <-> D3.2 - 10u.2 <-> 1R.1 <-> 220k.1 <-> 220kk.1 <-> 47k.1 <-> VR1.1 - 16uF 450v.2 <-> 1k5.2 <-> 22uF.2 <-> 47K.2 <-> 4K7.2 <-> 820R.2 + 10u.+ <-> 10u.+ <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.K <-> D3.K + 10u.- <-> 1R.1 <-> 220k.1 <-> 220kk.1 <-> 47k.1 <-> VR1.1 + 16uF 450v.- <-> 1k5.2 <-> 22uF.- <-> 47K.2 <-> 4K7.2 <-> 820R.2 18K 3w.2 <-> 5H.1 1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2 - 270k.2 <-> D3.1 + 270k.2 <-> D3.A 33k.2 <-> 470p.2 <-> 47K.1 diff --git a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt index 44af3782e..320bfb274 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 220k.2 .022.1 <-> 220k.2 @@ -8,15 +8,15 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 33k.1 <-> 4k7.2 <-> 82k.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 56k.2 100k.1 <-> 100k.2 <-> 150p.2 <-> 1K.1 <-> 1M.1 <-> 3k3.2 <-> 4k7.1 <-> 820.1 <-> C1.2 100k.2 <-> 100k.2 <-> 39k.1 - 100k.2 <-> 39k.2 <-> 82k.2 <-> 8k2.1 + 100k.2 <-> 8k2.1 1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 220k.1 <-> 27k.1 <-> D5.2 - 22u 63v.2 <-> D5.1 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 220k.1 <-> 27k.1 <-> D5.K + 22u 63v.- <-> D5.A 27k.2 <-> 47R.2 <-> 47R.2 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 39k.2 <-> 82k.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt index 44af3782e..320bfb274 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 220k.2 .022.1 <-> 220k.2 @@ -8,15 +8,15 @@ Switch setup: [Default] .022.2 <-> 82k.1 0.1.1 <-> 33k.1 <-> 4k7.2 <-> 82k.2 0.1.2 <-> 1M.1 - 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2 + 1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.+ <-> 22u 63v.+ <-> 56k.2 100k.1 <-> 100k.2 <-> 150p.2 <-> 1K.1 <-> 1M.1 <-> 3k3.2 <-> 4k7.1 <-> 820.1 <-> C1.2 100k.2 <-> 100k.2 <-> 39k.1 - 100k.2 <-> 39k.2 <-> 82k.2 <-> 8k2.1 + 100k.2 <-> 8k2.1 1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2 - 220k.1 <-> 220k.1 <-> 22u 63v.2 - 220k.1 <-> 27k.1 <-> D5.2 - 22u 63v.2 <-> D5.1 + 220k.1 <-> 220k.1 <-> 56k.1 <-> VR1.3 + 220k.1 <-> 27k.1 <-> D5.K + 22u 63v.- <-> D5.A 27k.2 <-> 47R.2 <-> 47R.2 - 56k.1 <-> VR1.3 - D1.2 <-> D2.2 + 39k.2 <-> 82k.2 + D1.K <-> D2.K diff --git a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt index 7c9d3c4b9..78e0b1e78 100644 --- a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt @@ -1,28 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .2 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 - .1 <-> .2 <-> .3 <-> FH1.1 - .1 <-> .2 <-> C14.1 <-> R35.1 <-> V7.5 <-> V8.5 - .1 <-> FH1.2 - .2 <-> C31.2 + .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> SW1.1 <-> SW1.2 <-> V4.7 306-2H.1 <-> C25.4 <-> R59.2 <-> R7.1 <-> R8.2 - C1.1 <-> R6.2 + C1.+ <-> R6.2 + C1.- <-> R28.1 <-> R29.1 <-> R30.2 C1.1 <-> V2.1 - C1.2 <-> R28.1 <-> R29.1 <-> R30.2 C1.2 <-> R9.2 - C10.1 <-> R18 Treb Ch 1.3 - C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> R10.2 <-> R12.2 <-> R20 Vol Ch 1.2 <-> R20 Vol Ch 1.3 + C10.1 <-> R18 Treb Ch 1.1 + C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> R10.2 <-> R12.2 <-> R13.2 <-> R15.2 <-> R20 Vol Ch 1.1 <-> R20 Vol Ch 1.2 <-> R21 Vol Ch 2.1 <-> R37.1 <-> R52.2 <-> R55.1 + C11.1 <-> R19 Treb Ch 2.1 C12.1 <-> R28.2 <-> V3.7 C12.2 <-> R24.2 <-> R25.2 <-> R26.1 <-> R5.1 C13.1 <-> R31.2 <-> V3.2 C13.2 <-> R34.2 <-> V3.6 + C14.1 <-> R35.1 <-> SW2.1 <-> SW2.2 <-> V7.5 <-> V8.5 C14.2 <-> R30.2 <-> V3.1 C15.1 <-> R36.1 C15.2 <-> R30.1 <-> R31.1 <-> R32.1 C16.1 <-> R39.1 <-> V4.6 C16.2 <-> R43.2 <-> V5.7 - C17.1 <-> R38.1 <-> V4.8 - C17.2 <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 + C17.+ <-> R38.1 <-> V4.8 + C17.- <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 C18.1 <-> R45.1 <-> V5.6 C18.2 <-> R47.2 C19.2 <-> R43.1 <-> R46.1 <-> V5.1 @@ -33,27 +31,29 @@ Switch setup: [Default] C21.2 <-> C22.2 <-> R51.2 C22.1 <-> C24.1 <-> R53.1 <-> V2.6 C23.1 <-> R50.2 - C23.2 <-> R54.2 <-> R55.1 + C23.2 <-> R54.2 <-> R55.3 C24.2 <-> R54.1 - C25.1 <-> C29.2 <-> C30.1 <-> D3.1 <-> D5.2 <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 + C25.1 <-> C29.- <-> C30.+ <-> D3.A <-> D5.K <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 C25.2 <-> R30.1 <-> R34.1 <-> R45.2 <-> R46.2 <-> R53.2 <-> R58.1 <-> V7.4 <-> V8.4 C25.3 <-> R39.2 <-> R58.2 <-> R59.1 - C26.1 <-> D1.2 - C26.2 <-> C28.1 <-> D1.1 <-> D2.2 - C28.1 <-> D4.2 - C28.2 <-> C29.1 <-> D3.2 <-> D4.1 - C28.2 <-> D2.1 + C26.+ <-> D1.K + C26.- <-> C28.+ <-> D1.A <-> D2.K + C28.+ <-> D4.K + C28.- <-> C29.+ <-> D3.K <-> D4.A + C28.- <-> D2.A C3.1 <-> R8.1 <-> V1.6 - C30.2 <-> D5.1 <-> R35.2 <-> R36.2 <-> R60.2 - C4.1 <-> R10.1 <-> R11 Bass Ch 1.1 + C30.- <-> D5.A <-> R35.2 <-> R36.2 <-> R60.2 + C31.2 <-> SW1.2 + C4.1 <-> R10.1 <-> R11 Bass Ch 1.3 C4.2 <-> C5.1 <-> R11 Bass Ch 1.2 <-> R16.2 - C5.2 <-> R11 Bass Ch 1.3 <-> R12.1 + C5.2 <-> R11 Bass Ch 1.1 <-> R12.1 C6.1 <-> C7.2 <-> R14 Bass Ch 2.2 <-> R17.2 - C6.2 <-> R13.1 <-> R14 Bass Ch 2.3 - C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 - C8.1 <-> R18 Treb Ch 1.1 - C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C6.2 <-> R13.1 <-> R14 Bass Ch 2.1 + C7.1 <-> R14 Bass Ch 2.3 <-> R15.1 + C8.1 <-> R18 Treb Ch 1.3 + C9.1 <-> R19 Treb Ch 2.3 + FH1.1 <-> SW1.1 <-> SW1.3 <-> SW3.2 + FH1.2 <-> SW3.1 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 @@ -61,8 +61,8 @@ Switch setup: [Default] J5.Tip <-> R2.1 PL1.1 <-> V1.9 <-> V2.9 <-> V3.4 <-> V4.9 <-> V5.4 R1.2 <-> R2.2 <-> R2A.1 <-> V1.7 - R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.1 - R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.1 <-> R37.1 + R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.3 + R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 R22.1 <-> V2.3 R22.2 <-> R23.2 <-> V2.2 <-> V2.7 R23.1 <-> V2.8 @@ -77,7 +77,7 @@ Switch setup: [Default] R44.2 <-> R48.2 R47.1 <-> R48.1 <-> V5.2 R49.1 <-> R60.1 <-> R61.1 - R51.1 <-> R52.1 + R51.3 <-> R52.1 R56.1 <-> V2.3 V1.3 <-> V1.8 V2.4 <-> V2.5 <-> V7.2 diff --git a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt index b395019e5..31ff7c0b2 100644 --- a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt @@ -1,13 +1,14 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2] +Switch setup: [ SW3.ON1 ] .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 306-2H.1 <-> C25.4 <-> R59.2 <-> R7.1 <-> R8.2 - C1.1 <-> R6.2 + C1.+ <-> R6.2 + C1.- <-> R28.1 <-> R29.1 <-> R30.2 C1.1 <-> V2.1 - C1.2 <-> R28.1 <-> R29.1 <-> R30.2 C1.2 <-> R9.2 - C10.1 <-> R18 Treb Ch 1.3 - C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> R10.2 <-> R12.2 <-> R20 Vol Ch 1.2 <-> R20 Vol Ch 1.3 + C10.1 <-> R18 Treb Ch 1.1 + C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> R10.2 <-> R12.2 <-> R13.2 <-> R15.2 <-> R20 Vol Ch 1.1 <-> R20 Vol Ch 1.2 <-> R21 Vol Ch 2.1 <-> R37.1 <-> R52.2 <-> R55.1 + C11.1 <-> R19 Treb Ch 2.1 C12.1 <-> R28.2 <-> V3.7 C12.2 <-> R24.2 <-> R25.2 <-> R26.1 <-> R5.1 C13.1 <-> R31.2 <-> V3.2 @@ -18,8 +19,8 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O C15.2 <-> R30.1 <-> R31.1 <-> R32.1 C16.1 <-> R39.1 <-> V4.6 C16.2 <-> R43.2 <-> V5.7 - C17.1 <-> R38.1 <-> V4.8 - C17.2 <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 + C17.+ <-> R38.1 <-> V4.8 + C17.- <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 C18.1 <-> R45.1 <-> V5.6 C18.2 <-> R47.2 C19.2 <-> R43.1 <-> R46.1 <-> V5.1 @@ -30,28 +31,27 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O C21.2 <-> C22.2 <-> R51.2 C22.1 <-> C24.1 <-> R53.1 <-> V2.6 C23.1 <-> R50.2 - C23.2 <-> R54.2 <-> R55.1 + C23.2 <-> R54.2 <-> R55.3 C24.2 <-> R54.1 - C25.1 <-> C29.2 <-> C30.1 <-> D3.1 <-> D5.2 <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 + C25.1 <-> C29.- <-> C30.+ <-> D3.A <-> D5.K <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 C25.2 <-> R30.1 <-> R34.1 <-> R45.2 <-> R46.2 <-> R53.2 <-> R58.1 <-> V7.4 <-> V8.4 C25.3 <-> R39.2 <-> R58.2 <-> R59.1 - C26.1 <-> D1.2 - C26.2 <-> C28.1 <-> D1.1 <-> D2.2 - C28.1 <-> D4.2 - C28.2 <-> C29.1 <-> D3.2 <-> D4.1 - C28.2 <-> D2.1 + C26.+ <-> D1.K + C26.- <-> C28.+ <-> D1.A <-> D2.K + C28.+ <-> D4.K + C28.- <-> C29.+ <-> D3.K <-> D4.A + C28.- <-> D2.A C3.1 <-> R8.1 <-> V1.6 - C30.2 <-> D5.1 <-> R35.2 <-> R36.2 <-> R60.2 + C30.- <-> D5.A <-> R35.2 <-> R36.2 <-> R60.2 C31.2 <-> FH1.1 <-> FH1.2 - C4.1 <-> R10.1 <-> R11 Bass Ch 1.1 + C4.1 <-> R10.1 <-> R11 Bass Ch 1.3 C4.2 <-> C5.1 <-> R11 Bass Ch 1.2 <-> R16.2 - C5.2 <-> R11 Bass Ch 1.3 <-> R12.1 + C5.2 <-> R11 Bass Ch 1.1 <-> R12.1 C6.1 <-> C7.2 <-> R14 Bass Ch 2.2 <-> R17.2 - C6.2 <-> R13.1 <-> R14 Bass Ch 2.3 - C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 - C8.1 <-> R18 Treb Ch 1.1 - C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C6.2 <-> R13.1 <-> R14 Bass Ch 2.1 + C7.1 <-> R14 Bass Ch 2.3 <-> R15.1 + C8.1 <-> R18 Treb Ch 1.3 + C9.1 <-> R19 Treb Ch 2.3 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 @@ -59,8 +59,8 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O J5.Tip <-> R2.1 PL1.1 <-> V1.9 <-> V2.9 <-> V3.4 <-> V4.9 <-> V5.4 R1.2 <-> R2.2 <-> R2A.1 <-> V1.7 - R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.1 - R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.1 <-> R37.1 + R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.3 + R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 R22.1 <-> V2.3 R22.2 <-> R23.2 <-> V2.2 <-> V2.7 R23.1 <-> V2.8 @@ -75,21 +75,22 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O R44.2 <-> R48.2 R47.1 <-> R48.1 <-> V5.2 R49.1 <-> R60.1 <-> R61.1 - R51.1 <-> R52.1 + R51.3 <-> R52.1 R56.1 <-> V2.3 V1.3 <-> V1.8 V2.4 <-> V2.5 <-> V7.2 -Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] +Switch setup: [ SW3.ON2 ] .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 306-2H.1 <-> C25.4 <-> R59.2 <-> R7.1 <-> R8.2 - C1.1 <-> R6.2 + C1.+ <-> R6.2 + C1.- <-> R28.1 <-> R29.1 <-> R30.2 C1.1 <-> V2.1 - C1.2 <-> R28.1 <-> R29.1 <-> R30.2 C1.2 <-> R9.2 - C10.1 <-> R18 Treb Ch 1.3 - C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> R10.2 <-> R12.2 <-> R20 Vol Ch 1.2 <-> R20 Vol Ch 1.3 + C10.1 <-> R18 Treb Ch 1.1 + C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> R10.2 <-> R12.2 <-> R13.2 <-> R15.2 <-> R20 Vol Ch 1.1 <-> R20 Vol Ch 1.2 <-> R21 Vol Ch 2.1 <-> R37.1 <-> R52.2 <-> R55.1 + C11.1 <-> R19 Treb Ch 2.1 C12.1 <-> R28.2 <-> V3.7 C12.2 <-> R24.2 <-> R25.2 <-> R26.1 <-> R5.1 C13.1 <-> R31.2 <-> V3.2 @@ -100,8 +101,8 @@ Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .O C15.2 <-> R30.1 <-> R31.1 <-> R32.1 C16.1 <-> R39.1 <-> V4.6 C16.2 <-> R43.2 <-> V5.7 - C17.1 <-> R38.1 <-> V4.8 - C17.2 <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 + C17.+ <-> R38.1 <-> V4.8 + C17.- <-> R2A.2 <-> R3.2 <-> R3A.1 <-> R3A.2 <-> R4.2 <-> R6.1 <-> V1.2 C18.1 <-> R45.1 <-> V5.6 C18.2 <-> R47.2 C19.2 <-> R43.1 <-> R46.1 <-> V5.1 @@ -112,28 +113,27 @@ Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .O C21.2 <-> C22.2 <-> R51.2 C22.1 <-> C24.1 <-> R53.1 <-> V2.6 C23.1 <-> R50.2 - C23.2 <-> R54.2 <-> R55.1 + C23.2 <-> R54.2 <-> R55.3 C24.2 <-> R54.1 - C25.1 <-> C29.2 <-> C30.1 <-> D3.1 <-> D5.2 <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 + C25.1 <-> C29.- <-> C30.+ <-> D3.A <-> D5.K <-> R56.2 <-> R61.2 <-> V1.4 <-> V1.5 <-> V2.4 <-> V2.5 <-> V2.8 <-> V2.9 <-> V3.5 <-> V4.4 <-> V4.5 <-> V5.5 <-> V7.7 <-> V7.8 <-> V8.2 <-> V8.7 <-> V8.8 C25.2 <-> R30.1 <-> R34.1 <-> R45.2 <-> R46.2 <-> R53.2 <-> R58.1 <-> V7.4 <-> V8.4 C25.3 <-> R39.2 <-> R58.2 <-> R59.1 - C26.1 <-> D1.2 - C26.2 <-> C28.1 <-> D1.1 <-> D2.2 - C28.1 <-> D4.2 - C28.2 <-> C29.1 <-> D3.2 <-> D4.1 - C28.2 <-> D2.1 + C26.+ <-> D1.K + C26.- <-> C28.+ <-> D1.A <-> D2.K + C28.+ <-> D4.K + C28.- <-> C29.+ <-> D3.K <-> D4.A + C28.- <-> D2.A C3.1 <-> R8.1 <-> V1.6 - C30.2 <-> D5.1 <-> R35.2 <-> R36.2 <-> R60.2 + C30.- <-> D5.A <-> R35.2 <-> R36.2 <-> R60.2 C31.2 <-> FH1.1 - C4.1 <-> R10.1 <-> R11 Bass Ch 1.1 + C4.1 <-> R10.1 <-> R11 Bass Ch 1.3 C4.2 <-> C5.1 <-> R11 Bass Ch 1.2 <-> R16.2 - C5.2 <-> R11 Bass Ch 1.3 <-> R12.1 + C5.2 <-> R11 Bass Ch 1.1 <-> R12.1 C6.1 <-> C7.2 <-> R14 Bass Ch 2.2 <-> R17.2 - C6.2 <-> R13.1 <-> R14 Bass Ch 2.3 - C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 - C8.1 <-> R18 Treb Ch 1.1 - C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C6.2 <-> R13.1 <-> R14 Bass Ch 2.1 + C7.1 <-> R14 Bass Ch 2.3 <-> R15.1 + C8.1 <-> R18 Treb Ch 1.3 + C9.1 <-> R19 Treb Ch 2.3 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 @@ -141,8 +141,8 @@ Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .O J5.Tip <-> R2.1 PL1.1 <-> V1.9 <-> V2.9 <-> V3.4 <-> V4.9 <-> V5.4 R1.2 <-> R2.2 <-> R2A.1 <-> V1.7 - R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.1 - R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.1 <-> R37.1 + R16.1 <-> R18 Treb Ch 1.2 <-> R20 Vol Ch 1.3 + R17.1 <-> R19 Treb Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 R22.1 <-> V2.3 R22.2 <-> R23.2 <-> V2.2 <-> V2.7 R23.1 <-> V2.8 @@ -157,7 +157,7 @@ Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .O R44.2 <-> R48.2 R47.1 <-> R48.1 <-> V5.2 R49.1 <-> R60.1 <-> R61.1 - R51.1 <-> R52.1 + R51.3 <-> R52.1 R56.1 <-> V2.3 V1.3 <-> V1.8 V2.4 <-> V2.5 <-> V7.2 diff --git a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt index 674f8cd7d..8cbab949d 100644 --- a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt @@ -1,4 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.17 <-> IC6.18 <-> IC6.19 <-> IC6.2 <-> IC6.20 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> IC8.11 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> IC1.1 <-> IC1.8 <-> IC2.8 <-> IC3.1 <-> IC3.8 <-> IC4.1 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.1 <-> IC6.10 <-> IC7.1 <-> IC7.10 <-> IC8.1 <-> IC8.10 + IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.11 + IC1.12 <-> IC3.4 + IC1.13 <-> IC3.5 + IC1.2 <-> IC5.3 <-> IC8.3 + IC1.3 <-> IC5.2 <-> IC8.2 + IC1.4 <-> IC2.12 + IC1.5 <-> IC2.13 + IC1.6 <-> IC5.4 <-> IC8.4 + IC1.7 <-> IC5.5 <-> IC8.5 + IC2.2 <-> IC6.7 <-> IC7.7 + IC2.3 <-> IC6.6 <-> IC7.6 + IC2.4 <-> IC4.12 + IC2.5 <-> IC4.13 + IC2.6 <-> IC6.8 <-> IC7.8 + IC2.7 <-> IC6.9 <-> IC7.9 + IC3.2 <-> IC5.7 <-> IC8.7 + IC3.3 <-> IC5.6 <-> IC8.6 + IC3.6 <-> IC5.8 <-> IC8.8 + IC3.7 <-> IC5.9 <-> IC8.9 + IC4.2 <-> IC6.3 <-> IC7.3 + IC4.3 <-> IC6.2 <-> IC7.2 + IC4.6 <-> IC6.4 <-> IC7.4 + IC4.7 <-> IC6.5 <-> IC7.5 diff --git a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt index 674f8cd7d..8cbab949d 100644 --- a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt @@ -1,4 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.17 <-> IC6.18 <-> IC6.19 <-> IC6.2 <-> IC6.20 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> IC8.11 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> IC1.1 <-> IC1.8 <-> IC2.8 <-> IC3.1 <-> IC3.8 <-> IC4.1 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.1 <-> IC6.10 <-> IC7.1 <-> IC7.10 <-> IC8.1 <-> IC8.10 + IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.11 + IC1.12 <-> IC3.4 + IC1.13 <-> IC3.5 + IC1.2 <-> IC5.3 <-> IC8.3 + IC1.3 <-> IC5.2 <-> IC8.2 + IC1.4 <-> IC2.12 + IC1.5 <-> IC2.13 + IC1.6 <-> IC5.4 <-> IC8.4 + IC1.7 <-> IC5.5 <-> IC8.5 + IC2.2 <-> IC6.7 <-> IC7.7 + IC2.3 <-> IC6.6 <-> IC7.6 + IC2.4 <-> IC4.12 + IC2.5 <-> IC4.13 + IC2.6 <-> IC6.8 <-> IC7.8 + IC2.7 <-> IC6.9 <-> IC7.9 + IC3.2 <-> IC5.7 <-> IC8.7 + IC3.3 <-> IC5.6 <-> IC8.6 + IC3.6 <-> IC5.8 <-> IC8.8 + IC3.7 <-> IC5.9 <-> IC8.9 + IC4.2 <-> IC6.3 <-> IC7.3 + IC4.3 <-> IC6.2 <-> IC7.2 + IC4.6 <-> IC6.4 <-> IC7.4 + IC4.7 <-> IC6.5 <-> IC7.5 diff --git a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt index db2692f2c..a51ac15b8 100644 --- a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt @@ -1,8 +1,95 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> Coarse 1.2 <-> Coarse 3.2 <-> CV In 1.Tip <-> CV In 3.Tip <-> D1.1 <-> D1.2 <-> D12.1 <-> D12.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.2 <-> D6.2 <-> D7.1 <-> D7.2 <-> Fine 1.2 <-> Fine 3.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.14 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.2 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> Output 1.Tip <-> Output 2.Tip <-> Output 3.Tip <-> Output 4.Tip <-> Pulsewidth 1.2 <-> Pulsewidth 2.2 <-> Pulsewidth 3.2 <-> Pulsewidth 4.2 <-> PWM In 1.Tip <-> PWM In 4.Tip <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R14.2 <-> R15.1 <-> R15.2 <-> R16.1 <-> R16.2 <-> R17.1 <-> R17.2 <-> R18.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R21.1 <-> R21.2 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> R24.1 <-> R24.2 <-> R25.1 <-> R25.2 <-> R26.1 <-> R26.2 <-> R27.1 <-> R27.2 <-> R28.1 <-> R28.2 <-> R29.1 <-> R29.2 <-> R3.1 <-> R3.2 <-> R30.1 <-> R30.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 <-> R35.2 <-> R36.1 <-> R36.2 <-> R37.1 <-> R37.2 <-> R38.1 <-> R38.2 <-> R39.1 <-> R39.2 <-> R4.1 <-> R40.1 <-> R40.2 <-> R41.1 <-> R41.2 <-> R42.1 <-> R42.2 <-> R5.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 <-> Slope Shift 1.2 <-> Slope Shift 2.1 <-> Square/Sawtooth 3.1 <-> Square/Sawtooth 3.2 <-> Square/Sawtooth 3.3 <-> Square/Sawtooth 4.1 <-> Square/Sawtooth 4.2 <-> Square/Sawtooth 4.3 <-> Square/Triangle 1.1 <-> Square/Triangle 1.2 <-> Square/Triangle 1.3 <-> Square/Triangle 2.1 <-> Square/Triangle 2.2 <-> Square/Triangle 2.3 <-> VR1.1 <-> VR1.3 <-> VR10.1 <-> VR13.1 <-> VR13.2 <-> VR13.3 <-> VR16.1 <-> VR16.2 <-> VR16.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.3 <-> VR5.1 <-> VR5.3 <-> VR6.1 <-> VR6.3 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.3 - Coarse 2.2 <-> Coarse 3.2 <-> CV In 2.Tip <-> CV In 4.Tip <-> Fine 2.2 <-> Fine 4.2 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> R31.1 <-> R32.1 <-> R33.1 <-> R34.1 <-> VR10.3 <-> VR4.1 - D5.1 <-> D6.1 <-> FM In 2.Tip <-> FM In 4.Tip <-> IC2.14 <-> IC2.7 <-> R4.2 <-> R6.1 <-> Slope Shift 1.1 <-> VR10.2 <-> VR4.2 - FM In 1.Tip <-> FM In 3.Tip <-> IC5.13 <-> IC5.6 <-> PWM In 2.Tip <-> R18.2 <-> R19.1 <-> R20.2 <-> Slope Shift 2.2 <-> VR1.2 <-> VR5.2 <-> VR6.2 + BC548.1 <-> C1.1 <-> D1.K <-> IC1.9 <-> IC2.10 + BC548.1 <-> C2.2 <-> D2.K <-> IC1.11 <-> IC5.10 + BC548.1 <-> C3.1 <-> D4.K <-> IC1.1 <-> IC4.10 + BC548.1 <-> C4.1 <-> D3.K <-> IC1.3 <-> IC6.12 + BC548.2 <-> BC558.3 <-> R13.1 + BC548.2 <-> BC558.3 <-> R17.1 + BC548.2 <-> BC558.3 <-> R2.1 + BC548.2 <-> BC558.3 <-> R36.1 + BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.13 <-> IC1.5 <-> IC1.7 <-> IC2.5 <-> IC5.5 <-> R11.2 <-> R14.2 <-> R18.1 <-> R22.2 <-> R23.2 <-> R24.2 <-> R26.2 <-> R27.2 <-> R28.2 <-> R3.2 <-> R30.2 <-> R37.2 <-> R39.2 <-> R40.2 <-> R5.1 <-> R8.2 <-> R9.2 <-> VR13.2 <-> VR2.2 <-> VR7.2 <-> VR8.2 + BC558.1 <-> BC558.1 <-> IC2.11 <-> IC3.11 <-> IC4.11 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> R21.2 <-> R7.2 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R1.1 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R12.1 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R16.1 + BC558.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 + C10.1 <-> IC6.10 <-> IC6.3 <-> R37.1 + C10.2 <-> IC6.13 <-> IC6.14 + C5.1 <-> IC2.8 <-> IC2.9 + C5.2 <-> IC2.12 <-> IC2.3 <-> R3.1 + C6.1 <-> D5.K <-> D6.K <-> R7.1 + C6.2 <-> R8.1 <-> Square/Triangle 1.3 + C7.1 <-> IC5.8 <-> IC5.9 + C7.2 <-> IC5.12 <-> IC5.3 <-> R24.1 + C8.1 <-> D12.K <-> D7.K <-> R21.1 + C8.2 <-> R22.1 <-> Square/Triangle 2.3 + C9.1 <-> IC4.12 <-> IC4.5 <-> R14.1 + C9.2 <-> IC4.8 <-> IC4.9 + Coarse 1.2 <-> NTC.1 + Coarse 2.2 <-> NTC.1 + Coarse 3.2 <-> NTC.1 + Coarse 3.2 <-> R32.1 + CV In 1.Tip <-> NTC.1 + CV In 2.Tip <-> NTC.1 + CV In 3.Tip <-> NTC.1 + CV In 4.Tip <-> R33.1 + D1.A <-> IC1.10 + D12.A <-> IC5.14 <-> R19.2 <-> R20.1 + D2.A <-> IC1.12 + D3.A <-> IC1.4 + D4.A <-> IC1.2 + D5.A <-> IC2.7 <-> Slope Shift 1.3 + D6.A <-> IC2.14 <-> R4.2 <-> R6.1 + D7.A <-> IC5.7 <-> Slope Shift 2.3 + Fine 1.2 <-> NTC.1 + Fine 2.2 <-> NTC.1 + Fine 3.2 <-> NTC.1 + Fine 4.2 <-> R31.1 + FM In 1.Tip <-> VR1.2 + FM In 2.Tip <-> VR4.2 + FM In 3.Tip <-> VR6.2 + FM In 4.Tip <-> VR10.2 + IC1.8 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.4 <-> IC7.4 <-> R13.2 <-> R17.2 <-> R2.2 <-> R36.2 <-> R42.2 + IC2.1 <-> R10.1 + IC2.13 <-> R4.1 <-> R5.2 + IC2.2 <-> Pulsewidth 1.2 <-> R9.1 <-> VR3.1 + IC2.6 <-> R6.2 <-> Slope Shift 1.2 + IC3.1 <-> IC3.2 <-> Square/Triangle 2.1 + IC3.10 <-> Square/Triangle 1.2 + IC3.12 <-> R10.2 <-> R11.1 + IC3.13 <-> IC3.14 <-> Square/Triangle 1.1 + IC3.3 <-> R25.2 <-> R26.1 + IC3.5 <-> Square/Triangle 2.2 + IC3.6 <-> IC3.7 <-> Output 2.Tip + IC3.8 <-> IC3.9 <-> Output 1.Tip + IC4.1 <-> IC4.2 <-> Square/Sawtooth 3.1 + IC4.13 <-> R15.1 <-> R27.1 + IC4.14 <-> R15.2 <-> Square/Sawtooth 3.3 + IC4.3 <-> R29.2 <-> R30.1 + IC4.6 <-> Pulsewidth 3.2 <-> R28.1 <-> VR9.1 + IC4.7 <-> R29.1 + IC5.1 <-> R25.1 + IC5.13 <-> R18.2 <-> R19.1 + IC5.2 <-> Pulsewidth 2.2 <-> R23.1 <-> VR5.1 + IC5.6 <-> R20.2 <-> Slope Shift 2.2 + IC6.1 <-> R41.1 + IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3 + IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2 + IC6.6 <-> IC6.7 <-> Square/Sawtooth 4.1 + IC6.8 <-> R38.2 <-> Square/Sawtooth 4.3 + IC6.9 <-> R38.1 <-> R39.1 + IC7.13 <-> IC7.14 <-> Output 4.Tip + IC7.5 <-> Square/Sawtooth 3.2 + IC7.6 <-> IC7.7 <-> Output 3.Tip + NTC.1 <-> VR1.1 + NTC.1 <-> VR4.1 + PWM In 1.Tip <-> VR3.2 + PWM In 2.Tip <-> VR5.2 PWM In 3.Tip <-> VR9.2 + PWM In 4.Tip <-> VR16.2 + R1.2 <-> VR2.1 + R12.2 <-> VR8.1 + R16.2 <-> VR7.1 + R35.2 <-> VR13.3 diff --git a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt index db2692f2c..a51ac15b8 100644 --- a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt @@ -1,8 +1,95 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> Coarse 1.2 <-> Coarse 3.2 <-> CV In 1.Tip <-> CV In 3.Tip <-> D1.1 <-> D1.2 <-> D12.1 <-> D12.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.2 <-> D6.2 <-> D7.1 <-> D7.2 <-> Fine 1.2 <-> Fine 3.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.14 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.2 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> Output 1.Tip <-> Output 2.Tip <-> Output 3.Tip <-> Output 4.Tip <-> Pulsewidth 1.2 <-> Pulsewidth 2.2 <-> Pulsewidth 3.2 <-> Pulsewidth 4.2 <-> PWM In 1.Tip <-> PWM In 4.Tip <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R14.2 <-> R15.1 <-> R15.2 <-> R16.1 <-> R16.2 <-> R17.1 <-> R17.2 <-> R18.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R21.1 <-> R21.2 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> R24.1 <-> R24.2 <-> R25.1 <-> R25.2 <-> R26.1 <-> R26.2 <-> R27.1 <-> R27.2 <-> R28.1 <-> R28.2 <-> R29.1 <-> R29.2 <-> R3.1 <-> R3.2 <-> R30.1 <-> R30.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 <-> R35.2 <-> R36.1 <-> R36.2 <-> R37.1 <-> R37.2 <-> R38.1 <-> R38.2 <-> R39.1 <-> R39.2 <-> R4.1 <-> R40.1 <-> R40.2 <-> R41.1 <-> R41.2 <-> R42.1 <-> R42.2 <-> R5.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 <-> Slope Shift 1.2 <-> Slope Shift 2.1 <-> Square/Sawtooth 3.1 <-> Square/Sawtooth 3.2 <-> Square/Sawtooth 3.3 <-> Square/Sawtooth 4.1 <-> Square/Sawtooth 4.2 <-> Square/Sawtooth 4.3 <-> Square/Triangle 1.1 <-> Square/Triangle 1.2 <-> Square/Triangle 1.3 <-> Square/Triangle 2.1 <-> Square/Triangle 2.2 <-> Square/Triangle 2.3 <-> VR1.1 <-> VR1.3 <-> VR10.1 <-> VR13.1 <-> VR13.2 <-> VR13.3 <-> VR16.1 <-> VR16.2 <-> VR16.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.3 <-> VR5.1 <-> VR5.3 <-> VR6.1 <-> VR6.3 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.3 - Coarse 2.2 <-> Coarse 3.2 <-> CV In 2.Tip <-> CV In 4.Tip <-> Fine 2.2 <-> Fine 4.2 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> R31.1 <-> R32.1 <-> R33.1 <-> R34.1 <-> VR10.3 <-> VR4.1 - D5.1 <-> D6.1 <-> FM In 2.Tip <-> FM In 4.Tip <-> IC2.14 <-> IC2.7 <-> R4.2 <-> R6.1 <-> Slope Shift 1.1 <-> VR10.2 <-> VR4.2 - FM In 1.Tip <-> FM In 3.Tip <-> IC5.13 <-> IC5.6 <-> PWM In 2.Tip <-> R18.2 <-> R19.1 <-> R20.2 <-> Slope Shift 2.2 <-> VR1.2 <-> VR5.2 <-> VR6.2 + BC548.1 <-> C1.1 <-> D1.K <-> IC1.9 <-> IC2.10 + BC548.1 <-> C2.2 <-> D2.K <-> IC1.11 <-> IC5.10 + BC548.1 <-> C3.1 <-> D4.K <-> IC1.1 <-> IC4.10 + BC548.1 <-> C4.1 <-> D3.K <-> IC1.3 <-> IC6.12 + BC548.2 <-> BC558.3 <-> R13.1 + BC548.2 <-> BC558.3 <-> R17.1 + BC548.2 <-> BC558.3 <-> R2.1 + BC548.2 <-> BC558.3 <-> R36.1 + BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.13 <-> IC1.5 <-> IC1.7 <-> IC2.5 <-> IC5.5 <-> R11.2 <-> R14.2 <-> R18.1 <-> R22.2 <-> R23.2 <-> R24.2 <-> R26.2 <-> R27.2 <-> R28.2 <-> R3.2 <-> R30.2 <-> R37.2 <-> R39.2 <-> R40.2 <-> R5.1 <-> R8.2 <-> R9.2 <-> VR13.2 <-> VR2.2 <-> VR7.2 <-> VR8.2 + BC558.1 <-> BC558.1 <-> IC2.11 <-> IC3.11 <-> IC4.11 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> R21.2 <-> R7.2 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R1.1 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R12.1 + BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R16.1 + BC558.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 + C10.1 <-> IC6.10 <-> IC6.3 <-> R37.1 + C10.2 <-> IC6.13 <-> IC6.14 + C5.1 <-> IC2.8 <-> IC2.9 + C5.2 <-> IC2.12 <-> IC2.3 <-> R3.1 + C6.1 <-> D5.K <-> D6.K <-> R7.1 + C6.2 <-> R8.1 <-> Square/Triangle 1.3 + C7.1 <-> IC5.8 <-> IC5.9 + C7.2 <-> IC5.12 <-> IC5.3 <-> R24.1 + C8.1 <-> D12.K <-> D7.K <-> R21.1 + C8.2 <-> R22.1 <-> Square/Triangle 2.3 + C9.1 <-> IC4.12 <-> IC4.5 <-> R14.1 + C9.2 <-> IC4.8 <-> IC4.9 + Coarse 1.2 <-> NTC.1 + Coarse 2.2 <-> NTC.1 + Coarse 3.2 <-> NTC.1 + Coarse 3.2 <-> R32.1 + CV In 1.Tip <-> NTC.1 + CV In 2.Tip <-> NTC.1 + CV In 3.Tip <-> NTC.1 + CV In 4.Tip <-> R33.1 + D1.A <-> IC1.10 + D12.A <-> IC5.14 <-> R19.2 <-> R20.1 + D2.A <-> IC1.12 + D3.A <-> IC1.4 + D4.A <-> IC1.2 + D5.A <-> IC2.7 <-> Slope Shift 1.3 + D6.A <-> IC2.14 <-> R4.2 <-> R6.1 + D7.A <-> IC5.7 <-> Slope Shift 2.3 + Fine 1.2 <-> NTC.1 + Fine 2.2 <-> NTC.1 + Fine 3.2 <-> NTC.1 + Fine 4.2 <-> R31.1 + FM In 1.Tip <-> VR1.2 + FM In 2.Tip <-> VR4.2 + FM In 3.Tip <-> VR6.2 + FM In 4.Tip <-> VR10.2 + IC1.8 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.4 <-> IC7.4 <-> R13.2 <-> R17.2 <-> R2.2 <-> R36.2 <-> R42.2 + IC2.1 <-> R10.1 + IC2.13 <-> R4.1 <-> R5.2 + IC2.2 <-> Pulsewidth 1.2 <-> R9.1 <-> VR3.1 + IC2.6 <-> R6.2 <-> Slope Shift 1.2 + IC3.1 <-> IC3.2 <-> Square/Triangle 2.1 + IC3.10 <-> Square/Triangle 1.2 + IC3.12 <-> R10.2 <-> R11.1 + IC3.13 <-> IC3.14 <-> Square/Triangle 1.1 + IC3.3 <-> R25.2 <-> R26.1 + IC3.5 <-> Square/Triangle 2.2 + IC3.6 <-> IC3.7 <-> Output 2.Tip + IC3.8 <-> IC3.9 <-> Output 1.Tip + IC4.1 <-> IC4.2 <-> Square/Sawtooth 3.1 + IC4.13 <-> R15.1 <-> R27.1 + IC4.14 <-> R15.2 <-> Square/Sawtooth 3.3 + IC4.3 <-> R29.2 <-> R30.1 + IC4.6 <-> Pulsewidth 3.2 <-> R28.1 <-> VR9.1 + IC4.7 <-> R29.1 + IC5.1 <-> R25.1 + IC5.13 <-> R18.2 <-> R19.1 + IC5.2 <-> Pulsewidth 2.2 <-> R23.1 <-> VR5.1 + IC5.6 <-> R20.2 <-> Slope Shift 2.2 + IC6.1 <-> R41.1 + IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3 + IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2 + IC6.6 <-> IC6.7 <-> Square/Sawtooth 4.1 + IC6.8 <-> R38.2 <-> Square/Sawtooth 4.3 + IC6.9 <-> R38.1 <-> R39.1 + IC7.13 <-> IC7.14 <-> Output 4.Tip + IC7.5 <-> Square/Sawtooth 3.2 + IC7.6 <-> IC7.7 <-> Output 3.Tip + NTC.1 <-> VR1.1 + NTC.1 <-> VR4.1 + PWM In 1.Tip <-> VR3.2 + PWM In 2.Tip <-> VR5.2 PWM In 3.Tip <-> VR9.2 + PWM In 4.Tip <-> VR16.2 + R1.2 <-> VR2.1 + R12.2 <-> VR8.1 + R16.2 <-> VR7.1 + R35.2 <-> VR13.3 diff --git a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt index 136f4e1be..ad650b535 100644 --- a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 0.047.1 <-> 33k.2 .022.1 <-> 100p.1 <-> 220k.1 @@ -9,8 +9,8 @@ Switch setup: [Default] .047.2 <-> .68.1 <-> 12k.2 <-> 2k2.1 <-> 2k7.1 <-> 3k9.1 <-> 430k.1 <-> 470k.2 <-> 470pF.2 <-> 820R.1 100k.1 <-> 150p.1 <-> 33k.1 100k.2 <-> 15k 2w.1 <-> 22k.2 - 100u 100v.1 <-> 330R 10W.1 - 100u 100v.2 <-> 330R 10W.2 + 100u 100v.+ <-> 330R 10W.1 + 100u 100v.- <-> 330R 10W.2 12k.1 <-> 270k.2 15k 2w.2 <-> 18k 3w.2 <-> 220k.2 <-> 220k.2 18k 3w.1 <-> 2k2 5w.2 diff --git a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt index 136f4e1be..ad650b535 100644 --- a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .022.1 <-> 0.047.1 <-> 33k.2 .022.1 <-> 100p.1 <-> 220k.1 @@ -9,8 +9,8 @@ Switch setup: [Default] .047.2 <-> .68.1 <-> 12k.2 <-> 2k2.1 <-> 2k7.1 <-> 3k9.1 <-> 430k.1 <-> 470k.2 <-> 470pF.2 <-> 820R.1 100k.1 <-> 150p.1 <-> 33k.1 100k.2 <-> 15k 2w.1 <-> 22k.2 - 100u 100v.1 <-> 330R 10W.1 - 100u 100v.2 <-> 330R 10W.2 + 100u 100v.+ <-> 330R 10W.1 + 100u 100v.- <-> 330R 10W.2 12k.1 <-> 270k.2 15k 2w.2 <-> 18k 3w.2 <-> 220k.2 <-> 220k.2 18k 3w.1 <-> 2k2 5w.2 diff --git a/diylc-regression-data/input/user-files/netlist/dist_layout_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/dist_layout_excl_switches.txt index 903b4f8c8..6d4c348b9 100644 --- a/diylc-regression-data/input/user-files/netlist/dist_layout_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/dist_layout_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .1 <-> C1.1 <-> C11.1 <-> C12.2 <-> C16.1 <-> C17.2 <-> C2.2 <-> C20.2 <-> C21.1 <-> C22.1 <-> C3.2 <-> C4.2 <-> C7.2 <-> J3.3 <-> Mid.3 <-> R1.2 <-> R10.1 <-> R15.1 <-> R17.2 <-> R2.2 <-> R23.2 <-> R24.2 <-> R4.2 <-> R7.2 + .1 <-> .1 <-> .1 <-> .1 <-> C1.1 <-> C11.1 <-> C12.2 <-> C16.1 <-> C17.2 <-> C2.- <-> C20.- <-> C21.- <-> C22.- <-> C3.- <-> C4.2 <-> C7.2 <-> J3.3 <-> Mid.1 <-> R1.2 <-> R10.1 <-> R15.1 <-> R17.2 <-> R2.2 <-> R23.2 <-> R24.2 <-> R4.2 <-> R7.2 .1 <-> C12.1 <-> R1.1 .1 <-> C18.2 <-> R23.1 .2 <-> C1.2 <-> R15.2 <-> R22.1 <-> R25.2 @@ -11,28 +11,28 @@ Switch setup: [Default] .2 <-> R8.2 .3 <-> C10.1 <-> R9*.1 .3 <-> C13.2 <-> R20*.1 <-> trimmer.1 - .3 <-> C20.1 <-> C22.2 <-> R16.2 <-> R22.2 <-> R3*.1 <-> R4*.4 + .3 <-> C20.+ <-> C22.+ <-> R16.2 <-> R22.2 <-> R3*.1 <-> R4*.4 .3 <-> C5.2 <-> R3*.4 .3 <-> C8.1 <-> R4*.1 .3 <-> C9.1 <-> R12*.1 C10.2 <-> R10.2 <-> R11.1 - C13.1 <-> High.1 + C13.1 <-> High.3 C14.1 <-> Mid.2 C14.2 <-> C15.2 <-> trimmer.2 <-> trimmer.3 - C15.1 <-> High.3 <-> Low.1 <-> Low.2 + C15.1 <-> High.1 <-> Low.2 <-> Low.3 C17.1 <-> R21.2 C19.1 <-> R25.1 C19.2 <-> J1.Tip <-> R24.1 - C2.1 <-> C4.1 <-> J3.1 <-> R20*.4 <-> R3.2 - C21.2 <-> C3.1 <-> R12*.4 <-> R16.1 <-> R3.1 <-> R9*.4 - C5.1 <-> C6.1 <-> Gain.1 + C2.+ <-> C4.1 <-> J3.1 <-> R20*.4 <-> R3.2 + C21.+ <-> C3.+ <-> R12*.4 <-> R16.1 <-> R3.1 <-> R9*.4 + C5.1 <-> C6.1 <-> Gain.3 C6.2 <-> Gain.2 <-> R5.1 C8.2 <-> R7.1 <-> R8.1 C9.2 <-> R17.1 <-> R18.1 - Gain.3 <-> R4.1 + Gain.1 <-> R4.1 High.2 <-> R21.2 - J2.Sleeve <-> Level.3 + J2.Sleeve <-> Level.1 J2.Tip <-> Level.2 - Level.1 <-> R21.1 <-> R21.1 - Low.3 <-> Mid.1 + Level.3 <-> R21.1 <-> R21.1 + Low.1 <-> Mid.3 diff --git a/diylc-regression-data/input/user-files/netlist/dist_layout_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/dist_layout_incl_switches.txt index 903b4f8c8..6d4c348b9 100644 --- a/diylc-regression-data/input/user-files/netlist/dist_layout_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/dist_layout_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> .1 <-> .1 <-> .1 <-> C1.1 <-> C11.1 <-> C12.2 <-> C16.1 <-> C17.2 <-> C2.2 <-> C20.2 <-> C21.1 <-> C22.1 <-> C3.2 <-> C4.2 <-> C7.2 <-> J3.3 <-> Mid.3 <-> R1.2 <-> R10.1 <-> R15.1 <-> R17.2 <-> R2.2 <-> R23.2 <-> R24.2 <-> R4.2 <-> R7.2 + .1 <-> .1 <-> .1 <-> .1 <-> C1.1 <-> C11.1 <-> C12.2 <-> C16.1 <-> C17.2 <-> C2.- <-> C20.- <-> C21.- <-> C22.- <-> C3.- <-> C4.2 <-> C7.2 <-> J3.3 <-> Mid.1 <-> R1.2 <-> R10.1 <-> R15.1 <-> R17.2 <-> R2.2 <-> R23.2 <-> R24.2 <-> R4.2 <-> R7.2 .1 <-> C12.1 <-> R1.1 .1 <-> C18.2 <-> R23.1 .2 <-> C1.2 <-> R15.2 <-> R22.1 <-> R25.2 @@ -11,28 +11,28 @@ Switch setup: [Default] .2 <-> R8.2 .3 <-> C10.1 <-> R9*.1 .3 <-> C13.2 <-> R20*.1 <-> trimmer.1 - .3 <-> C20.1 <-> C22.2 <-> R16.2 <-> R22.2 <-> R3*.1 <-> R4*.4 + .3 <-> C20.+ <-> C22.+ <-> R16.2 <-> R22.2 <-> R3*.1 <-> R4*.4 .3 <-> C5.2 <-> R3*.4 .3 <-> C8.1 <-> R4*.1 .3 <-> C9.1 <-> R12*.1 C10.2 <-> R10.2 <-> R11.1 - C13.1 <-> High.1 + C13.1 <-> High.3 C14.1 <-> Mid.2 C14.2 <-> C15.2 <-> trimmer.2 <-> trimmer.3 - C15.1 <-> High.3 <-> Low.1 <-> Low.2 + C15.1 <-> High.1 <-> Low.2 <-> Low.3 C17.1 <-> R21.2 C19.1 <-> R25.1 C19.2 <-> J1.Tip <-> R24.1 - C2.1 <-> C4.1 <-> J3.1 <-> R20*.4 <-> R3.2 - C21.2 <-> C3.1 <-> R12*.4 <-> R16.1 <-> R3.1 <-> R9*.4 - C5.1 <-> C6.1 <-> Gain.1 + C2.+ <-> C4.1 <-> J3.1 <-> R20*.4 <-> R3.2 + C21.+ <-> C3.+ <-> R12*.4 <-> R16.1 <-> R3.1 <-> R9*.4 + C5.1 <-> C6.1 <-> Gain.3 C6.2 <-> Gain.2 <-> R5.1 C8.2 <-> R7.1 <-> R8.1 C9.2 <-> R17.1 <-> R18.1 - Gain.3 <-> R4.1 + Gain.1 <-> R4.1 High.2 <-> R21.2 - J2.Sleeve <-> Level.3 + J2.Sleeve <-> Level.1 J2.Tip <-> Level.2 - Level.1 <-> R21.1 <-> R21.1 - Low.3 <-> Mid.1 + Level.3 <-> R21.1 <-> R21.1 + Low.1 <-> Mid.3 diff --git a/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png b/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png index 9dbb9f429..e2ee004c2 100644 Binary files a/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png and b/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png differ diff --git a/diylc-regression-data/input/user-files/png/6Y6 Express 2.png b/diylc-regression-data/input/user-files/png/6Y6 Express 2.png index fd5b37eb3..8672b5112 100644 Binary files a/diylc-regression-data/input/user-files/png/6Y6 Express 2.png and b/diylc-regression-data/input/user-files/png/6Y6 Express 2.png differ diff --git a/diylc-regression-data/input/user-files/png/ALU board with interface.png b/diylc-regression-data/input/user-files/png/ALU board with interface.png index 52b7287d4..b7c067645 100644 Binary files a/diylc-regression-data/input/user-files/png/ALU board with interface.png and b/diylc-regression-data/input/user-files/png/ALU board with interface.png differ diff --git a/diylc-regression-data/input/user-files/png/AllTube Schem.png b/diylc-regression-data/input/user-files/png/AllTube Schem.png index 1366d534a..8bdf767f8 100644 Binary files a/diylc-regression-data/input/user-files/png/AllTube Schem.png and b/diylc-regression-data/input/user-files/png/AllTube Schem.png differ diff --git a/diylc-regression-data/input/user-files/png/Blue 7.png b/diylc-regression-data/input/user-files/png/Blue 7.png index a150d781e..1e7a4e295 100644 Binary files a/diylc-regression-data/input/user-files/png/Blue 7.png and b/diylc-regression-data/input/user-files/png/Blue 7.png differ diff --git a/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png b/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png index 089e970fa..2ef0cc751 100644 Binary files a/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png and b/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png differ diff --git a/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png b/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png index d52bc042e..102798884 100644 Binary files a/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png and b/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png differ diff --git a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png index 44707f953..3459c1ea5 100644 Binary files a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png and b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png differ diff --git a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png index 8f96ed5a3..077696ed3 100644 Binary files a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png and b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png differ diff --git a/diylc-regression-data/input/user-files/png/Fender_Bassman_5F6_5F6A.png b/diylc-regression-data/input/user-files/png/Fender_Bassman_5F6_5F6A.png index 16bb74cf4..09b57c1d1 100644 Binary files a/diylc-regression-data/input/user-files/png/Fender_Bassman_5F6_5F6A.png and b/diylc-regression-data/input/user-files/png/Fender_Bassman_5F6_5F6A.png differ diff --git a/diylc-regression-data/input/user-files/png/Ibanez Balance-Master Mod.png b/diylc-regression-data/input/user-files/png/Ibanez Balance-Master Mod.png index 637af7f29..ad2560d76 100644 Binary files a/diylc-regression-data/input/user-files/png/Ibanez Balance-Master Mod.png and b/diylc-regression-data/input/user-files/png/Ibanez Balance-Master Mod.png differ diff --git a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png index 3587bda48..077f0ad60 100644 Binary files a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png and b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png differ diff --git a/diylc-regression-data/input/user-files/png/LargeBandMaster.png b/diylc-regression-data/input/user-files/png/LargeBandMaster.png index 3767fff2f..4caafb851 100644 Binary files a/diylc-regression-data/input/user-files/png/LargeBandMaster.png and b/diylc-regression-data/input/user-files/png/LargeBandMaster.png differ diff --git a/diylc-regression-data/input/user-files/png/Lectrolab schematic.png b/diylc-regression-data/input/user-files/png/Lectrolab schematic.png index cf6f97b48..d2c79cb5a 100644 Binary files a/diylc-regression-data/input/user-files/png/Lectrolab schematic.png and b/diylc-regression-data/input/user-files/png/Lectrolab schematic.png differ diff --git a/diylc-regression-data/input/user-files/png/PCF DI Cable Diagram.png b/diylc-regression-data/input/user-files/png/PCF DI Cable Diagram.png index 6d874b015..ddc1b70f7 100644 Binary files a/diylc-regression-data/input/user-files/png/PCF DI Cable Diagram.png and b/diylc-regression-data/input/user-files/png/PCF DI Cable Diagram.png differ diff --git a/diylc-regression-data/input/user-files/png/ProTremoVerb Schematic.png b/diylc-regression-data/input/user-files/png/ProTremoVerb Schematic.png index 174f892d7..fb57db4b3 100644 Binary files a/diylc-regression-data/input/user-files/png/ProTremoVerb Schematic.png and b/diylc-regression-data/input/user-files/png/ProTremoVerb Schematic.png differ diff --git a/diylc-regression-data/input/user-files/png/RAM board 2.png b/diylc-regression-data/input/user-files/png/RAM board 2.png index aaf20ebb9..9db1feff3 100644 Binary files a/diylc-regression-data/input/user-files/png/RAM board 2.png and b/diylc-regression-data/input/user-files/png/RAM board 2.png differ diff --git a/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png b/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png index 42919f452..9bb64d226 100644 Binary files a/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png and b/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png differ diff --git a/diylc-regression-data/input/user-files/png/Radio Amp Noval.png b/diylc-regression-data/input/user-files/png/Radio Amp Noval.png index 3d95deaac..3b353d87b 100644 Binary files a/diylc-regression-data/input/user-files/png/Radio Amp Noval.png and b/diylc-regression-data/input/user-files/png/Radio Amp Noval.png differ diff --git a/diylc-regression-data/input/user-files/png/Register board (LSB).png b/diylc-regression-data/input/user-files/png/Register board (LSB).png index b4fe637bd..9b593e9d5 100644 Binary files a/diylc-regression-data/input/user-files/png/Register board (LSB).png and b/diylc-regression-data/input/user-files/png/Register board (LSB).png differ diff --git a/diylc-regression-data/input/user-files/png/Rix 18 watt.png b/diylc-regression-data/input/user-files/png/Rix 18 watt.png index 5c55589a6..7e37be49d 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix 18 watt.png and b/diylc-regression-data/input/user-files/png/Rix 18 watt.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png b/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png index 005a46b61..6abc391cc 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png and b/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Baby Blue.png b/diylc-regression-data/input/user-files/png/Rix Baby Blue.png index 546cedb90..ca6f13253 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Baby Blue.png and b/diylc-regression-data/input/user-files/png/Rix Baby Blue.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Bassman.png b/diylc-regression-data/input/user-files/png/Rix Bassman.png index e20e30375..91d193564 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Bassman.png and b/diylc-regression-data/input/user-files/png/Rix Bassman.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix JD stout.png b/diylc-regression-data/input/user-files/png/Rix JD stout.png index b4bd8b36c..8c0b5084a 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix JD stout.png and b/diylc-regression-data/input/user-files/png/Rix JD stout.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Junior AB763.png b/diylc-regression-data/input/user-files/png/Rix Junior AB763.png index 084467167..2a8fad28e 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Junior AB763.png and b/diylc-regression-data/input/user-files/png/Rix Junior AB763.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Junior.png b/diylc-regression-data/input/user-files/png/Rix Junior.png index 218a0b886..35975b2a7 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Junior.png and b/diylc-regression-data/input/user-files/png/Rix Junior.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png b/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png index 15f5e2580..c1a50527f 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png and b/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png differ diff --git a/diylc-regression-data/input/user-files/png/Rix Pro Jr.png b/diylc-regression-data/input/user-files/png/Rix Pro Jr.png index 623a63a1e..aa213b6e0 100644 Binary files a/diylc-regression-data/input/user-files/png/Rix Pro Jr.png and b/diylc-regression-data/input/user-files/png/Rix Pro Jr.png differ diff --git a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png index 46bf2ed23..fde7ebbc6 100644 Binary files a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png and b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png differ diff --git a/diylc-regression-data/input/user-files/png/Stack Pointer board.png b/diylc-regression-data/input/user-files/png/Stack Pointer board.png index 8fec274b3..d206f1fdb 100644 Binary files a/diylc-regression-data/input/user-files/png/Stack Pointer board.png and b/diylc-regression-data/input/user-files/png/Stack Pointer board.png differ diff --git a/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png b/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png index 942763c4a..509c94ad7 100644 Binary files a/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png and b/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png differ diff --git a/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png b/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png index 2ab22c233..76f1f7dbe 100644 Binary files a/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png and b/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png differ diff --git a/diylc-regression-data/input/user-files/png/dist_layout.png b/diylc-regression-data/input/user-files/png/dist_layout.png index 9af11c1e1..ee513d0e7 100644 Binary files a/diylc-regression-data/input/user-files/png/dist_layout.png and b/diylc-regression-data/input/user-files/png/dist_layout.png differ diff --git a/diylc-regression-data/input/v1/netlist/12v_supply_excl_switches.txt b/diylc-regression-data/input/v1/netlist/12v_supply_excl_switches.txt index 1f08272d4..4b088a62f 100644 --- a/diylc-regression-data/input/v1/netlist/12v_supply_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/12v_supply_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D3.2 <-> D4.2 <-> IC1.1 - C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> D5.2 - C2.1 <-> D6.2 - D1.2 <-> D3.1 - D2.2 <-> D4.1 - D5.1 <-> IC1.2 - D6.1 <-> IC1.3 + C1.+ <-> D3.K <-> D4.K <-> IC1.1 + C1.- <-> C2.- <-> D1.A <-> D2.A <-> D5.K + C2.+ <-> D6.K + D1.K <-> D3.A + D2.K <-> D4.A + D5.A <-> IC1.2 + D6.A <-> IC1.3 diff --git a/diylc-regression-data/input/v1/netlist/12v_supply_incl_switches.txt b/diylc-regression-data/input/v1/netlist/12v_supply_incl_switches.txt index 1f08272d4..4b088a62f 100644 --- a/diylc-regression-data/input/v1/netlist/12v_supply_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/12v_supply_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D3.2 <-> D4.2 <-> IC1.1 - C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> D5.2 - C2.1 <-> D6.2 - D1.2 <-> D3.1 - D2.2 <-> D4.1 - D5.1 <-> IC1.2 - D6.1 <-> IC1.3 + C1.+ <-> D3.K <-> D4.K <-> IC1.1 + C1.- <-> C2.- <-> D1.A <-> D2.A <-> D5.K + C2.+ <-> D6.K + D1.K <-> D3.A + D2.K <-> D4.A + D5.A <-> IC1.2 + D6.A <-> IC1.3 diff --git a/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_excl_switches.txt index db132baec..1eb4e3ed3 100644 --- a/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 <-> R8.1 + C3.+ <-> R2.2 <-> R3.1 <-> R8.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 <-> R8.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_incl_switches.txt index db132baec..1eb4e3ed3 100644 --- a/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1976_distortion+_pcb_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 <-> R8.1 + C3.+ <-> R2.2 <-> R3.1 <-> R8.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 <-> R8.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_excl_switches.txt index 00a7125f1..d6b8159e8 100644 --- a/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 + C3.+ <-> R2.2 <-> R3.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_incl_switches.txt index 00a7125f1..d6b8159e8 100644 --- a/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1976_distortion+_perf_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C3.2 <-> C7.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R1.2 <-> R3.2 + C1.2 <-> C3.- <-> C7.1 <-> D2.K <-> D3.A <-> IC1.4 <-> R1.2 <-> R3.2 C2.2 <-> R4.1 - C3.1 <-> R2.2 <-> R3.1 + C3.+ <-> R2.2 <-> R3.1 C4.1 <-> C5.1 <-> IC1.2 <-> R5.1 - C4.2 <-> C6.1 <-> IC1.7 <-> R5.2 + C4.2 <-> C6.+ <-> IC1.7 <-> R5.2 C5.2 <-> R6.1 - C6.2 <-> R7.1 - C7.2 <-> D1.1 <-> D3.2 <-> R7.2 - D1.2 <-> D2.1 + C6.- <-> R7.1 + C7.2 <-> D1.A <-> D3.K <-> R7.2 + D1.K <-> D2.A IC1.3 <-> R4.2 IC1.6 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/1977_od_250_excl_switches.txt b/diylc-regression-data/input/v1/netlist/1977_od_250_excl_switches.txt index 60e165771..11cb0a816 100644 --- a/diylc-regression-data/input/v1/netlist/1977_od_250_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1977_od_250_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C6.1 C1.2 <-> R1.1 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 - C5.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 + C5.2 <-> C6.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 R2.1 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/1977_od_250_incl_switches.txt b/diylc-regression-data/input/v1/netlist/1977_od_250_incl_switches.txt index 60e165771..11cb0a816 100644 --- a/diylc-regression-data/input/v1/netlist/1977_od_250_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/1977_od_250_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C6.1 C1.2 <-> R1.1 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 - C5.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 + C5.2 <-> C6.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 R2.1 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt index 19e2c3bdd..fb118e80e 100644 --- a/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R2.2 <-> R3.2 - C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2 + C1.- <-> R1.1 + C2.+ <-> R2.2 + C2.- <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2 C5.1 <-> R3.1 C5.2 <-> R4.1 + R2.1 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt index 19e2c3bdd..fb118e80e 100644 --- a/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R2.2 <-> R3.2 - C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2 + C1.- <-> R1.1 + C2.+ <-> R2.2 + C2.- <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2 C5.1 <-> R3.1 C5.2 <-> R4.1 + R2.1 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/3_legged_dog_excl_switches.txt b/diylc-regression-data/input/v1/netlist/3_legged_dog_excl_switches.txt index 69d7744fb..16b780108 100644 --- a/diylc-regression-data/input/v1/netlist/3_legged_dog_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_legged_dog_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> IC1.4 <-> R3.1 @@ -6,10 +6,10 @@ Switch setup: [Default] C2.2 <-> IC1.6 C3.1 <-> IC1.7 <-> R5.1 C3.2 <-> Q1.1 <-> Q1.2 <-> R6.2 - C4.1 <-> Q1.3 <-> R8.1 - C4.2 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R4.1 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.1 - C5.1 <-> IC1.2 <-> R1.1 - C5.2 <-> R9.2 + C4.+ <-> Q1.3 <-> R8.1 + C4.- <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R4.1 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.1 + C5.+ <-> IC1.2 <-> R1.1 + C5.- <-> R9.2 IC1.1 <-> R6.1 IC1.3 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/3_legged_dog_incl_switches.txt b/diylc-regression-data/input/v1/netlist/3_legged_dog_incl_switches.txt index 69d7744fb..16b780108 100644 --- a/diylc-regression-data/input/v1/netlist/3_legged_dog_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_legged_dog_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> IC1.4 <-> R3.1 @@ -6,10 +6,10 @@ Switch setup: [Default] C2.2 <-> IC1.6 C3.1 <-> IC1.7 <-> R5.1 C3.2 <-> Q1.1 <-> Q1.2 <-> R6.2 - C4.1 <-> Q1.3 <-> R8.1 - C4.2 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R4.1 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.1 - C5.1 <-> IC1.2 <-> R1.1 - C5.2 <-> R9.2 + C4.+ <-> Q1.3 <-> R8.1 + C4.- <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R4.1 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.1 + C5.+ <-> IC1.2 <-> R1.1 + C5.- <-> R9.2 IC1.1 <-> R6.1 IC1.3 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_excl_switches.txt index df87d0a8d..2fb3c01ba 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.1 <-> Tone.1 + C1.1 <-> R2.1 <-> Tone.3 C1.2 <-> R1.2 - C2.1 <-> R1.1 <-> Tone.3 + C2.1 <-> R1.1 <-> Tone.1 C2.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_incl_switches.txt index df87d0a8d..2fb3c01ba 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_big_muff_tone_stack_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.1 <-> Tone.1 + C1.1 <-> R2.1 <-> Tone.3 C1.2 <-> R1.2 - C2.1 <-> R1.1 <-> Tone.3 + C2.1 <-> R1.1 <-> Tone.1 C2.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_excl_switches.txt index 2ce045e06..63a407137 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> C1.1 <-> Treb.3 - Bass.3 <-> C3.2 <-> Mid.1 <-> Mid.2 + Bass.1 <-> C3.2 <-> Mid.2 <-> Mid.3 + Bass.2 <-> Bass.3 <-> C1.1 <-> Treb.1 C1.2 <-> C3.1 <-> R1.1 - C2.1 <-> Treb.1 + C2.1 <-> Treb.3 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_incl_switches.txt index 2ce045e06..63a407137 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_fender_tone_stack_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> Bass.2 <-> C1.1 <-> Treb.3 - Bass.3 <-> C3.2 <-> Mid.1 <-> Mid.2 + Bass.1 <-> C3.2 <-> Mid.2 <-> Mid.3 + Bass.2 <-> Bass.3 <-> C1.1 <-> Treb.1 C1.2 <-> C3.1 <-> R1.1 - C2.1 <-> Treb.1 + C2.1 <-> Treb.3 C2.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_excl_switches.txt index 2a838090e..a0ec9f7af 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - bass.1 <-> bass.2 <-> C1.1 <-> Treb.3 - bass.3 <-> Mid.1 + bass.1 <-> Mid.3 + bass.2 <-> bass.3 <-> C1.1 <-> Treb.1 C1.2 <-> C3.2 <-> R1.1 - C2.1 <-> Treb.1 + C2.1 <-> Treb.3 C2.2 <-> R1.2 C3.1 <-> Mid.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_incl_switches.txt index 2a838090e..a0ec9f7af 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_marshall_tone_stack_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - bass.1 <-> bass.2 <-> C1.1 <-> Treb.3 - bass.3 <-> Mid.1 + bass.1 <-> Mid.3 + bass.2 <-> bass.3 <-> C1.1 <-> Treb.1 C1.2 <-> C3.2 <-> R1.1 - C2.1 <-> Treb.1 + C2.1 <-> Treb.3 C2.2 <-> R1.2 C3.1 <-> Mid.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_excl_switches.txt index 2c61919a8..fe030932c 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> R2.2 + Bass.1 <-> C2.2 <-> Treb.1 Bass.2 <-> C3.2 <-> R2.1 - Bass.3 <-> C2.2 <-> Treb.3 + Bass.3 <-> R2.2 C1.1 <-> R1.1 - C1.2 <-> Treb.1 + C1.2 <-> Treb.3 C2.1 <-> C3.1 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_incl_switches.txt index 2c61919a8..fe030932c 100644 --- a/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/3_wire_vox_tone_stack_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Bass.1 <-> R2.2 + Bass.1 <-> C2.2 <-> Treb.1 Bass.2 <-> C3.2 <-> R2.1 - Bass.3 <-> C2.2 <-> Treb.3 + Bass.3 <-> R2.2 C1.1 <-> R1.1 - C1.2 <-> Treb.1 + C1.2 <-> Treb.3 C2.1 <-> C3.1 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt index 81f67ae2a..00aacc0a1 100644 --- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 - C1.2 <-> P2.2 - C2.1 <-> Q1.3 <-> R2.2 - C2.2 <-> RP.1 <-> S1.4 + C1.+ <-> P1.2 <-> P2.1 <-> P3.1 <-> R1.1 + C1.- <-> P2.2 + C2.+ <-> Q1.3 <-> R2.2 + C2.- <-> RP.1 <-> S1.4 C3.1 <-> R1.2 <-> R2.1 C3.2 <-> Q2.2 <-> Q2.3 <-> R3.1 - C4.1 <-> R5.2 <-> S1.1 - 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 - P5.1 <-> R6.1 + C4.+ <-> R5.2 <-> S1.1 + C4.- <-> P5.2 + D1.A <-> R LED Current.2 + D1.K <-> S1.8 + P1.3 <-> R LED Current.1 + P2.3 <-> P3.3 + P4.1 <-> P4.2 <-> R4.1 + P4.3 <-> P5.1 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 <-> S1.7 + P5.3 <-> R6.1 Q2.1 <-> Q3.3 <-> R4.2 Q3.1 <-> Q3.2 <-> R3.2 S1.3 <-> S1.6 diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt index 4645324c3..02b353dc3 100644 --- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt @@ -1,38 +1,38 @@ -Switch setup: [S1.ON1] +Switch setup: [ S1.ON1 ] - C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 - C1.2 <-> P2.2 - C2.1 <-> Q1.3 <-> R2.2 - C2.2 <-> RP.1 + C1.+ <-> P1.2 <-> P2.1 <-> P3.1 <-> R1.1 + C1.- <-> P2.2 + C2.+ <-> Q1.3 <-> R2.2 + C2.- <-> RP.1 C3.1 <-> R1.2 <-> R2.1 C3.2 <-> Q2.2 <-> Q2.3 <-> R3.1 - C4.1 <-> R5.2 - 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 + C4.+ <-> R5.2 + C4.- <-> P5.2 + D1.A <-> R LED Current.2 + D1.K <-> P4.3 <-> P5.1 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 + P1.3 <-> R LED Current.1 + P2.3 <-> P3.3 + P4.1 <-> P4.2 <-> R4.1 + P5.3 <-> R6.1 Q2.1 <-> Q3.3 <-> R4.2 Q3.1 <-> Q3.2 <-> R3.2 -Switch setup: [S1.ON2] +Switch setup: [ S1.ON2 ] - C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 - C1.2 <-> P2.2 - C2.1 <-> Q1.3 <-> R2.2 - C2.2 <-> RP.1 + C1.+ <-> P1.2 <-> P2.1 <-> P3.1 <-> R1.1 + C1.- <-> P2.2 + C2.+ <-> Q1.3 <-> R2.2 + C2.- <-> RP.1 C3.1 <-> R1.2 <-> R2.1 C3.2 <-> Q2.2 <-> Q2.3 <-> R3.1 - 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 - P5.1 <-> R6.1 + C4.+ <-> R5.2 + C4.- <-> P5.2 + D1.A <-> R LED Current.2 + P1.3 <-> R LED Current.1 + P2.3 <-> P3.3 + P4.1 <-> P4.2 <-> R4.1 + P4.3 <-> P5.1 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 + P5.3 <-> R6.1 Q2.1 <-> Q3.3 <-> R4.2 Q3.1 <-> Q3.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/9V_supply_regulated_excl_switches.txt b/diylc-regression-data/input/v1/netlist/9V_supply_regulated_excl_switches.txt index 55a8cafe0..d6a0f487a 100644 --- a/diylc-regression-data/input/v1/netlist/9V_supply_regulated_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/9V_supply_regulated_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> D1.2 <-> D3.2 <-> D5.2 <-> Q1.1 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> D2.1 <-> D4.1 <-> Q1.3 - C3.2 <-> C4.1 <-> D5.1 <-> R1.1 - C5.1 <-> Q2.3 <-> R1.2 - C6.1 <-> Q2.1 - D1.1 <-> D2.2 - D3.1 <-> D4.2 + C1.+ <-> C2.2 <-> D1.K <-> D3.K <-> D5.K <-> Q1.1 + C1.- <-> C2.1 <-> C3.1 <-> C4.- <-> C5.- <-> C6.- <-> D2.A <-> D4.A <-> Q1.3 + C3.2 <-> C4.+ <-> D5.A <-> R1.1 + C5.+ <-> Q2.3 <-> R1.2 + C6.+ <-> Q2.1 + D1.A <-> D2.K + D3.A <-> D4.K diff --git a/diylc-regression-data/input/v1/netlist/9V_supply_regulated_incl_switches.txt b/diylc-regression-data/input/v1/netlist/9V_supply_regulated_incl_switches.txt index 55a8cafe0..d6a0f487a 100644 --- a/diylc-regression-data/input/v1/netlist/9V_supply_regulated_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/9V_supply_regulated_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> D1.2 <-> D3.2 <-> D5.2 <-> Q1.1 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> D2.1 <-> D4.1 <-> Q1.3 - C3.2 <-> C4.1 <-> D5.1 <-> R1.1 - C5.1 <-> Q2.3 <-> R1.2 - C6.1 <-> Q2.1 - D1.1 <-> D2.2 - D3.1 <-> D4.2 + C1.+ <-> C2.2 <-> D1.K <-> D3.K <-> D5.K <-> Q1.1 + C1.- <-> C2.1 <-> C3.1 <-> C4.- <-> C5.- <-> C6.- <-> D2.A <-> D4.A <-> Q1.3 + C3.2 <-> C4.+ <-> D5.A <-> R1.1 + C5.+ <-> Q2.3 <-> R1.2 + C6.+ <-> Q2.1 + D1.A <-> D2.K + D3.A <-> D4.K diff --git a/diylc-regression-data/input/v1/netlist/9v_di_box_excl_switches.txt b/diylc-regression-data/input/v1/netlist/9v_di_box_excl_switches.txt index 5ed6b5cae..3f4fd13b7 100644 --- a/diylc-regression-data/input/v1/netlist/9v_di_box_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/9v_di_box_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> IC1.8 <-> R2.1 C2.1 <-> R2.2 <-> R3.2 <-> R4.1 - C2.2 <-> C5.1 <-> C7.2 <-> C8.2 <-> IC1.4 <-> R1.2 <-> R7.2 <-> R8.2 - C3.1 <-> R5.2 <-> R6.2 - C3.2 <-> C4.2 - C4.1 <-> R7.1 - C5.2 <-> C6.2 - C6.1 <-> R8.1 - C7.1 <-> C8.1 <-> IC1.5 <-> R4.2 + C2.2 <-> C5.+ <-> C7.- <-> C8.2 <-> IC1.4 <-> R1.2 <-> R7.2 <-> R8.2 + C3.+ <-> R5.2 <-> R6.2 + C3.- <-> C4.- + C4.+ <-> R7.1 + C5.- <-> C6.- + C6.+ <-> R8.1 + C7.+ <-> C8.1 <-> IC1.5 <-> R4.2 IC1.1 <-> IC1.2 <-> R6.1 IC1.6 <-> IC1.7 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/9v_di_box_incl_switches.txt b/diylc-regression-data/input/v1/netlist/9v_di_box_incl_switches.txt index 5ed6b5cae..3f4fd13b7 100644 --- a/diylc-regression-data/input/v1/netlist/9v_di_box_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/9v_di_box_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> IC1.8 <-> R2.1 C2.1 <-> R2.2 <-> R3.2 <-> R4.1 - C2.2 <-> C5.1 <-> C7.2 <-> C8.2 <-> IC1.4 <-> R1.2 <-> R7.2 <-> R8.2 - C3.1 <-> R5.2 <-> R6.2 - C3.2 <-> C4.2 - C4.1 <-> R7.1 - C5.2 <-> C6.2 - C6.1 <-> R8.1 - C7.1 <-> C8.1 <-> IC1.5 <-> R4.2 + C2.2 <-> C5.+ <-> C7.- <-> C8.2 <-> IC1.4 <-> R1.2 <-> R7.2 <-> R8.2 + C3.+ <-> R5.2 <-> R6.2 + C3.- <-> C4.- + C4.+ <-> R7.1 + C5.- <-> C6.- + C6.+ <-> R8.1 + C7.+ <-> C8.1 <-> IC1.5 <-> R4.2 IC1.1 <-> IC1.2 <-> R6.1 IC1.6 <-> IC1.7 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_excl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_incl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_excl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_incl_switches.txt index 0aa36dbf6..bd6f5311c 100644 --- a/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/alembic_stratoblaster_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> R3.1 <-> R4.1 - C2.1 <-> Q1.1 <-> R2.1 - C2.2 <-> R4.2 + C1.- <-> R3.1 <-> R4.1 + C2.+ <-> Q1.1 <-> R2.1 + C2.- <-> R4.2 Q1.2 <-> Q1.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt index a1ec9208c..7ac4f6e2b 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C2.2 <-> C3.1 <-> Q1.1 + C4.+ <-> R4.1 + C4.- <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2 Q2.1 <-> R2.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt index a1ec9208c..7ac4f6e2b 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C2.2 <-> C3.1 <-> Q1.1 + C4.+ <-> R4.1 + C4.- <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2 Q2.1 <-> R2.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_excl_switches.txt index bd4e9c1fa..7b90e137f 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.2 <-> R1.1 - C2.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R4.2 - C3.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C4.1 <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 - C4.2 <-> R3.2 <-> R4.1 + C2.1 <-> C3.- <-> R1.2 <-> R2.2 <-> R4.2 + C3.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 + C4.- <-> R3.2 <-> R4.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_incl_switches.txt index bd4e9c1fa..7b90e137f 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb2_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.2 <-> R1.1 - C2.1 <-> C3.2 <-> R1.2 <-> R2.2 <-> R4.2 - C3.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C4.1 <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 - C4.2 <-> R3.2 <-> R4.1 + C2.1 <-> C3.- <-> R1.2 <-> R2.2 <-> R4.2 + C3.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> C5.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 + C4.- <-> R3.2 <-> R4.1 Q2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_excl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_incl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_pcb_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_excl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_incl_switches.txt index 7347b2766..7b936e477 100644 --- a/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_perf_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> Q1.3 <-> Q2.1 - C1.2 <-> R1.2 <-> R2.2 - C2.1 <-> D1.1 <-> R2.1 <-> R3.2 <-> R4.1 + C1.+ <-> C3.1 <-> Q1.3 <-> Q2.1 + C1.- <-> R1.2 <-> R2.2 + C2.1 <-> D1.A <-> R2.1 <-> R3.2 <-> R4.1 C2.2 <-> Q2.2 <-> Q2.3 <-> R4.2 - D1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 + D1.K <-> Q1.1 <-> Q1.2 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt index b92750424..c2295b8d1 100644 --- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C4.1 <-> D1.1 <-> R5.1 - C5.1 <-> R1.2 <-> R3.1 <-> R4.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.2 <-> C5.- <-> R4.2 <-> R5.2 + C3.1 <-> Q1.1 <-> R2.1 + C4.+ <-> D1.A <-> R5.1 + C5.+ <-> R1.2 <-> R3.1 <-> R4.1 R2.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt index b92750424..c2295b8d1 100644 --- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C4.1 <-> D1.1 <-> R5.1 - C5.1 <-> R1.2 <-> R3.1 <-> R4.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.2 <-> C5.- <-> R4.2 <-> R5.2 + C3.1 <-> Q1.1 <-> R2.1 + C4.+ <-> D1.A <-> R5.1 + C5.+ <-> R1.2 <-> R3.1 <-> R4.1 R2.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_excl_switches.txt index 08e994543..c40ff9036 100644 --- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 - C1.2 <-> C2.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> C3.2 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 - C4.1 <-> D1.1 <-> R5.1 + C1.2 <-> C2.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.1 <-> C3.- <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 + C4.+ <-> D1.A <-> R5.1 C5.1 <-> Q1.1 <-> R4.1 R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_incl_switches.txt index 08e994543..c40ff9036 100644 --- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_with_bias_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 - C1.2 <-> C2.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> C3.2 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 - C4.1 <-> D1.1 <-> R5.1 + C1.2 <-> C2.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.1 <-> C3.- <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 <-> VR1.1 + C4.+ <-> D1.A <-> R5.1 C5.1 <-> Q1.1 <-> R4.1 R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_excl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_incl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_muffer_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_muffer_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_muffer_perf_excl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/v1/netlist/amz_muffer_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_muffer_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/amz_muffer_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_muffer_perf_incl_switches.txt index 402d65bd8..4811ccc32 100644 --- a/diylc-regression-data/input/v1/netlist/amz_muffer_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/amz_muffer_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> R2.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C2.2 <-> R5.1 + C1.+ <-> C3.+ <-> R1.2 <-> R2.2 + C1.- <-> D1.K <-> D2.A + C2.+ <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 <-> R3.1 + C2.- <-> R5.1 Q1.1 <-> Q1.2 <-> R4.2 R3.2 <-> R4.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt index af1a62267..216cb5d37 100644 --- a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> D1.A <-> D1.K <-> Q1.3 <-> R2.2 <-> R3.1 + C1.2 <-> R1.2 + C2.+ <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3 C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2 C3.2 <-> VR2.1 - R6.1 <-> VR2.2 + Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1 + Q2.3 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt index af1a62267..216cb5d37 100644 --- a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> D1.A <-> D1.K <-> Q1.3 <-> R2.2 <-> R3.1 + C1.2 <-> R1.2 + C2.+ <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3 C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2 C3.2 <-> VR2.1 - R6.1 <-> VR2.2 + Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1 + Q2.3 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt index 82dde9208..7fadb117f 100644 --- a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt @@ -1,6 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1 + C1.2 <-> C2.1 <-> IC1.7 <-> P3.3 <-> R3.2 + C2.2 <-> IC1.10 <-> IC1.9 <-> P2.1 + C3.+ <-> IC1.13 + C3.- <-> R2.2 + IC1.1 <-> P1.1 <-> R1.2 + IC1.12 <-> IC1.8 <-> P1.2 <-> P1.3 <-> P2.2 <-> P2.3 + IC1.14 <-> IC1.5 + P3.1 <-> R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt index 82dde9208..7fadb117f 100644 --- a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt @@ -1,6 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1 + C1.2 <-> C2.1 <-> IC1.7 <-> P3.3 <-> R3.2 + C2.2 <-> IC1.10 <-> IC1.9 <-> P2.1 + C3.+ <-> IC1.13 + C3.- <-> R2.2 + IC1.1 <-> P1.1 <-> R1.2 + IC1.12 <-> IC1.8 <-> P1.2 <-> P1.3 <-> P2.2 <-> P2.3 + IC1.14 <-> IC1.5 + P3.1 <-> R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_excl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_excl_switches.txt index 731f87245..223159f68 100644 --- a/diylc-regression-data/input/v1/netlist/atari_punk_console_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 <-> IC1.7 <-> R1.1 C1.2 <-> C2.1 <-> IC1.1 <-> IC2.1 <-> R2.1 C2.2 <-> IC2.6 <-> IC2.7 - C3.2 <-> R3.1 + C3.- <-> R3.1 IC1.3 <-> IC2.2 IC1.4 <-> IC1.5 <-> IC2.4 IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_incl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_incl_switches.txt index 731f87245..223159f68 100644 --- a/diylc-regression-data/input/v1/netlist/atari_punk_console_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 <-> IC1.7 <-> R1.1 C1.2 <-> C2.1 <-> IC1.1 <-> IC2.1 <-> R2.1 C2.2 <-> IC2.6 <-> IC2.7 - C3.2 <-> R3.1 + C3.- <-> R3.1 IC1.3 <-> IC2.2 IC1.4 <-> IC1.5 <-> IC2.4 IC1.6 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/aussie_comp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_comp_excl_switches.txt index 2541af873..2b0294f3d 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_comp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_comp_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> Q1.1 - C2.1 <-> IC1.1 - C2.2 <-> R2.2 + C2.+ <-> IC1.1 + C2.- <-> R2.2 C3.1 <-> IC1.8 - C4.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 - C4.2 <-> C5.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 - C5.1 <-> D2.2 <-> IC1.7 + C4.+ <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 + C4.- <-> C5.- <-> D2.A <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 + C5.+ <-> D2.K <-> IC1.7 IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/aussie_comp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_comp_incl_switches.txt index 2541af873..2b0294f3d 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_comp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_comp_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> Q1.1 - C2.1 <-> IC1.1 - C2.2 <-> R2.2 + C2.+ <-> IC1.1 + C2.- <-> R2.2 C3.1 <-> IC1.8 - C4.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 - C4.2 <-> C5.2 <-> D2.1 <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 - C5.1 <-> D2.2 <-> IC1.7 + C4.+ <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.1 + C4.- <-> C5.- <-> D2.A <-> IC1.2 <-> IC1.4 <-> R1.1 <-> R3.2 + C5.+ <-> D2.K <-> IC1.7 IC1.5 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_excl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_incl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_mart_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/aussie_mart_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_mart_perf_excl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_mart_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_mart_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/aussie_mart_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/aussie_mart_perf_incl_switches.txt index cd847df2d..7d286a4c1 100644 --- a/diylc-regression-data/input/v1/netlist/aussie_mart_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/aussie_mart_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.2 - C1.2 <-> IC1.3 <-> Q1.1 <-> Q1.2 - C2.1 <-> D1.2 <-> Q1.3 - C2.2 <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 + C1.+ <-> R2.2 + C1.- <-> IC1.3 <-> Q1.1 <-> Q1.2 + C2.+ <-> D1.K <-> Q1.3 + C2.- <-> C3.2 <-> C4.2 <-> IC1.2 <-> IC1.4 <-> R1.1 C3.1 <-> IC1.6 C4.1 <-> IC1.7 C5.2 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/austin_gold_excl_switches.txt b/diylc-regression-data/input/v1/netlist/austin_gold_excl_switches.txt index ef9cca21c..4a0e37e7f 100644 --- a/diylc-regression-data/input/v1/netlist/austin_gold_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/austin_gold_excl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> D1.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> R1.1 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C9.2 <-> D1.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 - C10.1 <-> C8.1 <-> D4.1 <-> D7.2 <-> IC1.6 - C11.1 <-> IC2.1 <-> IC2.2 - C11.2 <-> R7.2 <-> R8.1 - C12.1 <-> R8.2 <-> R9.2 - C12.2 <-> R10.1 - C4.1 <-> IC2.8 <-> R1.2 <-> R2.2 + C1.+ <-> C2.1 <-> C3.1 <-> D1.K <-> D2.K <-> IC1.5 <-> IC2.5 <-> R1.1 + C1.- <-> C2.2 <-> C3.2 <-> C4.- <-> C9.- <-> D1.A <-> D3.A <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 + C10.+ <-> C8.1 <-> D4.A <-> D7.K <-> IC1.6 + C11.+ <-> IC2.1 <-> IC2.2 + C11.- <-> R7.2 <-> R8.1 + C12.+ <-> R8.2 <-> R9.2 + C12.- <-> R10.1 + C4.+ <-> IC2.8 <-> R1.2 <-> R2.2 C5.1 <-> R3.1 <-> R4.1 - C6.1 <-> D2.1 <-> D3.2 <-> IC1.3 <-> R4.2 + C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2 C6.2 <-> IC2.6 <-> IC2.7 <-> R3.2 <-> R5.2 <-> R7.1 <-> R9.1 C7.1 <-> IC1.1 <-> IC1.2 C7.2 <-> IC1.8 - C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1 - C9.1 <-> R6.2 - D4.2 <-> D5.1 - D6.2 <-> D7.1 + C8.2 <-> D5.K <-> D6.A <-> IC1.7 <-> R6.1 + C9.+ <-> R6.2 + D4.K <-> D5.A + D6.K <-> D7.A diff --git a/diylc-regression-data/input/v1/netlist/austin_gold_incl_switches.txt b/diylc-regression-data/input/v1/netlist/austin_gold_incl_switches.txt index ef9cca21c..4a0e37e7f 100644 --- a/diylc-regression-data/input/v1/netlist/austin_gold_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/austin_gold_incl_switches.txt @@ -1,20 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C3.1 <-> D1.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> R1.1 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C9.2 <-> D1.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 - C10.1 <-> C8.1 <-> D4.1 <-> D7.2 <-> IC1.6 - C11.1 <-> IC2.1 <-> IC2.2 - C11.2 <-> R7.2 <-> R8.1 - C12.1 <-> R8.2 <-> R9.2 - C12.2 <-> R10.1 - C4.1 <-> IC2.8 <-> R1.2 <-> R2.2 + C1.+ <-> C2.1 <-> C3.1 <-> D1.K <-> D2.K <-> IC1.5 <-> IC2.5 <-> R1.1 + C1.- <-> C2.2 <-> C3.2 <-> C4.- <-> C9.- <-> D1.A <-> D3.A <-> IC1.4 <-> IC2.4 <-> R10.2 <-> R2.1 + C10.+ <-> C8.1 <-> D4.A <-> D7.K <-> IC1.6 + C11.+ <-> IC2.1 <-> IC2.2 + C11.- <-> R7.2 <-> R8.1 + C12.+ <-> R8.2 <-> R9.2 + C12.- <-> R10.1 + C4.+ <-> IC2.8 <-> R1.2 <-> R2.2 C5.1 <-> R3.1 <-> R4.1 - C6.1 <-> D2.1 <-> D3.2 <-> IC1.3 <-> R4.2 + C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2 C6.2 <-> IC2.6 <-> IC2.7 <-> R3.2 <-> R5.2 <-> R7.1 <-> R9.1 C7.1 <-> IC1.1 <-> IC1.2 C7.2 <-> IC1.8 - C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1 - C9.1 <-> R6.2 - D4.2 <-> D5.1 - D6.2 <-> D7.1 + C8.2 <-> D5.K <-> D6.A <-> IC1.7 <-> R6.1 + C9.+ <-> R6.2 + D4.K <-> D5.A + D6.K <-> D7.A diff --git a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt index 6acf01dfc..a9aa338da 100644 --- a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> C4.2 <-> D1.K <-> R3.1 <-> R4.1 + C2.- <-> C6.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.2 + C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2 + C3.2 <-> Q2.1 <-> R3.2 C4.1 <-> C5.1 <-> R4.2 <-> VR1.3 - R1.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt index 6acf01dfc..a9aa338da 100644 --- a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> C4.2 <-> D1.K <-> R3.1 <-> R4.1 + C2.- <-> C6.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.2 + C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2 + C3.2 <-> Q2.1 <-> R3.2 C4.1 <-> C5.1 <-> R4.2 <-> VR1.3 - R1.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/b_blender_excl_switches.txt b/diylc-regression-data/input/v1/netlist/b_blender_excl_switches.txt index c5fc919d0..406082335 100644 --- a/diylc-regression-data/input/v1/netlist/b_blender_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/b_blender_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1k.1 <-> LED.1 + 1k.1 <-> LED.A 1k.2 <-> 3PDT.5 3PDT.1 <-> C1.1 3PDT.3 <-> 3PDT.9 3PDT.4 <-> IC1.5 <-> IC2.5 <-> R2.1 3PDT.7 <-> Volume.2 - Blend.1 <-> C8.1 + Blend.1 <-> C3.+ <-> C6.1 Blend.2 <-> C5.2 - Blend.3 <-> C3.1 <-> C6.1 + Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 - C2.1 <-> IC2.4 <-> LED.2 <-> R3.1 <-> R4.2 <-> Volume.3 - C2.2 <-> C3.2 <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 - C4.1 <-> R4.1 - C4.2 <-> IC2.1 <-> IC2.2 + C2.+ <-> IC2.4 <-> LED.K <-> R3.1 <-> R4.2 <-> Volume.1 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 + C4.+ <-> R4.1 + C4.- <-> IC2.1 <-> IC2.2 C6.2 <-> IC2.8 <-> R6.1 - C7.1 <-> Volume.1 - C7.2 <-> IC1.6 <-> IC1.7 - C8.2 <-> IC2.6 <-> IC2.7 + C7.+ <-> Volume.3 + C7.- <-> IC1.6 <-> IC1.7 + C8.- <-> IC2.6 <-> IC2.7 diff --git a/diylc-regression-data/input/v1/netlist/b_blender_incl_switches.txt b/diylc-regression-data/input/v1/netlist/b_blender_incl_switches.txt index 2b1da0321..e712e0dc8 100644 --- a/diylc-regression-data/input/v1/netlist/b_blender_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/b_blender_incl_switches.txt @@ -1,34 +1,34 @@ -Switch setup: [3PDT.ON1] +Switch setup: [ 3PDT.ON1 ] - 1k.1 <-> LED.1 + 1k.1 <-> LED.A 1k.2 <-> IC1.5 <-> IC2.5 <-> R2.1 - Blend.1 <-> C8.1 + Blend.1 <-> C3.+ <-> C6.1 Blend.2 <-> C5.2 - Blend.3 <-> C3.1 <-> C6.1 + Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 - C2.1 <-> IC2.4 <-> LED.2 <-> R3.1 <-> R4.2 <-> Volume.3 - C2.2 <-> C3.2 <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 - C4.1 <-> R4.1 - C4.2 <-> IC2.1 <-> IC2.2 + C2.+ <-> IC2.4 <-> LED.K <-> R3.1 <-> R4.2 <-> Volume.1 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 + C4.+ <-> R4.1 + C4.- <-> IC2.1 <-> IC2.2 C6.2 <-> IC2.8 <-> R6.1 - C7.1 <-> Volume.1 - C7.2 <-> IC1.6 <-> IC1.7 - C8.2 <-> IC2.6 <-> IC2.7 + C7.+ <-> Volume.3 + C7.- <-> IC1.6 <-> IC1.7 + C8.- <-> IC2.6 <-> IC2.7 -Switch setup: [3PDT.ON2] +Switch setup: [ 3PDT.ON2 ] - 1k.1 <-> LED.1 - Blend.1 <-> C8.1 + 1k.1 <-> LED.A + Blend.1 <-> C3.+ <-> C6.1 Blend.2 <-> C5.2 - Blend.3 <-> C3.1 <-> C6.1 + Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 - C2.1 <-> IC2.4 <-> LED.2 <-> R3.1 <-> R4.2 <-> Volume.3 - C2.2 <-> C3.2 <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 - C4.1 <-> R4.1 - C4.2 <-> IC2.1 <-> IC2.2 + C2.+ <-> IC2.4 <-> LED.K <-> R3.1 <-> R4.2 <-> Volume.1 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2 <-> R5.1 <-> R5.2 <-> R6.2 + C4.+ <-> R4.1 + C4.- <-> IC2.1 <-> IC2.2 C6.2 <-> IC2.8 <-> R6.1 - C7.1 <-> Volume.1 - C7.2 <-> IC1.6 <-> IC1.7 - C8.2 <-> IC2.6 <-> IC2.7 + C7.+ <-> Volume.3 + C7.- <-> IC1.6 <-> IC1.7 + C8.- <-> IC2.6 <-> IC2.7 IC1.5 <-> IC2.5 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_excl_switches.txt index dbba248da..02827d11a 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K Q1.1 <-> Q1.2 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_incl_switches.txt index dbba248da..02827d11a 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuss_pcb_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K Q1.1 <-> Q1.2 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_excl_switches.txt index dbba248da..02827d11a 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K Q1.1 <-> Q1.2 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_incl_switches.txt index dbba248da..02827d11a 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuss_perf_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> D4.1 <-> Q1.3 - C2.2 <-> D3.1 <-> D4.2 <-> R2.1 - C3.1 <-> R2.2 - C3.2 <-> R1.2 - D1.1 <-> D2.2 - D2.1 <-> D3.2 + C1.2 <-> D1.K <-> D4.A <-> Q1.3 + C2.2 <-> D3.A <-> D4.K <-> R2.1 + C3.+ <-> R2.2 + C3.- <-> R1.2 + D1.A <-> D2.K + D2.A <-> D3.K Q1.1 <-> Q1.2 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt index b91a92c8f..bc3c8fd16 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.3 - C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1 + C1.+ <-> D1.K <-> Q1.3 + C1.- <-> R2.1 + C2.1 <-> D1.A <-> R1.2 Q1.1 <-> Q1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt index b91a92c8f..bc3c8fd16 100644 --- a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.3 - C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1 + C1.+ <-> D1.K <-> Q1.3 + C1.- <-> R2.1 + C2.1 <-> D1.A <-> R1.2 Q1.1 <-> Q1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt index 4683e8782..0f4084347 100644 --- a/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.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 + C1.+ <-> C2.+ <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2 + C1.- <-> C6.2 <-> C7.- <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2 + C2.- <-> Q1.1 <-> R1.2 + C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 + C5.+ <-> D1.A <-> R7.2 + C6.1 <-> C9.1 <-> D1.K <-> Q2.2 <-> Q2.3 <-> R6.2 + C7.+ <-> R4.1 <-> R6.1 <-> VR1.1 + C8.1 <-> Q2.1 <-> R5.2 + C8.2 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt index 4683e8782..0f4084347 100644 --- a/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt @@ -1,11 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.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 + C1.+ <-> C2.+ <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2 + C1.- <-> C6.2 <-> C7.- <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2 + C2.- <-> Q1.1 <-> R1.2 + C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 + C5.+ <-> D1.A <-> R7.2 + C6.1 <-> C9.1 <-> D1.K <-> Q2.2 <-> Q2.3 <-> R6.2 + C7.+ <-> R4.1 <-> R6.1 <-> VR1.1 + C8.1 <-> Q2.1 <-> R5.2 + C8.2 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt index 51b20d40c..14edf8cde 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt @@ -1,15 +1,31 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - 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.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 - C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1 + C1.1 <-> R3.2 + C1.2 <-> R1.2 + C10.1 <-> R16.2 <-> Tone.1 + C10.2 <-> C2.- <-> C3.1 <-> C5.- <-> C6.- <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.1 + C11.+ <-> C12.1 <-> C7.2 <-> D3.A <-> D6.K <-> IC2.7 <-> R12.2 + C11.- <-> R16.1 + C12.2 <-> R15.1 <-> Tone.3 + C13.+ <-> C4.1 <-> IC1.6 <-> R8.2 + C13.- <-> Sustain.3 + C2.+ <-> IC1.3 <-> R4.1 <-> R7.2 + C3.2 <-> IC1.8 <-> R11.1 + C4.2 <-> R11.2 <-> R6.2 + C5.+ <-> R9.1 + C6.+ <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2 + C7.1 <-> D1.K <-> D4.A <-> IC2.2 <-> R12.1 <-> R13.2 + C8.+ <-> R13.1 + C8.- <-> Sustain.2 + C9.1 <-> IC2.3 <-> R14.1 <-> R18.2 + D1.A <-> D2.K + D2.A <-> D3.K + D4.K <-> D5.A + D5.K <-> D6.A + IC1.1 <-> R5.2 <-> R6.1 + IC1.2 <-> R3.1 <-> R5.1 + IC1.7 <-> R8.1 <-> R9.2 + R10.2 <-> Sustain.1 R17.1 <-> Volume.2 - Tone.2 <-> Volume.1 + Tone.2 <-> Volume.3 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt index 51b20d40c..14edf8cde 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt @@ -1,15 +1,31 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - 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.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 - C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1 + C1.1 <-> R3.2 + C1.2 <-> R1.2 + C10.1 <-> R16.2 <-> Tone.1 + C10.2 <-> C2.- <-> C3.1 <-> C5.- <-> C6.- <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.1 + C11.+ <-> C12.1 <-> C7.2 <-> D3.A <-> D6.K <-> IC2.7 <-> R12.2 + C11.- <-> R16.1 + C12.2 <-> R15.1 <-> Tone.3 + C13.+ <-> C4.1 <-> IC1.6 <-> R8.2 + C13.- <-> Sustain.3 + C2.+ <-> IC1.3 <-> R4.1 <-> R7.2 + C3.2 <-> IC1.8 <-> R11.1 + C4.2 <-> R11.2 <-> R6.2 + C5.+ <-> R9.1 + C6.+ <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2 + C7.1 <-> D1.K <-> D4.A <-> IC2.2 <-> R12.1 <-> R13.2 + C8.+ <-> R13.1 + C8.- <-> Sustain.2 + C9.1 <-> IC2.3 <-> R14.1 <-> R18.2 + D1.A <-> D2.K + D2.A <-> D3.K + D4.K <-> D5.A + D5.K <-> D6.A + IC1.1 <-> R5.2 <-> R6.1 + IC1.2 <-> R3.1 <-> R5.1 + IC1.7 <-> R8.1 <-> R9.2 + R10.2 <-> Sustain.1 R17.1 <-> Volume.2 - Tone.2 <-> Volume.1 + Tone.2 <-> Volume.3 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt index 5695884e4..4bdfdaf27 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt @@ -1,16 +1,34 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1 + C1.1 <-> R3.2 + C1.2 <-> R1.2 + C10.1 <-> R16.2 <-> Tone.1 + C10.2 <-> C2.- <-> C3.1 <-> C5.- <-> C6.- <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.1 + C11.+ <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.A <-> D6.K <-> IC2.7 <-> R12.2 + C11.- <-> R16.1 + C12.2 <-> R15.1 <-> Tone.3 + C13.2 <-> R19.1 + C14.+ <-> C4.1 <-> IC1.6 <-> R8.2 + C14.- <-> Sustain.3 + C2.+ <-> IC1.3 <-> R4.1 <-> R7.2 + C3.2 <-> IC1.8 <-> R11.1 + C4.2 <-> R11.2 <-> R6.2 + C5.+ <-> R9.1 + C6.+ <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2 + C7.1 <-> D1.K <-> D4.A <-> IC2.2 <-> R12.1 <-> R13.2 + C8.+ <-> R13.1 + C8.- <-> Sustain.2 + C9.1 <-> IC2.3 <-> R14.1 <-> R18.2 + D1.A <-> D2.K + D2.A <-> D3.K + D4.K <-> D5.A + D5.K <-> D6.A + IC1.1 <-> R5.2 <-> R6.1 + IC1.2 <-> R3.1 <-> R5.1 + IC1.7 <-> R8.1 <-> R9.2 + R10.2 <-> Sustain.1 R17.1 <-> Volume.2 - S1.2 <-> Volume.1 + R19.2 <-> R20.1 <-> S1.1 + S1.2 <-> Volume.3 S1.3 <-> Tone.2 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt index cb892e7fc..9b58edbc3 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt @@ -1,29 +1,65 @@ -Switch setup: [S1.ON1] +Switch setup: [ S1.ON1 ] - 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 - C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1 + C1.1 <-> R3.2 + C1.2 <-> R1.2 + C10.1 <-> R16.2 <-> Tone.1 + C10.2 <-> C2.- <-> C3.1 <-> C5.- <-> C6.- <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.1 + C11.+ <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.A <-> D6.K <-> IC2.7 <-> R12.2 + C11.- <-> R16.1 + C12.2 <-> R15.1 <-> Tone.3 + C13.2 <-> R19.1 + C14.+ <-> C4.1 <-> IC1.6 <-> R8.2 + C14.- <-> Sustain.3 + C2.+ <-> IC1.3 <-> R4.1 <-> R7.2 + C3.2 <-> IC1.8 <-> R11.1 + C4.2 <-> R11.2 <-> R6.2 + C5.+ <-> R9.1 + C6.+ <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2 + C7.1 <-> D1.K <-> D4.A <-> IC2.2 <-> R12.1 <-> R13.2 + C8.+ <-> R13.1 + C8.- <-> Sustain.2 + C9.1 <-> IC2.3 <-> R14.1 <-> R18.2 + D1.A <-> D2.K + D2.A <-> D3.K + D4.K <-> D5.A + D5.K <-> D6.A + IC1.1 <-> R5.2 <-> R6.1 + IC1.2 <-> R3.1 <-> R5.1 + IC1.7 <-> R8.1 <-> R9.2 + R10.2 <-> Sustain.1 R17.1 <-> Volume.2 + R19.2 <-> R20.1 <-> Volume.3 -Switch setup: [S1.ON2] +Switch setup: [ S1.ON2 ] - 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 - C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1 + C1.1 <-> R3.2 + C1.2 <-> R1.2 + C10.1 <-> R16.2 <-> Tone.1 + C10.2 <-> C2.- <-> C3.1 <-> C5.- <-> C6.- <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.1 + C11.+ <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.A <-> D6.K <-> IC2.7 <-> R12.2 + C11.- <-> R16.1 + C12.2 <-> R15.1 <-> Tone.3 + C13.2 <-> R19.1 + C14.+ <-> C4.1 <-> IC1.6 <-> R8.2 + C14.- <-> Sustain.3 + C2.+ <-> IC1.3 <-> R4.1 <-> R7.2 + C3.2 <-> IC1.8 <-> R11.1 + C4.2 <-> R11.2 <-> R6.2 + C5.+ <-> R9.1 + C6.+ <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2 + C7.1 <-> D1.K <-> D4.A <-> IC2.2 <-> R12.1 <-> R13.2 + C8.+ <-> R13.1 + C8.- <-> Sustain.2 + C9.1 <-> IC2.3 <-> R14.1 <-> R18.2 + D1.A <-> D2.K + D2.A <-> D3.K + D4.K <-> D5.A + D5.K <-> D6.A + IC1.1 <-> R5.2 <-> R6.1 + IC1.2 <-> R3.1 <-> R5.1 + IC1.7 <-> R8.1 <-> R9.2 + R10.2 <-> Sustain.1 R17.1 <-> Volume.2 - Tone.2 <-> Volume.1 + R19.2 <-> R20.1 + Tone.2 <-> Volume.3 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_classic_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_classic_excl_switches.txt index 98307e626..cd0b3af58 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_classic_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_classic_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 - C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 <-> R4.2 + C1.+ <-> R1.2 + C1.- <-> C2.2 <-> Q1.3 <-> R2.1 <-> R4.2 C10.1 <-> P5.2 C10.2 <-> Q4.3 <-> R16.1 <-> R17.1 - C11.1 <-> R18.1 - C12.1 <-> P5.3 <-> R21.1 + C11.+ <-> R18.1 + C12.1 <-> P5.1 <-> R21.1 C12.2 <-> R12.2 <-> R13.2 <-> R17.2 <-> R19.2 <-> R2.2 <-> R20.1 <-> R22.2 <-> R3.2 <-> R7.2 <-> R8.2 C13.1 <-> C8.1 <-> C9.1 <-> R14.2 <-> R15.1 <-> R21.2 - C13.2 <-> P5.1 <-> R22.1 - C2.1 <-> C3.1 <-> R4.1 <-> R5.2 - C3.2 <-> P11.3 - C4.1 <-> P11.2 - C4.2 <-> R6.1 - C5.1 <-> C6.1 <-> C7.1 <-> R10.1 <-> R9.2 - C5.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R6.2 <-> R7.1 - C6.2 <-> D1.2 <-> D2.1 - C7.2 <-> R11.1 - C8.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R11.2 <-> R12.1 <-> R15.2 - C9.2 <-> D3.2 <-> D4.1 - P11.1 <-> R20.2 + C13.2 <-> P5.3 <-> R22.1 + C2.1 <-> C3.+ <-> R4.1 <-> R5.2 + C3.- <-> P11.1 + C4.+ <-> P11.2 + C4.- <-> R6.1 + C5.1 <-> C6.1 <-> C7.+ <-> R10.1 <-> R9.2 + C5.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R6.2 <-> R7.1 + C6.2 <-> D1.K <-> D2.A + C7.- <-> R11.1 + C8.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R11.2 <-> R12.1 <-> R15.2 + C9.2 <-> D3.K <-> D4.A + P11.3 <-> R20.2 Q1.1 <-> R3.1 Q2.1 <-> R8.1 Q4.1 <-> R19.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_classic_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_classic_incl_switches.txt index 98307e626..cd0b3af58 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_classic_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_classic_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 - C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 <-> R4.2 + C1.+ <-> R1.2 + C1.- <-> C2.2 <-> Q1.3 <-> R2.1 <-> R4.2 C10.1 <-> P5.2 C10.2 <-> Q4.3 <-> R16.1 <-> R17.1 - C11.1 <-> R18.1 - C12.1 <-> P5.3 <-> R21.1 + C11.+ <-> R18.1 + C12.1 <-> P5.1 <-> R21.1 C12.2 <-> R12.2 <-> R13.2 <-> R17.2 <-> R19.2 <-> R2.2 <-> R20.1 <-> R22.2 <-> R3.2 <-> R7.2 <-> R8.2 C13.1 <-> C8.1 <-> C9.1 <-> R14.2 <-> R15.1 <-> R21.2 - C13.2 <-> P5.1 <-> R22.1 - C2.1 <-> C3.1 <-> R4.1 <-> R5.2 - C3.2 <-> P11.3 - C4.1 <-> P11.2 - C4.2 <-> R6.1 - C5.1 <-> C6.1 <-> C7.1 <-> R10.1 <-> R9.2 - C5.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R6.2 <-> R7.1 - C6.2 <-> D1.2 <-> D2.1 - C7.2 <-> R11.1 - C8.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R11.2 <-> R12.1 <-> R15.2 - C9.2 <-> D3.2 <-> D4.1 - P11.1 <-> R20.2 + C13.2 <-> P5.3 <-> R22.1 + C2.1 <-> C3.+ <-> R4.1 <-> R5.2 + C3.- <-> P11.1 + C4.+ <-> P11.2 + C4.- <-> R6.1 + C5.1 <-> C6.1 <-> C7.+ <-> R10.1 <-> R9.2 + C5.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R6.2 <-> R7.1 + C6.2 <-> D1.K <-> D2.A + C7.- <-> R11.1 + C8.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R11.2 <-> R12.1 <-> R15.2 + C9.2 <-> D3.K <-> D4.A + P11.3 <-> R20.2 Q1.1 <-> R3.1 Q2.1 <-> R8.1 Q4.1 <-> R19.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_excl_switches.txt index 9c7699913..00789a0e8 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 @@ -9,12 +9,12 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_incl_switches.txt index 9c7699913..00789a0e8 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_tri_pcb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 @@ -9,12 +9,12 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_excl_switches.txt index 9c7699913..00789a0e8 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 @@ -9,12 +9,12 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_incl_switches.txt index 9c7699913..00789a0e8 100644 --- a/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/big_muff_tri_perf_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> Q1.3 <-> R3.2 <-> R5.1 @@ -9,12 +9,12 @@ Switch setup: [Default] C2.1 <-> R5.2 <-> R6.1 C3.2 <-> R8.1 C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2 - C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2 - C5.2 <-> D1.2 <-> D2.1 + C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2 + C5.2 <-> D1.K <-> D2.A C6.2 <-> R12.2 C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1 - C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 - C8.2 <-> D3.2 <-> D4.1 + C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2 + C8.2 <-> D3.K <-> D4.A C9.2 <-> R17.1 Q1.1 <-> Q1.2 <-> R4.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/bixonix_expandora_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bixonix_expandora_excl_switches.txt index 7fbeb8136..1ece2e71f 100644 --- a/diylc-regression-data/input/v1/netlist/bixonix_expandora_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bixonix_expandora_excl_switches.txt @@ -1,32 +1,32 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.1 - C10.1 <-> R9.2 - C10.2 <-> D2.2 <-> D3.1 <-> TONE.3 + C1.+ <-> R1.1 + C10.+ <-> R9.2 + C10.- <-> D2.K <-> D3.A <-> TONE.1 C11.1 <-> C12.1 <-> R10.2 - C11.2 <-> C14.2 <-> C5.1 <-> C8.2 <-> C9.2 <-> D2.1 <-> D3.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 + C11.2 <-> C14.- <-> C5.1 <-> C8.- <-> C9.- <-> D2.A <-> D3.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 C12.2 <-> R11.1 - C13.1 <-> C14.1 <-> C15.2 <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 - C13.2 <-> D1.2 <-> IC3.8 <-> R12.1 - C15.1 <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 - C16.1 <-> IC3.1 <-> LEVEL.2 - C16.2 <-> R21.1 + C13.1 <-> C14.+ <-> C15.- <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 + C13.2 <-> D1.K <-> IC3.8 <-> R12.1 + C15.+ <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 + C16.+ <-> IC3.1 <-> LEVEL.2 + C16.- <-> R21.1 C2.1 <-> IC1.1 C2.2 <-> IC1.5 - C3.1 <-> D1.1 <-> GAIN.2 <-> IC1.7 - C3.2 <-> C4.1 <-> R2.1 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C3.- <-> C4.1 <-> R2.1 C4.2 <-> R3.2 <-> R4.2 C5.2 <-> IC2.3 <-> R4.1 C6.1 <-> IC2.2 <-> LDR.1 <-> R5.2 <-> R6.2 <-> spst1.1 <-> spst2.1 C6.2 <-> IC2.7 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 C7.2 <-> IC2.5 - C8.1 <-> R5.1 - C9.1 <-> R6.1 - D4.1 <-> R14.1 - D4.2 <-> R13.1 - GAIN.3 <-> IC1.2 <-> R1.2 - IC3.2 <-> LEVEL.3 <-> R11.2 + C8.+ <-> R5.1 + C9.+ <-> R6.1 + D4.A <-> R14.1 + D4.K <-> R13.1 + GAIN.1 <-> IC1.2 <-> R1.2 + IC3.2 <-> LEVEL.1 <-> R11.2 IC3.6 <-> R17.2 IC3.7 <-> R15.1 <-> R18.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 diff --git a/diylc-regression-data/input/v1/netlist/bixonix_expandora_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bixonix_expandora_incl_switches.txt index 9942fd071..1303b852a 100644 --- a/diylc-regression-data/input/v1/netlist/bixonix_expandora_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bixonix_expandora_incl_switches.txt @@ -1,137 +1,137 @@ -Switch setup: [spst1.ON1:spst2.ON1] +Switch setup: [ spst1.ON1:spst2.ON1 ] - C1.1 <-> R1.1 - C10.1 <-> R9.2 - C10.2 <-> D2.2 <-> D3.1 <-> TONE.3 + C1.+ <-> R1.1 + C10.+ <-> R9.2 + C10.- <-> D2.K <-> D3.A <-> TONE.1 C11.1 <-> C12.1 <-> R10.2 - C11.2 <-> C14.2 <-> C5.1 <-> C8.2 <-> C9.2 <-> D2.1 <-> D3.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 + C11.2 <-> C14.- <-> C5.1 <-> C8.- <-> C9.- <-> D2.A <-> D3.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 C12.2 <-> R11.1 - C13.1 <-> C14.1 <-> C15.2 <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 - C13.2 <-> D1.2 <-> IC3.8 <-> R12.1 - C15.1 <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 - C16.1 <-> IC3.1 <-> LEVEL.2 - C16.2 <-> R21.1 + C13.1 <-> C14.+ <-> C15.- <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 + C13.2 <-> D1.K <-> IC3.8 <-> R12.1 + C15.+ <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 + C16.+ <-> IC3.1 <-> LEVEL.2 + C16.- <-> R21.1 C2.1 <-> IC1.1 C2.2 <-> IC1.5 - C3.1 <-> D1.1 <-> GAIN.2 <-> IC1.7 - C3.2 <-> C4.1 <-> R2.1 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C3.- <-> C4.1 <-> R2.1 C4.2 <-> R3.2 <-> R4.2 C5.2 <-> IC2.3 <-> R4.1 C6.1 <-> IC2.2 <-> LDR.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.2 C6.2 <-> IC2.7 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 C7.2 <-> IC2.5 - C8.1 <-> R5.1 - C9.1 <-> R6.1 - D4.1 <-> R14.1 - D4.2 <-> R13.1 - GAIN.3 <-> IC1.2 <-> R1.2 - IC3.2 <-> LEVEL.3 <-> R11.2 + C8.+ <-> R5.1 + C9.+ <-> R6.1 + D4.A <-> R14.1 + D4.K <-> R13.1 + GAIN.1 <-> IC1.2 <-> R1.2 + IC3.2 <-> LEVEL.1 <-> R11.2 IC3.6 <-> R17.2 IC3.7 <-> R15.1 <-> R18.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 -Switch setup: [spst1.ON1:spst2.ON2] +Switch setup: [ spst1.ON1:spst2.ON2 ] - C1.1 <-> R1.1 - C10.1 <-> R9.2 - C10.2 <-> D2.2 <-> D3.1 <-> TONE.3 + C1.+ <-> R1.1 + C10.+ <-> R9.2 + C10.- <-> D2.K <-> D3.A <-> TONE.1 C11.1 <-> C12.1 <-> R10.2 - C11.2 <-> C14.2 <-> C5.1 <-> C8.2 <-> C9.2 <-> D2.1 <-> D3.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 + C11.2 <-> C14.- <-> C5.1 <-> C8.- <-> C9.- <-> D2.A <-> D3.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 C12.2 <-> R11.1 - C13.1 <-> C14.1 <-> C15.2 <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 - C13.2 <-> D1.2 <-> IC3.8 <-> R12.1 - C15.1 <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 - C16.1 <-> IC3.1 <-> LEVEL.2 - C16.2 <-> R21.1 + C13.1 <-> C14.+ <-> C15.- <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 + C13.2 <-> D1.K <-> IC3.8 <-> R12.1 + C15.+ <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 + C16.+ <-> IC3.1 <-> LEVEL.2 + C16.- <-> R21.1 C2.1 <-> IC1.1 C2.2 <-> IC1.5 - C3.1 <-> D1.1 <-> GAIN.2 <-> IC1.7 - C3.2 <-> C4.1 <-> R2.1 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C3.- <-> C4.1 <-> R2.1 C4.2 <-> R3.2 <-> R4.2 C5.2 <-> IC2.3 <-> R4.1 C6.1 <-> IC2.2 <-> LDR.1 <-> R5.2 <-> R6.2 <-> R7.2 C6.2 <-> IC2.7 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 C7.2 <-> IC2.5 - C8.1 <-> R5.1 - C9.1 <-> R6.1 - D4.1 <-> R14.1 - D4.2 <-> R13.1 - GAIN.3 <-> IC1.2 <-> R1.2 - IC3.2 <-> LEVEL.3 <-> R11.2 + C8.+ <-> R5.1 + C9.+ <-> R6.1 + D4.A <-> R14.1 + D4.K <-> R13.1 + GAIN.1 <-> IC1.2 <-> R1.2 + IC3.2 <-> LEVEL.1 <-> R11.2 IC3.6 <-> R17.2 IC3.7 <-> R15.1 <-> R18.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 -Switch setup: [spst1.ON2:spst2.ON1] +Switch setup: [ spst1.ON2:spst2.ON1 ] - C1.1 <-> R1.1 - C10.1 <-> R9.2 - C10.2 <-> D2.2 <-> D3.1 <-> TONE.3 + C1.+ <-> R1.1 + C10.+ <-> R9.2 + C10.- <-> D2.K <-> D3.A <-> TONE.1 C11.1 <-> C12.1 <-> R10.2 - C11.2 <-> C14.2 <-> C5.1 <-> C8.2 <-> C9.2 <-> D2.1 <-> D3.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 + C11.2 <-> C14.- <-> C5.1 <-> C8.- <-> C9.- <-> D2.A <-> D3.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 C12.2 <-> R11.1 - C13.1 <-> C14.1 <-> C15.2 <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 - C13.2 <-> D1.2 <-> IC3.8 <-> R12.1 - C15.1 <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 - C16.1 <-> IC3.1 <-> LEVEL.2 - C16.2 <-> R21.1 + C13.1 <-> C14.+ <-> C15.- <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 + C13.2 <-> D1.K <-> IC3.8 <-> R12.1 + C15.+ <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 + C16.+ <-> IC3.1 <-> LEVEL.2 + C16.- <-> R21.1 C2.1 <-> IC1.1 C2.2 <-> IC1.5 - C3.1 <-> D1.1 <-> GAIN.2 <-> IC1.7 - C3.2 <-> C4.1 <-> R2.1 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C3.- <-> C4.1 <-> R2.1 C4.2 <-> R3.2 <-> R4.2 C5.2 <-> IC2.3 <-> R4.1 C6.1 <-> IC2.2 <-> LDR.1 <-> R5.2 <-> R6.2 <-> R8.2 C6.2 <-> IC2.7 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 C7.2 <-> IC2.5 - C8.1 <-> R5.1 - C9.1 <-> R6.1 - D4.1 <-> R14.1 - D4.2 <-> R13.1 - GAIN.3 <-> IC1.2 <-> R1.2 - IC3.2 <-> LEVEL.3 <-> R11.2 + C8.+ <-> R5.1 + C9.+ <-> R6.1 + D4.A <-> R14.1 + D4.K <-> R13.1 + GAIN.1 <-> IC1.2 <-> R1.2 + IC3.2 <-> LEVEL.1 <-> R11.2 IC3.6 <-> R17.2 IC3.7 <-> R15.1 <-> R18.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 -Switch setup: [spst1.ON2:spst2.ON2] +Switch setup: [ spst1.ON2:spst2.ON2 ] - C1.1 <-> R1.1 - C10.1 <-> R9.2 - C10.2 <-> D2.2 <-> D3.1 <-> TONE.3 + C1.+ <-> R1.1 + C10.+ <-> R9.2 + C10.- <-> D2.K <-> D3.A <-> TONE.1 C11.1 <-> C12.1 <-> R10.2 - C11.2 <-> C14.2 <-> C5.1 <-> C8.2 <-> C9.2 <-> D2.1 <-> D3.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 + C11.2 <-> C14.- <-> C5.1 <-> C8.- <-> C9.- <-> D2.A <-> D3.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R15.2 <-> R19.2 <-> R2.2 <-> R21.2 C12.2 <-> R11.1 - C13.1 <-> C14.1 <-> C15.2 <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 - C13.2 <-> D1.2 <-> IC3.8 <-> R12.1 - C15.1 <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 - C16.1 <-> IC3.1 <-> LEVEL.2 - C16.2 <-> R21.1 + C13.1 <-> C14.+ <-> C15.- <-> IC1.3 <-> IC3.3 <-> R12.2 <-> R19.1 <-> R20.1 <-> R3.1 + C13.2 <-> D1.K <-> IC3.8 <-> R12.1 + C15.+ <-> IC1.6 <-> IC2.6 <-> IC3.5 <-> R13.2 <-> R20.2 + C16.+ <-> IC3.1 <-> LEVEL.2 + C16.- <-> R21.1 C2.1 <-> IC1.1 C2.2 <-> IC1.5 - C3.1 <-> D1.1 <-> GAIN.2 <-> IC1.7 - C3.2 <-> C4.1 <-> R2.1 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C3.- <-> C4.1 <-> R2.1 C4.2 <-> R3.2 <-> R4.2 C5.2 <-> IC2.3 <-> R4.1 C6.1 <-> IC2.2 <-> LDR.1 <-> R5.2 <-> R6.2 C6.2 <-> IC2.7 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 C7.2 <-> IC2.5 - C8.1 <-> R5.1 - C9.1 <-> R6.1 - D4.1 <-> R14.1 - D4.2 <-> R13.1 - GAIN.3 <-> IC1.2 <-> R1.2 - IC3.2 <-> LEVEL.3 <-> R11.2 + C8.+ <-> R5.1 + C9.+ <-> R6.1 + D4.A <-> R14.1 + D4.K <-> R13.1 + GAIN.1 <-> IC1.2 <-> R1.2 + IC3.2 <-> LEVEL.1 <-> R11.2 IC3.6 <-> R17.2 IC3.7 <-> R15.1 <-> R18.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 diff --git a/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt index c7ab8ce96..dddbecda4 100644 --- a/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt @@ -1,6 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> C9.2 + C1.1 <-> R1.1 + C1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1 + C2.- <-> C6.- <-> 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.+ <-> 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 diff --git a/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt index c7ab8ce96..dddbecda4 100644 --- a/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt @@ -1,6 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> C9.2 + C1.1 <-> R1.1 + C1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1 + C2.- <-> C6.- <-> 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.+ <-> 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 diff --git a/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_excl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_incl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blue_clipper_pcb_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/blue_clipper_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/blue_clipper_perf_excl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/v1/netlist/blue_clipper_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blue_clipper_perf_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/blue_clipper_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/blue_clipper_perf_incl_switches.txt index 766f82253..6840f8d7c 100644 --- a/diylc-regression-data/input/v1/netlist/blue_clipper_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blue_clipper_perf_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.1 - C2.1 <-> IC1.6 <-> R2.1 - C2.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R1.2 <-> R3.2 - C3.1 <-> R5.2 - C4.1 <-> IC1.7 <-> R4.2 - C4.2 <-> R6.2 + C2.+ <-> IC1.6 <-> R2.1 + C2.- <-> C3.- <-> C5.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R1.2 <-> R3.2 + C3.+ <-> R5.2 + C4.+ <-> IC1.7 <-> R4.2 + C4.- <-> R6.2 C5.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.1 <-> R7.1 + D1.A <-> D2.K <-> R6.1 <-> R7.1 IC1.2 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/blues_breaker_excl_switches.txt b/diylc-regression-data/input/v1/netlist/blues_breaker_excl_switches.txt index 55cee8a82..28d89e04c 100644 --- a/diylc-regression-data/input/v1/netlist/blues_breaker_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blues_breaker_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> GAIN.1 + C1.1 <-> GAIN.3 C1.2 <-> R6.1 - C2.1 <-> GAIN.3 <-> IC1.2 <-> R1.1 <-> R7.1 + C2.1 <-> GAIN.1 <-> IC1.2 <-> R1.1 <-> R7.1 C2.2 <-> GAIN.2 <-> IC1.1 - C3.1 <-> TONE.3 - C3.2 <-> C4.2 <-> C8.2 <-> C9.1 <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.3 - C4.1 <-> R3.2 <-> VOLUME.1 + C3.1 <-> TONE.1 + C3.2 <-> C4.2 <-> C8.2 <-> C9.+ <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.1 + C4.1 <-> R3.2 <-> VOLUME.3 C5.1 <-> VOLUME.2 C5.2 <-> R12.1 C6.1 <-> R1.2 C6.2 <-> C8.1 <-> R7.2 C7.1 <-> R8.1 C7.2 <-> IC1.3 <-> R9.1 - C9.2 <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 - D1.1 <-> D2.2 <-> R11.1 - D1.2 <-> D3.1 - D2.1 <-> D4.2 - D3.2 <-> D4.1 <-> R10.1 <-> R2.2 - D5.2 <-> IC1.5 <-> R4.1 + C9.- <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 + D1.A <-> D2.K <-> R11.1 + D1.K <-> D3.A + D2.A <-> D4.K + D3.K <-> D4.A <-> R10.1 <-> R2.2 + D5.K <-> IC1.5 <-> R4.1 IC1.7 <-> R10.2 <-> R11.2 <-> R6.2 - R2.1 <-> TONE.1 + R2.1 <-> TONE.3 R3.1 <-> TONE.2 diff --git a/diylc-regression-data/input/v1/netlist/blues_breaker_incl_switches.txt b/diylc-regression-data/input/v1/netlist/blues_breaker_incl_switches.txt index 55cee8a82..28d89e04c 100644 --- a/diylc-regression-data/input/v1/netlist/blues_breaker_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/blues_breaker_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> GAIN.1 + C1.1 <-> GAIN.3 C1.2 <-> R6.1 - C2.1 <-> GAIN.3 <-> IC1.2 <-> R1.1 <-> R7.1 + C2.1 <-> GAIN.1 <-> IC1.2 <-> R1.1 <-> R7.1 C2.2 <-> GAIN.2 <-> IC1.1 - C3.1 <-> TONE.3 - C3.2 <-> C4.2 <-> C8.2 <-> C9.1 <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.3 - C4.1 <-> R3.2 <-> VOLUME.1 + C3.1 <-> TONE.1 + C3.2 <-> C4.2 <-> C8.2 <-> C9.+ <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.1 + C4.1 <-> R3.2 <-> VOLUME.3 C5.1 <-> VOLUME.2 C5.2 <-> R12.1 C6.1 <-> R1.2 C6.2 <-> C8.1 <-> R7.2 C7.1 <-> R8.1 C7.2 <-> IC1.3 <-> R9.1 - C9.2 <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 - D1.1 <-> D2.2 <-> R11.1 - D1.2 <-> D3.1 - D2.1 <-> D4.2 - D3.2 <-> D4.1 <-> R10.1 <-> R2.2 - D5.2 <-> IC1.5 <-> R4.1 + C9.- <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 + D1.A <-> D2.K <-> R11.1 + D1.K <-> D3.A + D2.A <-> D4.K + D3.K <-> D4.A <-> R10.1 <-> R2.2 + D5.K <-> IC1.5 <-> R4.1 IC1.7 <-> R10.2 <-> R11.2 <-> R6.2 - R2.1 <-> TONE.1 + R2.1 <-> TONE.3 R3.1 <-> TONE.2 diff --git a/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt index c228feea1..a4d4c0145 100644 --- a/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt @@ -1,10 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q3.2 <-> Q3.3 <-> R1.1 + C1.- <-> C4.2 + C2.+ <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2 + C2.- <-> C3.+ <-> 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 Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1 + R7.2 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt index c228feea1..a4d4c0145 100644 --- a/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt @@ -1,10 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q3.2 <-> Q3.3 <-> R1.1 + C1.- <-> C4.2 + C2.+ <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2 + C2.- <-> C3.+ <-> 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 Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1 + R7.2 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/bonerender_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_pcb_excl_switches.txt index d589ac187..360a49c21 100644 --- a/diylc-regression-data/input/v1/netlist/bonerender_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bonerender_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q3.2 <-> Q3.3 <-> R1.1 + C1.- <-> C4.2 + C2.+ <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2 + C2.- <-> C3.+ <-> R1.2 C5.2 <-> R5.1 C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1 C7.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/bonerender_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_pcb_incl_switches.txt index d589ac187..360a49c21 100644 --- a/diylc-regression-data/input/v1/netlist/bonerender_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bonerender_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q3.2 <-> Q3.3 <-> R1.1 + C1.- <-> C4.2 + C2.+ <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2 + C2.- <-> C3.+ <-> R1.2 C5.2 <-> R5.1 C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1 C7.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_excl_switches.txt index f5bcda930..79d9fcddc 100644 --- a/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_excl_switches.txt @@ -1,27 +1,27 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R3.1 - C11.1 <-> Q2.1 <-> Q2.2 <-> R15.1 - C11.2 <-> R14.1 <-> R16.1 + C11.+ <-> Q2.1 <-> Q2.2 <-> R15.1 + C11.- <-> R14.1 <-> R16.1 C18.1 <-> IC2.8 <-> IC3.8 <-> R32.1 C18.2 <-> R31.2 - C2.1 <-> R2.2 - C2.2 <-> IC1.3 <-> R4.1 - C20.1 <-> C21.1 <-> C22.2 <-> C23.2 <-> C25.2 <-> C27.2 <-> C28.2 <-> C3.2 <-> C30.1 <-> C32.1 <-> C4.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.3 <-> IC7.11 <-> IC7.13 <-> IC7.4 <-> IC7.6 <-> IC7.7 <-> R14.2 <-> R15.2 <-> R2.1 <-> R31.1 <-> R39.1 <-> R48.1 <-> R51.1 + C2.+ <-> R2.2 + C2.- <-> IC1.3 <-> R4.1 + C20.1 <-> C21.1 <-> C22.- <-> C23.- <-> C25.- <-> C27.2 <-> C28.2 <-> C3.- <-> C30.1 <-> C32.1 <-> C4.2 <-> C9.- <-> D1.A <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.3 <-> IC7.11 <-> IC7.13 <-> IC7.4 <-> IC7.6 <-> IC7.7 <-> R14.2 <-> R15.2 <-> R2.1 <-> R31.1 <-> R39.1 <-> R48.1 <-> R51.1 C20.2 <-> IC2.3 <-> IC3.2 <-> R10.1 <-> R32.2 C21.2 <-> R8.2 <-> R9.1 - C22.1 <-> IC2.2 <-> R34.1 - C23.1 <-> IC3.3 <-> R37.1 - C24.1 <-> D10.2 <-> R44.1 <-> R45.1 - C24.2 <-> IC1.1 <-> R7.1 <-> R8.1 - C25.1 <-> D10.1 <-> D11.1 <-> Q7.1 <-> Q8.1 <-> R20.1 <-> R3.2 <-> R39.2 <-> R4.2 <-> R46.2 <-> R49.1 <-> R52.1 + C22.+ <-> IC2.2 <-> R34.1 + C23.+ <-> IC3.3 <-> R37.1 + C24.+ <-> D10.K <-> R44.1 <-> R45.1 + C24.- <-> IC1.1 <-> R7.1 <-> R8.1 + C25.+ <-> D10.A <-> D11.A <-> Q7.1 <-> Q8.1 <-> R20.1 <-> R3.2 <-> R39.2 <-> R4.2 <-> R46.2 <-> R49.1 <-> R52.1 C26.1 <-> R40.1 <-> R41.1 - C26.2 <-> C29.2 <-> IC4.6 <-> IC4.7 + C26.2 <-> C29.- <-> IC4.6 <-> IC4.7 C27.1 <-> IC4.8 <-> R40.2 C28.1 <-> R41.2 <-> R42.2 - C29.1 <-> D11.2 <-> R53.2 <-> R54.2 - C3.1 <-> R6.1 + C29.+ <-> D11.K <-> R53.2 <-> R54.2 + C3.+ <-> R6.1 C30.2 <-> IC4.3 <-> R58.1 C31.1 <-> R57.1 <-> R58.2 C31.2 <-> IC4.1 <-> IC4.2 @@ -29,15 +29,15 @@ Switch setup: [Default] C4.1 <-> IC1.8 <-> R5.2 C5.1 <-> R5.1 <-> R9.2 C5.2 <-> IC1.6 <-> IC1.7 <-> R10.2 - C6.1 <-> R59.1 <-> R60.1 <-> R61.1 - C6.2 <-> R20.2 - C9.1 <-> D1.2 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> IC5.5 <-> IC6.4 <-> IC6.5 <-> IC7.8 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R46.1 - D6.1 <-> IC2.7 <-> R33.2 - D6.2 <-> D7.1 <-> IC2.6 - D7.2 <-> R33.1 <-> R34.2 - D8.1 <-> D9.2 <-> IC3.6 - D8.2 <-> IC3.7 <-> R38.2 - D9.1 <-> R37.2 <-> R38.1 + C6.+ <-> R59.1 <-> R60.1 <-> R61.1 + C6.- <-> R20.2 + C9.+ <-> D1.K <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> IC5.5 <-> IC6.4 <-> IC6.5 <-> IC7.8 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R46.1 + D6.A <-> IC2.7 <-> R33.2 + D6.K <-> D7.A <-> IC2.6 + D7.K <-> R33.1 <-> R34.2 + D8.A <-> D9.K <-> IC3.6 + D8.K <-> IC3.7 <-> R38.2 + D9.A <-> R37.2 <-> R38.1 IC1.2 <-> R6.2 <-> R7.2 IC2.1 <-> R35.2 IC3.1 <-> R36.2 diff --git a/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_incl_switches.txt index f5bcda930..79d9fcddc 100644 --- a/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boss_oc-2_tb_incl_switches.txt @@ -1,27 +1,27 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R3.1 - C11.1 <-> Q2.1 <-> Q2.2 <-> R15.1 - C11.2 <-> R14.1 <-> R16.1 + C11.+ <-> Q2.1 <-> Q2.2 <-> R15.1 + C11.- <-> R14.1 <-> R16.1 C18.1 <-> IC2.8 <-> IC3.8 <-> R32.1 C18.2 <-> R31.2 - C2.1 <-> R2.2 - C2.2 <-> IC1.3 <-> R4.1 - C20.1 <-> C21.1 <-> C22.2 <-> C23.2 <-> C25.2 <-> C27.2 <-> C28.2 <-> C3.2 <-> C30.1 <-> C32.1 <-> C4.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.3 <-> IC7.11 <-> IC7.13 <-> IC7.4 <-> IC7.6 <-> IC7.7 <-> R14.2 <-> R15.2 <-> R2.1 <-> R31.1 <-> R39.1 <-> R48.1 <-> R51.1 + C2.+ <-> R2.2 + C2.- <-> IC1.3 <-> R4.1 + C20.1 <-> C21.1 <-> C22.- <-> C23.- <-> C25.- <-> C27.2 <-> C28.2 <-> C3.- <-> C30.1 <-> C32.1 <-> C4.2 <-> C9.- <-> D1.A <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.3 <-> IC7.11 <-> IC7.13 <-> IC7.4 <-> IC7.6 <-> IC7.7 <-> R14.2 <-> R15.2 <-> R2.1 <-> R31.1 <-> R39.1 <-> R48.1 <-> R51.1 C20.2 <-> IC2.3 <-> IC3.2 <-> R10.1 <-> R32.2 C21.2 <-> R8.2 <-> R9.1 - C22.1 <-> IC2.2 <-> R34.1 - C23.1 <-> IC3.3 <-> R37.1 - C24.1 <-> D10.2 <-> R44.1 <-> R45.1 - C24.2 <-> IC1.1 <-> R7.1 <-> R8.1 - C25.1 <-> D10.1 <-> D11.1 <-> Q7.1 <-> Q8.1 <-> R20.1 <-> R3.2 <-> R39.2 <-> R4.2 <-> R46.2 <-> R49.1 <-> R52.1 + C22.+ <-> IC2.2 <-> R34.1 + C23.+ <-> IC3.3 <-> R37.1 + C24.+ <-> D10.K <-> R44.1 <-> R45.1 + C24.- <-> IC1.1 <-> R7.1 <-> R8.1 + C25.+ <-> D10.A <-> D11.A <-> Q7.1 <-> Q8.1 <-> R20.1 <-> R3.2 <-> R39.2 <-> R4.2 <-> R46.2 <-> R49.1 <-> R52.1 C26.1 <-> R40.1 <-> R41.1 - C26.2 <-> C29.2 <-> IC4.6 <-> IC4.7 + C26.2 <-> C29.- <-> IC4.6 <-> IC4.7 C27.1 <-> IC4.8 <-> R40.2 C28.1 <-> R41.2 <-> R42.2 - C29.1 <-> D11.2 <-> R53.2 <-> R54.2 - C3.1 <-> R6.1 + C29.+ <-> D11.K <-> R53.2 <-> R54.2 + C3.+ <-> R6.1 C30.2 <-> IC4.3 <-> R58.1 C31.1 <-> R57.1 <-> R58.2 C31.2 <-> IC4.1 <-> IC4.2 @@ -29,15 +29,15 @@ Switch setup: [Default] C4.1 <-> IC1.8 <-> R5.2 C5.1 <-> R5.1 <-> R9.2 C5.2 <-> IC1.6 <-> IC1.7 <-> R10.2 - C6.1 <-> R59.1 <-> R60.1 <-> R61.1 - C6.2 <-> R20.2 - C9.1 <-> D1.2 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> IC5.5 <-> IC6.4 <-> IC6.5 <-> IC7.8 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R46.1 - D6.1 <-> IC2.7 <-> R33.2 - D6.2 <-> D7.1 <-> IC2.6 - D7.2 <-> R33.1 <-> R34.2 - D8.1 <-> D9.2 <-> IC3.6 - D8.2 <-> IC3.7 <-> R38.2 - D9.1 <-> R37.2 <-> R38.1 + C6.+ <-> R59.1 <-> R60.1 <-> R61.1 + C6.- <-> R20.2 + C9.+ <-> D1.K <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> IC5.5 <-> IC6.4 <-> IC6.5 <-> IC7.8 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R46.1 + D6.A <-> IC2.7 <-> R33.2 + D6.K <-> D7.A <-> IC2.6 + D7.K <-> R33.1 <-> R34.2 + D8.A <-> D9.K <-> IC3.6 + D8.K <-> IC3.7 <-> R38.2 + D9.A <-> R37.2 <-> R38.1 IC1.2 <-> R6.2 <-> R7.2 IC2.1 <-> R35.2 IC3.1 <-> R36.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_excl_switches.txt index 046f47a2b..80466d56f 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 C2.1 <-> R4.1 Q1.1 <-> Q1.2 <-> R1.1 <-> R5.2 Q2.1 <-> Q2.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_incl_switches.txt index 046f47a2b..80466d56f 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_2_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R3.1 + C1.+ <-> Q1.3 <-> R3.1 C2.1 <-> R4.1 Q1.1 <-> Q1.2 <-> R1.1 <-> R5.2 Q2.1 <-> Q2.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_excl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_excl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_incl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_incl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_excl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_incl_switches.txt index 15b1fefe2..8cd73da6e 100644 --- a/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/boutique_fuzz_face_perf_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 + C1.+ <-> Q1.3 C2.1 <-> R3.2 <-> R4.1 - C3.2 <-> R5.2 + C3.- <-> R5.2 Q1.1 <-> Q1.2 Q2.1 <-> Q2.2 <-> R2.2 Q2.3 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/buff_n_blend_excl_switches.txt b/diylc-regression-data/input/v1/netlist/buff_n_blend_excl_switches.txt index b992b897d..58f08d468 100644 --- a/diylc-regression-data/input/v1/netlist/buff_n_blend_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/buff_n_blend_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 <-> R2.1 - C2.1 <-> Q1.3 <-> R3.1 - C2.2 <-> R4.1 + C2.+ <-> Q1.3 <-> R3.1 + C2.- <-> R4.1 Q1.1 <-> Q1.2 <-> R2.2 R1.2 <-> R3.2 <-> R4.2 <-> R5.2 R5.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/buff_n_blend_incl_switches.txt b/diylc-regression-data/input/v1/netlist/buff_n_blend_incl_switches.txt index b992b897d..58f08d468 100644 --- a/diylc-regression-data/input/v1/netlist/buff_n_blend_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/buff_n_blend_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 <-> R2.1 - C2.1 <-> Q1.3 <-> R3.1 - C2.2 <-> R4.1 + C2.+ <-> Q1.3 <-> R3.1 + C2.- <-> R4.1 Q1.1 <-> Q1.2 <-> R2.2 R1.2 <-> R3.2 <-> R4.2 <-> R5.2 R5.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/bug_pcb_template_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bug_pcb_template_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/bug_pcb_template_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bug_pcb_template_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/bug_pcb_template_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bug_pcb_template_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/bug_pcb_template_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/bug_pcb_template_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt b/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt index ecba47121..f1134b7ad 100644 --- a/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt @@ -1,8 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + 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.- <-> C2.2 <-> C5.- <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1 + C12.+ <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1 + C2.1 <-> R3.1 + C3.1 <-> D1.K <-> D2.A <-> IC1.2 <-> R4.1 + C3.2 <-> C4.+ <-> D1.A <-> D3.K <-> IC1.1 <-> R4.2 + C4.- <-> R5.2 + C5.+ <-> R6.1 + C6.1 <-> C7.+ <-> D4.A <-> D5.K <-> IC1.6 <-> R7.2 + C6.2 <-> D4.K <-> D5.A <-> IC1.7 <-> R6.2 <-> R7.1 + C7.- <-> C8.1 <-> R9.2 + D2.K <-> D3.A + IC1.5 <-> R11.1 <-> R12.1 + IC1.8 <-> R5.1 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt b/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt index ecba47121..f1134b7ad 100644 --- a/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt @@ -1,8 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + 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.- <-> C2.2 <-> C5.- <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1 + C12.+ <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1 + C2.1 <-> R3.1 + C3.1 <-> D1.K <-> D2.A <-> IC1.2 <-> R4.1 + C3.2 <-> C4.+ <-> D1.A <-> D3.K <-> IC1.1 <-> R4.2 + C4.- <-> R5.2 + C5.+ <-> R6.1 + C6.1 <-> C7.+ <-> D4.A <-> D5.K <-> IC1.6 <-> R7.2 + C6.2 <-> D4.K <-> D5.A <-> IC1.7 <-> R6.2 <-> R7.1 + C7.- <-> C8.1 <-> R9.2 + D2.K <-> D3.A + IC1.5 <-> R11.1 <-> R12.1 + IC1.8 <-> R5.1 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt index f510bc75b..4bb11f788 100644 --- a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.2 + C1.2 <-> R2.1 + C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1 + C2.2 <-> C5.2 <-> R7.2 C3.1 <-> R5.2 <-> R7.1 - C3.2 <-> R6.1 <-> R8.2 + C3.2 <-> R6.1 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 diff --git a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt index f510bc75b..4bb11f788 100644 --- a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.2 + C1.2 <-> R2.1 + C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1 + C2.2 <-> C5.2 <-> R7.2 C3.1 <-> R5.2 <-> R7.1 - C3.2 <-> R6.1 <-> R8.2 + C3.2 <-> R6.1 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 diff --git a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt index a95751eb0..2d487adc0 100644 --- a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 C2.1 <-> Q2.3 <-> R3.2 - C3.1 <-> R3.1 <-> R5.1 - C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1 + C3.+ <-> R3.1 <-> R5.1 + C3.- <-> C4.- <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1 + C5.1 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt index a95751eb0..2d487adc0 100644 --- a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.1 C2.1 <-> Q2.3 <-> R3.2 - C3.1 <-> R3.1 <-> R5.1 - C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1 + C3.+ <-> R3.1 <-> R5.1 + C3.- <-> C4.- <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1 + C5.1 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/cream_pie_excl_switches.txt b/diylc-regression-data/input/v1/netlist/cream_pie_excl_switches.txt index 964392363..228675c26 100644 --- a/diylc-regression-data/input/v1/netlist/cream_pie_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/cream_pie_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.2 C2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/cream_pie_incl_switches.txt b/diylc-regression-data/input/v1/netlist/cream_pie_incl_switches.txt index 964392363..228675c26 100644 --- a/diylc-regression-data/input/v1/netlist/cream_pie_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/cream_pie_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.2 C2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_excl_switches.txt index 2a216ef68..7a29fd883 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R1.1 + C1.+ <-> Q1.3 <-> R1.1 C2.1 <-> R3.2 <-> VR1.3 - C2.2 <-> P1.1 - C3.1 <-> P2.2 - C3.2 <-> P1.3 <-> P2.3 <-> Q1.1 <-> Q1.2 - P2.1 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> P1.3 + C3.+ <-> P2.2 + C3.- <-> P1.1 <-> P2.1 <-> Q1.1 <-> Q1.2 + P2.3 <-> Q2.1 <-> Q2.2 <-> R1.2 Q2.3 <-> R2.1 <-> VR1.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_incl_switches.txt index 2a216ef68..7a29fd883 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_arbiter_fuzz_face_bc108_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R1.1 + C1.+ <-> Q1.3 <-> R1.1 C2.1 <-> R3.2 <-> VR1.3 - C2.2 <-> P1.1 - C3.1 <-> P2.2 - C3.2 <-> P1.3 <-> P2.3 <-> Q1.1 <-> Q1.2 - P2.1 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> P1.3 + C3.+ <-> P2.2 + C3.- <-> P1.1 <-> P2.1 <-> Q1.1 <-> Q1.2 + P2.3 <-> Q2.1 <-> Q2.2 <-> R1.2 Q2.3 <-> R2.1 <-> VR1.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_excl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_incl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_pcb_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_excl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_incl_switches.txt index 14c6b1666..6adc60600 100644 --- a/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dallas_rangemaster_perf_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> Q1.3 <-> R1.2 <-> VR1.3 - C2.1 <-> C4.1 <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 - C2.2 <-> Q1.1 <-> Q1.2 <-> R3.1 - C4.2 <-> R1.1 + C2.+ <-> C4.+ <-> R2.2 <-> R3.2 <-> VR1.1 <-> VR1.2 + C2.- <-> Q1.1 <-> Q1.2 <-> R3.1 + C4.- <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_excl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_incl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_excl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_incl_switches.txt index 968080676..2d6ded43f 100644 --- a/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diaz_texas_square_face_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R3.1 - C2.1 <-> Q1.3 <-> R4.1 - C2.2 <-> R5.1 - C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 + C2.+ <-> Q1.3 <-> R4.1 + C2.- <-> R5.1 + C3.- <-> Q1.1 <-> Q1.2 <-> R5.2 Q2.1 <-> Q2.2 <-> R4.2 Q2.3 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/diode_comp_opamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/diode_comp_opamp_excl_switches.txt index 5cf292350..6bf028461 100644 --- a/diylc-regression-data/input/v1/netlist/diode_comp_opamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diode_comp_opamp_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q3.1 <-> Q3.2 <-> R2.1 - C1.2 <-> C2.2 <-> R2.2 <-> R3.2 <-> R5.2 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - D1.1 <-> Q3.3 <-> R6.2 - D1.2 <-> Q2.1 <-> Q2.2 <-> R3.1 + C1.+ <-> Q3.1 <-> Q3.2 <-> R2.1 + C1.- <-> C2.- <-> R2.2 <-> R3.2 <-> R5.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + D1.A <-> Q3.3 <-> R6.2 + D1.K <-> Q2.1 <-> Q2.2 <-> R3.1 R1.1 <-> R4.1 R4.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/diode_comp_opamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/diode_comp_opamp_incl_switches.txt index 5cf292350..6bf028461 100644 --- a/diylc-regression-data/input/v1/netlist/diode_comp_opamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/diode_comp_opamp_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q3.1 <-> Q3.2 <-> R2.1 - C1.2 <-> C2.2 <-> R2.2 <-> R3.2 <-> R5.2 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - D1.1 <-> Q3.3 <-> R6.2 - D1.2 <-> Q2.1 <-> Q2.2 <-> R3.1 + C1.+ <-> Q3.1 <-> Q3.2 <-> R2.1 + C1.- <-> C2.- <-> R2.2 <-> R3.2 <-> R5.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + D1.A <-> Q3.3 <-> R6.2 + D1.K <-> Q2.1 <-> Q2.2 <-> R3.1 R1.1 <-> R4.1 R4.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt index 48c27dcb3..fe9e58967 100644 --- a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - 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 + C1.+ <-> R3.2 + C1.- <-> R4.1 <-> Vol.3 + C2.+ <-> R3.1 + C2.- <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.1 + Q1.1 <-> Q1.2 <-> R1.1 Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt index 48c27dcb3..fe9e58967 100644 --- a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - 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 + C1.+ <-> R3.2 + C1.- <-> R4.1 <-> Vol.3 + C2.+ <-> R3.1 + C2.- <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.1 + Q1.1 <-> Q1.2 <-> R1.1 Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt index b88d856c1..8d16eec0c 100644 --- a/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt @@ -1,6 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> IC1.5 + C1.1 <-> R1.2 + C1.2 <-> C4.1 + C2.1 <-> C3.1 <-> IC1.2 <-> R2.1 + C2.2 <-> C5.+ <-> IC1.7 <-> R2.2 + C3.2 <-> R3.1 + C4.2 <-> C6.2 <-> C7.- <-> D1.K <-> D2.A <-> IC1.4 <-> R7.1 + C5.- <-> R6.1 + C6.1 <-> D1.A <-> D2.K <-> R6.2 + C7.+ <-> R4.2 <-> R5.2 <-> R7.2 + IC1.3 <-> R1.1 <-> R4.1 + IC1.6 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt index b88d856c1..8d16eec0c 100644 --- a/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt @@ -1,6 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> IC1.5 + C1.1 <-> R1.2 + C1.2 <-> C4.1 + C2.1 <-> C3.1 <-> IC1.2 <-> R2.1 + C2.2 <-> C5.+ <-> IC1.7 <-> R2.2 + C3.2 <-> R3.1 + C4.2 <-> C6.2 <-> C7.- <-> D1.K <-> D2.A <-> IC1.4 <-> R7.1 + C5.- <-> R6.1 + C6.1 <-> D1.A <-> D2.K <-> R6.2 + C7.+ <-> R4.2 <-> R5.2 <-> R7.2 + IC1.3 <-> R1.1 <-> R4.1 + IC1.6 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_excl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_incl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_comp_280a_pcb_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_excl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_incl_switches.txt index fe2ccc6ca..41b6e7e1f 100644 --- a/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_comp_280a_perf_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.2 <-> R11.1 - C3.1 <-> IC1.5 <-> R9.2 - C3.2 <-> C4.2 <-> C8.2 <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 - C4.1 <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 + C3.+ <-> IC1.5 <-> R9.2 + C3.- <-> C4.- <-> C8.- <-> IC1.4 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R10.2 <-> R11.2 <-> R7.2 <-> R8.2 + C4.+ <-> IC1.8 <-> R10.1 <-> R3.2 <-> R9.1 C5.2 <-> C7.1 <-> IC1.1 <-> R4.1 <-> R5.1 C6.1 <-> IC1.6 <-> R6.1 C6.2 <-> Q2.3 <-> R8.1 C7.2 <-> Q1.3 <-> R7.1 - C8.1 <-> R12.1 + C8.+ <-> R12.1 IC1.2 <-> R4.2 IC1.3 <-> R2.2 <-> R3.1 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt index 1d71d28a9..69fd2eccf 100644 --- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C5.+ <-> IC1.7 <-> R1.2 C2.2 <-> R2.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 + C3.1 <-> R3.2 + C3.2 <-> R8.1 + C4.+ <-> R4.2 <-> R5.1 + C4.- <-> C6.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2 + C5.- <-> R9.1 + C6.1 <-> D1.A <-> D3.K <-> R9.2 + D2.K <-> D3.A + IC1.3 <-> R3.1 <-> R4.1 + R6.2 <-> R7.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt index 1d71d28a9..69fd2eccf 100644 --- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> IC1.2 <-> R1.1 + C1.2 <-> C5.+ <-> IC1.7 <-> R1.2 C2.2 <-> R2.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 + C3.1 <-> R3.2 + C3.2 <-> R8.1 + C4.+ <-> R4.2 <-> R5.1 + C4.- <-> C6.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2 + C5.- <-> R9.1 + C6.1 <-> D1.A <-> D3.K <-> R9.2 + D2.K <-> D3.A + IC1.3 <-> R3.1 <-> R4.1 + R6.2 <-> R7.2 diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_excl_switches.txt index 418175abe..d8f77648d 100644 --- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R4.1 - C1.2 <-> R3.2 + C1.+ <-> R4.1 + C1.- <-> R3.2 C2.1 <-> R5.2 C3.1 <-> R8.1 C3.2 <-> R7.1 - C5.1 <-> R8.2 - C5.2 <-> R9.1 + C5.+ <-> R8.2 + C5.- <-> R9.1 IC1.6 <-> R1.2 <-> R2.1 R2.2 <-> R3.1 R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_incl_switches.txt index 418175abe..d8f77648d 100644 --- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_perf_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R4.1 - C1.2 <-> R3.2 + C1.+ <-> R4.1 + C1.- <-> R3.2 C2.1 <-> R5.2 C3.1 <-> R8.1 C3.2 <-> R7.1 - C5.1 <-> R8.2 - C5.2 <-> R9.1 + C5.+ <-> R8.2 + C5.- <-> R9.1 IC1.6 <-> R1.2 <-> R2.1 R2.2 <-> R3.1 R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_excl_switches.txt index 5de18bb9a..b0bb1e2cb 100644 --- a/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> GAIN.1 + C1.1 <-> GAIN.3 C1.2 <-> R6.1 C10.1 <-> C8.1 <-> IC1.6 <-> R10.1 C10.2 <-> R7.1 - C11.1 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 + C11.1 <-> C9.- <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 C11.2 <-> R12.1 <-> R2.2 - C2.1 <-> GAIN.3 <-> IC1.2 <-> R1.1 + C2.1 <-> GAIN.1 <-> IC1.2 <-> R1.1 C2.2 <-> GAIN.2 <-> IC1.1 - C3.1 <-> TONE.3 - C3.2 <-> C4.2 <-> C6.2 <-> C9.1 <-> D2.2 <-> D3.1 <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.3 - C4.1 <-> R3.2 <-> VOLUME.1 + C3.1 <-> TONE.1 + C3.2 <-> C4.2 <-> C6.2 <-> C9.+ <-> D2.K <-> D3.A <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.1 + C4.1 <-> R3.2 <-> VOLUME.3 C5.1 <-> VOLUME.2 C5.2 <-> R2.1 C6.1 <-> R1.2 C7.1 <-> R8.1 C7.2 <-> IC1.3 <-> R9.1 C8.2 <-> IC1.7 <-> R10.2 <-> R6.2 - D1.2 <-> IC1.5 <-> R4.1 - D2.1 <-> R7.2 - D3.2 <-> TONE.1 + D1.K <-> IC1.5 <-> R4.1 + D2.A <-> R7.2 + D3.K <-> TONE.3 R3.1 <-> TONE.2 diff --git a/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_incl_switches.txt index 5de18bb9a..b0bb1e2cb 100644 --- a/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/drive_master_tone_bb_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> GAIN.1 + C1.1 <-> GAIN.3 C1.2 <-> R6.1 C10.1 <-> C8.1 <-> IC1.6 <-> R10.1 C10.2 <-> R7.1 - C11.1 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 + C11.1 <-> C9.- <-> IC1.4 <-> R12.2 <-> R5.2 <-> R8.2 C11.2 <-> R12.1 <-> R2.2 - C2.1 <-> GAIN.3 <-> IC1.2 <-> R1.1 + C2.1 <-> GAIN.1 <-> IC1.2 <-> R1.1 C2.2 <-> GAIN.2 <-> IC1.1 - C3.1 <-> TONE.3 - C3.2 <-> C4.2 <-> C6.2 <-> C9.1 <-> D2.2 <-> D3.1 <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.3 - C4.1 <-> R3.2 <-> VOLUME.1 + C3.1 <-> TONE.1 + C3.2 <-> C4.2 <-> C6.2 <-> C9.+ <-> D2.K <-> D3.A <-> IC1.8 <-> R4.2 <-> R5.1 <-> R9.2 <-> VOLUME.1 + C4.1 <-> R3.2 <-> VOLUME.3 C5.1 <-> VOLUME.2 C5.2 <-> R2.1 C6.1 <-> R1.2 C7.1 <-> R8.1 C7.2 <-> IC1.3 <-> R9.1 C8.2 <-> IC1.7 <-> R10.2 <-> R6.2 - D1.2 <-> IC1.5 <-> R4.1 - D2.1 <-> R7.2 - D3.2 <-> TONE.1 + D1.K <-> IC1.5 <-> R4.1 + D2.A <-> R7.2 + D3.K <-> TONE.3 R3.1 <-> TONE.2 diff --git a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_excl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_incl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_excl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_incl_switches.txt index 1dffd4704..7d71614c5 100644 --- a/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/duende_jfet_booster_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> VR1.1 - C1.2 <-> D1.1 <-> Q1.3 <-> R1.2 + C1.+ <-> D1.K <-> VR1.1 + C1.- <-> D1.A <-> Q1.3 <-> R1.2 C2.1 <-> Q1.1 <-> Q1.2 C2.2 <-> R1.1 VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_excl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_incl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dyna_comp_pcb_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/dyna_comp_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dyna_comp_perf_excl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/v1/netlist/dyna_comp_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dyna_comp_perf_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/dyna_comp_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dyna_comp_perf_incl_switches.txt index fa4e27789..2a8c4722f 100644 --- a/diylc-regression-data/input/v1/netlist/dyna_comp_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dyna_comp_perf_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> Q1.2 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C4.2 <-> C5.2 <-> C6.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C4.- <-> C5.- <-> C6.2 <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 IC1.8 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt index d4e560495..b71922bb2 100644 --- a/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt @@ -1,9 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.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 + C1.+ <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 + C1.- <-> C2.- <-> C9.2 <-> D1.A <-> 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.+ <-> D1.K <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1 + C3.+ <-> R17.1 + C3.- <-> 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.K <-> D4.A <-> D5.A <-> D6.K <-> IC1.1 <-> R12.2 + C8.1 <-> R10.1 + C8.2 <-> IC1.6 <-> R11.1 + C9.1 <-> IC1.8 <-> R12.1 <-> R15.1 + D2.A <-> D3.K + D3.A <-> D4.K + D5.K <-> D6.A + IC1.7 <-> R11.2 + Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2 + R17.2 <-> R19.1 diff --git a/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt index d4e560495..b71922bb2 100644 --- a/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt @@ -1,9 +1,26 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.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 + C1.+ <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 + C1.- <-> C2.- <-> C9.2 <-> D1.A <-> 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.+ <-> D1.K <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1 + C3.+ <-> R17.1 + C3.- <-> 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.K <-> D4.A <-> D5.A <-> D6.K <-> IC1.1 <-> R12.2 + C8.1 <-> R10.1 + C8.2 <-> IC1.6 <-> R11.1 + C9.1 <-> IC1.8 <-> R12.1 <-> R15.1 + D2.A <-> D3.K + D3.A <-> D4.K + D5.K <-> D6.A + IC1.7 <-> R11.2 + Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2 + R17.2 <-> R19.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_excl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_incl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremelo_pcb_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_excl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_incl_switches.txt index 18837edc3..d0dd4f6d5 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremelo_perf_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> VR1.2 - C1.2 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 + C1.+ <-> R1.2 <-> VR1.2 + C1.- <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R11.2 <-> R2.2 <-> R5.2 <-> R9.2 <-> VR1.3 C2.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 - C3.1 <-> R4.2 <-> R5.1 - C3.2 <-> Q2.1 + C3.+ <-> R4.2 <-> R5.1 + C3.- <-> Q2.1 C4.1 <-> Q1.1 <-> R3.1 C5.1 <-> Q3.3 <-> R8.1 C5.2 <-> C8.1 <-> R9.1 - C6.1 <-> C7.1 <-> D1.2 <-> R8.2 + C6.1 <-> C7.1 <-> D1.K <-> R8.2 C6.2 <-> R6.2 C7.2 <-> C8.2 <-> R10.1 - D1.1 <-> R7.2 + D1.A <-> R7.2 R3.2 <-> R7.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_excl_switches.txt index 6306123b7..90156f502 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> R2.1 <-> VR1.2 - C2.2 <-> P73.3 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> R1.1 <-> R10.1 <-> R4.1 <-> R8.2 <-> VR1.3 - C3.1 <-> P73.1 + C2.+ <-> R2.1 <-> VR1.2 + C2.- <-> P73.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> R1.1 <-> R10.1 <-> R4.1 <-> R8.2 <-> VR1.3 + C3.1 <-> P73.3 C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 - C4.1 <-> R3.2 <-> R4.2 - C4.2 <-> Q2.1 + C4.+ <-> R3.2 <-> R4.2 + C4.- <-> Q2.1 C5.1 <-> Q3.2 <-> Q3.3 <-> R9.2 C5.2 <-> C6.2 <-> R10.2 C6.1 <-> C7.2 <-> R11.1 - C7.1 <-> C8.2 <-> D1.2 <-> R9.1 + C7.1 <-> C8.2 <-> D1.K <-> R9.1 C8.1 <-> R7.2 - D1.1 <-> R6.2 - P68.1 <-> R11.2 - P68.2 <-> P68.3 - P70.1 <-> R7.1 - P70.3 <-> R8.1 + D1.A <-> R6.2 + P68.1 <-> P68.2 + P68.3 <-> R11.2 + P70.1 <-> R8.1 + P70.3 <-> R7.1 R5.1 <-> R6.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_incl_switches.txt index 6306123b7..90156f502 100644 --- a/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ea_tremolo_rog_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> R2.1 <-> VR1.2 - C2.2 <-> P73.3 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> R1.1 <-> R10.1 <-> R4.1 <-> R8.2 <-> VR1.3 - C3.1 <-> P73.1 + C2.+ <-> R2.1 <-> VR1.2 + C2.- <-> P73.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> R1.1 <-> R10.1 <-> R4.1 <-> R8.2 <-> VR1.3 + C3.1 <-> P73.3 C3.2 <-> Q1.1 <-> Q1.2 <-> R5.2 - C4.1 <-> R3.2 <-> R4.2 - C4.2 <-> Q2.1 + C4.+ <-> R3.2 <-> R4.2 + C4.- <-> Q2.1 C5.1 <-> Q3.2 <-> Q3.3 <-> R9.2 C5.2 <-> C6.2 <-> R10.2 C6.1 <-> C7.2 <-> R11.1 - C7.1 <-> C8.2 <-> D1.2 <-> R9.1 + C7.1 <-> C8.2 <-> D1.K <-> R9.1 C8.1 <-> R7.2 - D1.1 <-> R6.2 - P68.1 <-> R11.2 - P68.2 <-> P68.3 - P70.1 <-> R7.1 - P70.3 <-> R8.1 + D1.A <-> R6.2 + P68.1 <-> P68.2 + P68.3 <-> R11.2 + P70.1 <-> R8.1 + P70.3 <-> R7.1 R5.1 <-> R6.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/easy_drive_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_drive_perf_excl_switches.txt index 5b2614545..9b4aae393 100644 --- a/diylc-regression-data/input/v1/netlist/easy_drive_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easy_drive_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 + C1.1 <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 C2.1 <-> R1.2 <-> R2.2 - C2.2 <-> C4.2 <-> R4.2 - C3.1 <-> D1.2 <-> D2.1 + C2.2 <-> C4.- <-> R4.2 + C3.1 <-> D1.K <-> D2.A C3.2 <-> C5.2 <-> Q1.1 <-> R1.1 <-> R3.2 - C4.1 <-> R4.1 + C4.+ <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/easy_drive_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_drive_perf_incl_switches.txt index 5b2614545..9b4aae393 100644 --- a/diylc-regression-data/input/v1/netlist/easy_drive_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easy_drive_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.1 <-> D2.2 <-> Q1.3 <-> R2.1 + C1.1 <-> D1.A <-> D2.K <-> Q1.3 <-> R2.1 C2.1 <-> R1.2 <-> R2.2 - C2.2 <-> C4.2 <-> R4.2 - C3.1 <-> D1.2 <-> D2.1 + C2.2 <-> C4.- <-> R4.2 + C3.1 <-> D1.K <-> D2.A C3.2 <-> C5.2 <-> Q1.1 <-> R1.1 <-> R3.2 - C4.1 <-> R4.1 + C4.+ <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt index 102f882f1..2cc0cbd52 100644 --- a/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt @@ -1,9 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> VR1.1 - C1.2 <-> VR1.2 <-> VR1.3 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2 - C3.2 <-> Q2.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2 + C3.1 <-> R1.2 <-> VR1.1 + Q1.3 <-> R3.1 + Q2.3 <-> R2.1 R1.1 <-> R2.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt index 102f882f1..2cc0cbd52 100644 --- a/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt @@ -1,9 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> R1.2 <-> VR1.1 - C1.2 <-> VR1.2 <-> VR1.3 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2 - C3.2 <-> Q2.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2 + C3.1 <-> R1.2 <-> VR1.1 + Q1.3 <-> R3.1 + Q2.3 <-> R2.1 R1.1 <-> R2.2 + VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/easyvibe_excl_switches.txt b/diylc-regression-data/input/v1/netlist/easyvibe_excl_switches.txt index 2ae53cec2..b676fd66f 100644 --- a/diylc-regression-data/input/v1/netlist/easyvibe_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easyvibe_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C10.1 <-> D1.1 <-> D4.2 <-> IC2.3 <-> IC4.2 <-> LDR1.2 <-> LDR2.2 <-> LDR3.2 <-> LDR4.1 <-> LED5.1 <-> R15.1 <-> R2.1 <-> R21.1 <-> R23.1 <-> R3.1 - C10.2 <-> C8.2 <-> C9.2 <-> D5.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> LED1.2 <-> LED3.2 <-> R1.2 <-> R16.1 + C10.+ <-> D1.A <-> D4.K <-> IC2.3 <-> IC4.2 <-> LDR1.2 <-> LDR2.2 <-> LDR3.2 <-> LDR4.1 <-> LED5.A <-> R15.1 <-> R2.1 <-> R21.1 <-> R23.1 <-> R3.1 + C10.- <-> C8.- <-> C9.- <-> D5.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> LED1.K <-> LED3.K <-> R1.2 <-> R16.1 C2.1 <-> IC1.8 <-> LDR1.1 C2.2 <-> IC1.1 <-> R4.1 <-> R5.2 C3.1 <-> IC2.8 <-> LDR2.1 @@ -12,16 +12,16 @@ Switch setup: [Default] C4.2 <-> IC2.6 <-> R8.1 <-> R9.2 C5.1 <-> IC4.8 <-> LDR4.2 C5.2 <-> IC3.6 <-> R10.1 <-> R11.2 - C6.1 <-> R13.1 <-> R14.1 - C6.2 <-> R16.2 + C6.+ <-> R13.1 <-> R14.1 + C6.- <-> R16.2 C7.1 <-> IC2.2 <-> R22.1 C7.2 <-> IC2.1 <-> R17.1 <-> R19.1 - C8.1 <-> IC4.1 <-> R20.1 - C9.1 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> R23.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 <-> R17.2 - D3.2 <-> D4.1 - D5.1 <-> LED6.2 + C8.+ <-> IC4.1 <-> R20.1 + C9.+ <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> R23.2 + D1.K <-> D2.A + D2.K <-> D3.A <-> R17.2 + D3.K <-> D4.A + D5.A <-> LED6.K IC1.2 <-> R3.2 <-> R4.2 IC1.7 <-> R5.1 <-> R6.2 IC2.7 <-> R7.1 <-> R8.2 @@ -31,9 +31,9 @@ Switch setup: [Default] IC4.3 <-> R19.2 <-> R20.2 IC4.6 <-> R12.1 <-> R13.2 IC4.7 <-> R11.1 <-> R12.2 - LED1.1 <-> LED2.2 - LED2.1 <-> LED4.1 <-> R18.1 - LED3.1 <-> LED4.2 - LED5.2 <-> LED6.1 + LED1.A <-> LED2.K + LED2.A <-> LED4.A <-> R18.1 + LED3.A <-> LED4.K + LED5.K <-> LED6.A R18.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/easyvibe_incl_switches.txt b/diylc-regression-data/input/v1/netlist/easyvibe_incl_switches.txt index 2ae53cec2..b676fd66f 100644 --- a/diylc-regression-data/input/v1/netlist/easyvibe_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/easyvibe_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C10.1 <-> D1.1 <-> D4.2 <-> IC2.3 <-> IC4.2 <-> LDR1.2 <-> LDR2.2 <-> LDR3.2 <-> LDR4.1 <-> LED5.1 <-> R15.1 <-> R2.1 <-> R21.1 <-> R23.1 <-> R3.1 - C10.2 <-> C8.2 <-> C9.2 <-> D5.2 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> LED1.2 <-> LED3.2 <-> R1.2 <-> R16.1 + C10.+ <-> D1.A <-> D4.K <-> IC2.3 <-> IC4.2 <-> LDR1.2 <-> LDR2.2 <-> LDR3.2 <-> LDR4.1 <-> LED5.A <-> R15.1 <-> R2.1 <-> R21.1 <-> R23.1 <-> R3.1 + C10.- <-> C8.- <-> C9.- <-> D5.K <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> LED1.K <-> LED3.K <-> R1.2 <-> R16.1 C2.1 <-> IC1.8 <-> LDR1.1 C2.2 <-> IC1.1 <-> R4.1 <-> R5.2 C3.1 <-> IC2.8 <-> LDR2.1 @@ -12,16 +12,16 @@ Switch setup: [Default] C4.2 <-> IC2.6 <-> R8.1 <-> R9.2 C5.1 <-> IC4.8 <-> LDR4.2 C5.2 <-> IC3.6 <-> R10.1 <-> R11.2 - C6.1 <-> R13.1 <-> R14.1 - C6.2 <-> R16.2 + C6.+ <-> R13.1 <-> R14.1 + C6.- <-> R16.2 C7.1 <-> IC2.2 <-> R22.1 C7.2 <-> IC2.1 <-> R17.1 <-> R19.1 - C8.1 <-> IC4.1 <-> R20.1 - C9.1 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> R23.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 <-> R17.2 - D3.2 <-> D4.1 - D5.1 <-> LED6.2 + C8.+ <-> IC4.1 <-> R20.1 + C9.+ <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> IC4.5 <-> R23.2 + D1.K <-> D2.A + D2.K <-> D3.A <-> R17.2 + D3.K <-> D4.A + D5.A <-> LED6.K IC1.2 <-> R3.2 <-> R4.2 IC1.7 <-> R5.1 <-> R6.2 IC2.7 <-> R7.1 <-> R8.2 @@ -31,9 +31,9 @@ Switch setup: [Default] IC4.3 <-> R19.2 <-> R20.2 IC4.6 <-> R12.1 <-> R13.2 IC4.7 <-> R11.1 <-> R12.2 - LED1.1 <-> LED2.2 - LED2.1 <-> LED4.1 <-> R18.1 - LED3.1 <-> LED4.2 - LED5.2 <-> LED6.1 + LED1.A <-> LED2.K + LED2.A <-> LED4.A <-> R18.1 + LED3.A <-> LED4.K + LED5.K <-> LED6.A R18.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_excl_switches.txt index 022a02748..68ac7e98b 100644 --- a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,14 +7,14 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_incl_switches.txt index 022a02748..68ac7e98b 100644 --- a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_pcb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,14 +7,14 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_excl_switches.txt index 022a02748..68ac7e98b 100644 --- a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,14 +7,14 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_incl_switches.txt index 022a02748..68ac7e98b 100644 --- a/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_big_muff_triangle_perf_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> R1.2 <-> R2.1 C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 <-> R4.1 @@ -7,14 +7,14 @@ Switch setup: [Default] C11.2 <-> Q4.3 <-> R19.2 <-> R22.1 C12.1 <-> R20.2 C13.1 <-> C5.1 <-> C6.2 <-> R9.2 - C13.2 <-> D1.2 <-> D2.1 <-> R23.2 + C13.2 <-> D1.K <-> D2.A <-> R23.2 C2.1 <-> R3.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 + C5.2 <-> D1.A <-> D2.K C6.1 <-> R12.1 - C7.1 <-> D3.1 <-> D4.2 + C7.1 <-> D3.A <-> D4.K C7.2 <-> C8.2 <-> C9.2 <-> R13.2 <-> R16.2 <-> R18.1 - C8.1 <-> D3.2 <-> D4.1 <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 + C8.1 <-> D3.K <-> D4.A <-> Q3.3 <-> R12.2 <-> R14.2 <-> R16.1 C9.1 <-> R17.1 Q1.1 <-> Q1.2 <-> R7.1 Q2.1 <-> Q2.2 <-> R11.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_hogfoot_excl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_hogfoot_excl_switches.txt index 2b91a1177..5e36d27d6 100644 --- a/diylc-regression-data/input/v1/netlist/eh_hogfoot_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_hogfoot_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.1 - C1.2 <-> C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 + C1.+ <-> R1.1 + C1.- <-> C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C2.2 <-> R1.2 <-> R3.2 <-> R5.2 C3.1 <-> R2.1 <-> R4.1 - C3.2 <-> C4.2 <-> R4.2 + C3.2 <-> C4.- <-> R4.2 Q1.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_hogfoot_incl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_hogfoot_incl_switches.txt index 2b91a1177..5e36d27d6 100644 --- a/diylc-regression-data/input/v1/netlist/eh_hogfoot_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_hogfoot_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.1 - C1.2 <-> C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 + C1.+ <-> R1.1 + C1.- <-> C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C2.2 <-> R1.2 <-> R3.2 <-> R5.2 C3.1 <-> R2.1 <-> R4.1 - C3.2 <-> C4.2 <-> R4.2 + C3.2 <-> C4.- <-> R4.2 Q1.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_lpb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_lpb_excl_switches.txt index 18994c79f..addd1a7c4 100644 --- a/diylc-regression-data/input/v1/netlist/eh_lpb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_lpb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_lpb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_lpb_incl_switches.txt index 18994c79f..addd1a7c4 100644 --- a/diylc-regression-data/input/v1/netlist/eh_lpb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_lpb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_excl_switches.txt index e8fce521c..f835dccb0 100644 --- a/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] Bass Switch.1 <-> C8.1 <-> R13.2 <-> R14.1 - Bass Switch.2 <-> Blend.1 + Bass Switch.2 <-> Blend.3 Bass Switch.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 C1.2 <-> IC1.3 <-> IC1.5 <-> R1.1 C10.1 <-> Lo Filter.2 <-> R14.2 C11.1 <-> IC1.13 <-> R16.1 <-> R17.1 - C12.1 <-> IC1.12 <-> Lo Filter.3 - C12.2 <-> C13.1 <-> C9.2 <-> D1.2 <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 - C13.2 <-> D1.1 <-> R20.1 <-> R21.1 - C14.1 <-> D3.2 <-> IC3.2 <-> IC3.6 <-> R24.1 + C12.1 <-> IC1.12 <-> Lo Filter.1 + C12.2 <-> C13.1 <-> C9.2 <-> D1.K <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 + C13.2 <-> D1.A <-> R20.1 <-> R21.1 + C14.1 <-> D3.K <-> IC3.2 <-> IC3.6 <-> R24.1 C14.2 <-> C15.1 <-> R23.1 - C15.2 <-> D2.1 <-> IC3.10 <-> IC3.13 <-> R24.2 + C15.2 <-> D2.A <-> IC3.10 <-> IC3.13 <-> R24.2 C16.1 <-> IC3.12 - C16.2 <-> C18.1 <-> C19.2 <-> C2.2 <-> Hi Filter.3 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 + C16.2 <-> C18.+ <-> C19.- <-> C2.2 <-> Hi Filter.1 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 C17.2 <-> R25.1 - C18.2 <-> C20.1 <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 - C19.1 <-> C20.2 <-> R27.2 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 + C19.+ <-> C20.- <-> R27.2 C2.1 <-> R4.2 C3.1 <-> IC1.6 <-> R2.2 <-> R4.1 C3.2 <-> C4.1 <-> R5.1 @@ -27,8 +27,8 @@ Switch setup: [Default] C6.1 <-> IC1.10 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.2 <-> IC3.14 - D3.1 <-> IC3.7 + D2.K <-> IC3.14 + D3.A <-> IC3.7 IC1.4 <-> IC2.8 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_incl_switches.txt index c4e19651b..7adb6a613 100644 --- a/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/eh_octave_multiplexer_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Bass Switch.ON1:Range.ON1] +Switch setup: [ Bass Switch.ON1:Range.ON1 ] - Blend.1 <-> C8.1 <-> R13.2 <-> R14.1 + Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 + Blend.3 <-> C8.1 <-> R13.2 <-> R14.1 C1.2 <-> IC1.3 <-> IC1.5 <-> R1.1 C10.1 <-> Lo Filter.2 <-> R14.2 C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 C11.1 <-> IC1.13 <-> R16.1 <-> R17.1 - C12.1 <-> IC1.12 <-> Lo Filter.3 - C12.2 <-> C13.1 <-> C9.2 <-> D1.2 <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 - C13.2 <-> D1.1 <-> R20.1 <-> R21.1 - C14.1 <-> D3.2 <-> IC3.2 <-> IC3.6 <-> R24.1 + C12.1 <-> IC1.12 <-> Lo Filter.1 + C12.2 <-> C13.1 <-> C9.2 <-> D1.K <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 + C13.2 <-> D1.A <-> R20.1 <-> R21.1 + C14.1 <-> D3.K <-> IC3.2 <-> IC3.6 <-> R24.1 C14.2 <-> C15.1 <-> R23.1 - C15.2 <-> D2.1 <-> IC3.10 <-> IC3.13 <-> R24.2 + C15.2 <-> D2.A <-> IC3.10 <-> IC3.13 <-> R24.2 C16.1 <-> IC3.12 - C16.2 <-> C18.1 <-> C19.2 <-> C2.2 <-> Hi Filter.3 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 + C16.2 <-> C18.+ <-> C19.- <-> C2.2 <-> Hi Filter.1 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 C17.2 <-> R25.1 - C18.2 <-> C20.1 <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 - C19.1 <-> C20.2 <-> R27.2 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 + C19.+ <-> C20.- <-> R27.2 C2.1 <-> R4.2 C3.1 <-> IC1.6 <-> R2.2 <-> R4.1 C3.2 <-> C4.1 <-> R5.1 @@ -26,8 +26,8 @@ Switch setup: [Bass Switch.ON1:Range.ON1] C6.1 <-> IC1.10 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.2 <-> IC3.14 - D3.1 <-> IC3.7 + D2.K <-> IC3.14 + D3.A <-> IC3.7 IC1.4 <-> IC2.8 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 @@ -39,26 +39,26 @@ Switch setup: [Bass Switch.ON1:Range.ON1] IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 -Switch setup: [Bass Switch.ON1:Range.ON2] +Switch setup: [ Bass Switch.ON1:Range.ON2 ] - Blend.1 <-> C8.1 <-> R13.2 <-> R14.1 + Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 + Blend.3 <-> C8.1 <-> R13.2 <-> R14.1 C1.2 <-> IC1.3 <-> IC1.5 <-> R1.1 C10.1 <-> Lo Filter.2 <-> R14.2 C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 C11.1 <-> IC1.13 <-> R16.1 <-> R17.1 - C12.1 <-> IC1.12 <-> Lo Filter.3 - C12.2 <-> C13.1 <-> C9.2 <-> D1.2 <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 - C13.2 <-> D1.1 <-> R20.1 <-> R21.1 - C14.1 <-> D3.2 <-> IC3.2 <-> IC3.6 <-> R24.1 + C12.1 <-> IC1.12 <-> Lo Filter.1 + C12.2 <-> C13.1 <-> C9.2 <-> D1.K <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 + C13.2 <-> D1.A <-> R20.1 <-> R21.1 + C14.1 <-> D3.K <-> IC3.2 <-> IC3.6 <-> R24.1 C14.2 <-> C15.1 <-> R23.1 - C15.2 <-> D2.1 <-> IC3.10 <-> IC3.13 <-> R24.2 + C15.2 <-> D2.A <-> IC3.10 <-> IC3.13 <-> R24.2 C16.1 <-> IC3.12 - C16.2 <-> C18.1 <-> C19.2 <-> C2.2 <-> Hi Filter.3 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 + C16.2 <-> C18.+ <-> C19.- <-> C2.2 <-> Hi Filter.1 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 C17.2 <-> R25.1 - C18.2 <-> C20.1 <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 - C19.1 <-> C20.2 <-> R27.2 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 + C19.+ <-> C20.- <-> R27.2 C2.1 <-> R4.2 C3.1 <-> IC1.6 <-> R2.2 <-> R4.1 C3.2 <-> C4.1 <-> R5.1 @@ -67,8 +67,8 @@ Switch setup: [Bass Switch.ON1:Range.ON2] C6.1 <-> IC1.10 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.2 <-> IC3.14 - D3.1 <-> IC3.7 + D2.K <-> IC3.14 + D3.A <-> IC3.7 IC1.4 <-> IC2.8 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 @@ -80,25 +80,25 @@ Switch setup: [Bass Switch.ON1:Range.ON2] IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 -Switch setup: [Bass Switch.ON2:Range.ON1] +Switch setup: [ Bass Switch.ON2:Range.ON1 ] - Blend.1 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 + Blend.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 C1.2 <-> IC1.3 <-> IC1.5 <-> R1.1 C10.1 <-> Lo Filter.2 <-> R14.2 C11.1 <-> IC1.13 <-> R16.1 <-> R17.1 - C12.1 <-> IC1.12 <-> Lo Filter.3 - C12.2 <-> C13.1 <-> C9.2 <-> D1.2 <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 - C13.2 <-> D1.1 <-> R20.1 <-> R21.1 - C14.1 <-> D3.2 <-> IC3.2 <-> IC3.6 <-> R24.1 + C12.1 <-> IC1.12 <-> Lo Filter.1 + C12.2 <-> C13.1 <-> C9.2 <-> D1.K <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 + C13.2 <-> D1.A <-> R20.1 <-> R21.1 + C14.1 <-> D3.K <-> IC3.2 <-> IC3.6 <-> R24.1 C14.2 <-> C15.1 <-> R23.1 - C15.2 <-> D2.1 <-> IC3.10 <-> IC3.13 <-> R24.2 + C15.2 <-> D2.A <-> IC3.10 <-> IC3.13 <-> R24.2 C16.1 <-> IC3.12 - C16.2 <-> C18.1 <-> C19.2 <-> C2.2 <-> Hi Filter.3 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 + C16.2 <-> C18.+ <-> C19.- <-> C2.2 <-> Hi Filter.1 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 C17.2 <-> R25.1 - C18.2 <-> C20.1 <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 - C19.1 <-> C20.2 <-> R27.2 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 + C19.+ <-> C20.- <-> R27.2 C2.1 <-> R4.2 C3.1 <-> IC1.6 <-> R2.2 <-> R4.1 C3.2 <-> C4.1 <-> R5.1 @@ -108,8 +108,8 @@ Switch setup: [Bass Switch.ON2:Range.ON1] C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 C8.1 <-> R13.2 <-> R14.1 - D2.2 <-> IC3.14 - D3.1 <-> IC3.7 + D2.K <-> IC3.14 + D3.A <-> IC3.7 IC1.4 <-> IC2.8 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 @@ -121,25 +121,25 @@ Switch setup: [Bass Switch.ON2:Range.ON1] IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 -Switch setup: [Bass Switch.ON2:Range.ON2] +Switch setup: [ Bass Switch.ON2:Range.ON2 ] - Blend.1 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 + Blend.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 C1.2 <-> IC1.3 <-> IC1.5 <-> R1.1 C10.1 <-> Lo Filter.2 <-> R14.2 C11.1 <-> IC1.13 <-> R16.1 <-> R17.1 - C12.1 <-> IC1.12 <-> Lo Filter.3 - C12.2 <-> C13.1 <-> C9.2 <-> D1.2 <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 - C13.2 <-> D1.1 <-> R20.1 <-> R21.1 - C14.1 <-> D3.2 <-> IC3.2 <-> IC3.6 <-> R24.1 + C12.1 <-> IC1.12 <-> Lo Filter.1 + C12.2 <-> C13.1 <-> C9.2 <-> D1.K <-> Q1.1 <-> R11.2 <-> R12.2 <-> R17.2 + C13.2 <-> D1.A <-> R20.1 <-> R21.1 + C14.1 <-> D3.K <-> IC3.2 <-> IC3.6 <-> R24.1 C14.2 <-> C15.1 <-> R23.1 - C15.2 <-> D2.1 <-> IC3.10 <-> IC3.13 <-> R24.2 + C15.2 <-> D2.A <-> IC3.10 <-> IC3.13 <-> R24.2 C16.1 <-> IC3.12 - C16.2 <-> C18.1 <-> C19.2 <-> C2.2 <-> Hi Filter.3 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 + C16.2 <-> C18.+ <-> C19.- <-> C2.2 <-> Hi Filter.1 <-> IC3.11 <-> R1.2 <-> R22.1 <-> R23.2 <-> R26.1 <-> R27.1 <-> R5.2 C17.2 <-> R25.1 - C18.2 <-> C20.1 <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 - C19.1 <-> C20.2 <-> R27.2 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.12 <-> IC2.14 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> R15.2 <-> R21.2 <-> R25.2 <-> R26.2 <-> R28.1 <-> R3.2 <-> R8.2 + C19.+ <-> C20.- <-> R27.2 C2.1 <-> R4.2 C3.1 <-> IC1.6 <-> R2.2 <-> R4.1 C3.2 <-> C4.1 <-> R5.1 @@ -149,8 +149,8 @@ Switch setup: [Bass Switch.ON2:Range.ON2] C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 C8.1 <-> R13.2 <-> R14.1 - D2.2 <-> IC3.14 - D3.1 <-> IC3.7 + D2.K <-> IC3.14 + D3.A <-> IC3.7 IC1.4 <-> IC2.8 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_excl_switches.txt index a69638003..ce21b5e1b 100644 --- a/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_incl_switches.txt index a69638003..ce21b5e1b 100644 --- a/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ehx_linear_power_booster_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 C1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/electra_distortion_excl_switches.txt b/diylc-regression-data/input/v1/netlist/electra_distortion_excl_switches.txt index 14fd057e4..dc3ff18b9 100644 --- a/diylc-regression-data/input/v1/netlist/electra_distortion_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/electra_distortion_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> R4.1 C2.1 <-> R1.2 <-> R2.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> R3.2 <-> R4.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> R3.2 <-> R4.2 Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/electra_distortion_incl_switches.txt b/diylc-regression-data/input/v1/netlist/electra_distortion_incl_switches.txt index 14fd057e4..dc3ff18b9 100644 --- a/diylc-regression-data/input/v1/netlist/electra_distortion_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/electra_distortion_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.2 C1.2 <-> R4.1 C2.1 <-> R1.2 <-> R2.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> R3.2 <-> R4.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> R3.2 <-> R4.2 Q1.1 <-> Q1.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt index 20ad95d62..5ec03a075 100644 --- a/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt @@ -1,7 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - 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 + C10.1 <-> C8.2 <-> D7.K <-> D8.A + C10.2 <-> D10.A <-> D9.K + C11.1 <-> C9.2 <-> D8.K <-> D9.A + C11.2 <-> D10.K + C2.2 <-> C4.1 <-> D1.K <-> D2.A + C3.1 <-> D1.A + C3.2 <-> C5.1 <-> D2.K <-> D3.A + C4.2 <-> C6.1 <-> D3.K <-> D4.A + C5.2 <-> C7.1 <-> D4.K <-> D5.A + C6.2 <-> C8.1 <-> D5.K <-> D6.A + C7.2 <-> C9.1 <-> D6.K <-> D7.A + Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 Q2.3 <-> R1.1 <-> S1.3 diff --git a/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt index d8aa421b9..9bf1a8ab9 100644 --- a/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt @@ -1,7 +1,17 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - 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 - 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 + C10.1 <-> C8.2 <-> D7.K <-> D8.A + C10.2 <-> D10.A <-> D9.K + C11.1 <-> C9.2 <-> D8.K <-> D9.A + C11.2 <-> D10.K + C2.2 <-> C4.1 <-> D1.K <-> D2.A + C3.1 <-> D1.A + C3.2 <-> C5.1 <-> D2.K <-> D3.A + C4.2 <-> C6.1 <-> D3.K <-> D4.A + C5.2 <-> C7.1 <-> D4.K <-> D5.A + C6.2 <-> C8.1 <-> D5.K <-> D6.A + C7.2 <-> C9.1 <-> D6.K <-> D7.A + Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/fat_boostered_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fat_boostered_excl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/v1/netlist/fat_boostered_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fat_boostered_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/fat_boostered_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fat_boostered_incl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/v1/netlist/fat_boostered_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fat_boostered_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/fat_boostered_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fat_boostered_perf_excl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/v1/netlist/fat_boostered_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fat_boostered_perf_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/fat_boostered_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fat_boostered_perf_incl_switches.txt index 4960234b9..782849d47 100644 --- a/diylc-regression-data/input/v1/netlist/fat_boostered_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fat_boostered_perf_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> Q1.2 <-> R2.2 - C1.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C1.+ <-> Q1.1 <-> Q1.2 <-> R2.2 + C1.- <-> D1.A <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C2.1 <-> C3.1 <-> Q1.3 <-> R3.1 C4.1 <-> C5.2 <-> Q2.1 <-> Q2.2 <-> Q3.2 <-> Q3.3 C4.2 <-> R4.2 <-> R5.1 C5.1 <-> C6.1 - D1.2 <-> Q3.1 <-> R2.1 <-> R4.1 + D1.K <-> Q3.1 <-> R2.1 <-> R4.1 Q2.3 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt index 3d1f83a18..0d3e2dc20 100644 --- a/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3 - C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2 - D2.2 <-> D3.1 + C1.1 <-> R1.1 <-> R2.1 + C1.2 <-> R5.1 + C2.+ <-> D1.K <-> VR1.1 <-> VR1.2 + C2.- <-> C4.- <-> C5.- <-> D1.A <-> R1.2 <-> R3.2 + C3.1 <-> R3.1 + C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3 + C5.+ <-> D2.A <-> D3.K <-> R2.2 <-> R4.2 + D2.K <-> D3.A Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt index 3d1f83a18..0d3e2dc20 100644 --- a/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3 - C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2 - D2.2 <-> D3.1 + C1.1 <-> R1.1 <-> R2.1 + C1.2 <-> R5.1 + C2.+ <-> D1.K <-> VR1.1 <-> VR1.2 + C2.- <-> C4.- <-> C5.- <-> D1.A <-> R1.2 <-> R3.2 + C3.1 <-> R3.1 + C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3 + C5.+ <-> D2.A <-> D3.K <-> R2.2 <-> R4.2 + D2.K <-> D3.A Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_drive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_drive_excl_switches.txt index 23f393fcb..a2a5c08ad 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_drive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_drive_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 + C1.2 <-> C3.- <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 C2.2 <-> Q1.1 <-> VR1.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R5.1 + C3.+ <-> Q2.2 <-> Q2.3 <-> R5.1 C4.2 <-> Q2.1 <-> VR3.1 Q1.2 <-> Q1.3 <-> VR2.2 <-> VR2.3 R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_drive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_drive_incl_switches.txt index 23f393fcb..a2a5c08ad 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_drive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_drive_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 <-> R2.2 - C1.2 <-> C3.2 <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 + C1.2 <-> C3.- <-> R1.1 <-> R4.1 <-> R5.2 <-> VR2.1 C2.2 <-> Q1.1 <-> VR1.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R5.1 + C3.+ <-> Q2.2 <-> Q2.3 <-> R5.1 C4.2 <-> Q2.1 <-> VR3.1 Q1.2 <-> Q1.3 <-> VR2.2 <-> VR2.3 R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_ruby_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_ruby_excl_switches.txt index 289fa3712..904433e18 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_ruby_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_ruby_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 - C1.2 <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 - C2.1 <-> IC1.7 <-> VR1.3 - C2.2 <-> IC1.3 <-> IC1.4 + C1.+ <-> Q1.3 + C1.- <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 + C2.+ <-> IC1.7 <-> VR1.3 + C2.- <-> IC1.3 <-> IC1.4 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 C3.2 <-> VR2.3 C4.1 <-> IC1.6 - C5.1 <-> IC1.8 + C5.+ <-> IC1.8 IC1.1 <-> VR3.1 <-> VR3.2 IC1.2 <-> VR2.2 IC1.5 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_ruby_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_ruby_incl_switches.txt index 289fa3712..904433e18 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_ruby_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_ruby_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 - C1.2 <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 - C2.1 <-> IC1.7 <-> VR1.3 - C2.2 <-> IC1.3 <-> IC1.4 + C1.+ <-> Q1.3 + C1.- <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 + C2.+ <-> IC1.7 <-> VR1.3 + C2.- <-> IC1.3 <-> IC1.4 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 C3.2 <-> VR2.3 C4.1 <-> IC1.6 - C5.1 <-> IC1.8 + C5.+ <-> IC1.8 IC1.1 <-> VR3.1 <-> VR3.2 IC1.2 <-> VR2.2 IC1.5 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_excl_switches.txt index 942de6a33..d79464299 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 220p.1 <-> 33k.2 220p.2 <-> Cp.1 <-> Rs.1 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_incl_switches.txt index 942de6a33..d79464299 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_2_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 220p.1 <-> 33k.2 220p.2 <-> Cp.1 <-> Rs.1 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_excl_switches.txt index d2b7c509b..bad8a6704 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_incl_switches.txt index 31466481e..50eb7801c 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [S1.ON1] +Switch setup: [ S1.ON1 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 @@ -6,7 +6,7 @@ Switch setup: [S1.ON1] Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 -Switch setup: [S1.ON2] +Switch setup: [ S1.ON2 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_excl_switches.txt index d2b7c509b..bad8a6704 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_incl_switches.txt index 31466481e..50eb7801c 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_deluxe_perf_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [S1.ON1] +Switch setup: [ S1.ON1 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 @@ -6,7 +6,7 @@ Switch setup: [S1.ON1] Q1.2 <-> Q1.3 <-> VR2.1 <-> VR2.2 VR1.1 <-> VR1.2 -Switch setup: [S1.ON2] +Switch setup: [ S1.ON2 ] C1.1 <-> R1.2 C1.2 <-> C3.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_excl_switches.txt index 80384346d..9c6a07d8e 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C1.2 <-> R3.2 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.1 + C1.- <-> R3.2 C2.1 <-> Q1.1 <-> VR1.1 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_incl_switches.txt index 80384346d..9c6a07d8e 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.1 - C1.2 <-> R3.2 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.1 + C1.- <-> R3.2 C2.1 <-> Q1.1 <-> VR1.1 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_excl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_incl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_pcb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_excl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_incl_switches.txt index fa66e97a1..a1fef097d 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_perf_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 C1.2 <-> R1.2 <-> VR2.1 <-> VR3.3 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_excl_switches.txt index 5e36b0752..3775f1f7c 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 1M.1 <-> 220p.1 <-> Rs.1 <-> Rs.2 1M.2 <-> 33k.2 diff --git a/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_incl_switches.txt index 5e36b0752..3775f1f7c 100644 --- a/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fetzer_valve_revisited_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 1M.1 <-> 220p.1 <-> Rs.1 <-> Rs.2 1M.2 <-> 33k.2 diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt index abd40973c..76e22ce88 100644 --- a/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt @@ -1,9 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 <-> R2.1 <-> R4.1 - C3.2 <-> R1.2 <-> R2.2 <-> R4.2 + C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.- <-> 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 VR1.1 <-> VR2.1 diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt index abd40973c..76e22ce88 100644 --- a/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt @@ -1,9 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 <-> R2.1 <-> R4.1 - C3.2 <-> R1.2 <-> R2.2 <-> R4.2 + C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.- <-> 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 VR1.1 <-> VR2.1 diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt index ce2bc65c3..04647683e 100644 --- a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1 - C3.2 <-> R1.2 <-> R2.2 <-> R4.2 + C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.- <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1 + C3.1 <-> R4.1 + C3.2 <-> R4.2 C4.1 <-> R6.1 - C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.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 diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt index ce2bc65c3..04647683e 100644 --- a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt @@ -1,10 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1 - C3.2 <-> R1.2 <-> R2.2 <-> R4.2 + C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.- <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1 + C3.1 <-> R4.1 + C3.2 <-> R4.2 C4.1 <-> R6.1 - C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.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 diff --git a/diylc-regression-data/input/v1/netlist/flashing leds_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flashing leds_excl_switches.txt index b6211820a..8bab82d2f 100644 --- a/diylc-regression-data/input/v1/netlist/flashing leds_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flashing leds_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R4.2 - C1.2 <-> R1.2 - C2.1 <-> R2.2 - C2.2 <-> Q2.3 <-> R3.2 - D1.1 <-> R4.1 - D1.2 <-> D2.2 - D2.1 <-> R2.1 + C1.+ <-> R4.2 + C1.- <-> R1.2 + C2.+ <-> R2.2 + C2.- <-> Q2.3 <-> R3.2 + D1.A <-> R4.1 + D1.K <-> D2.K + D2.A <-> R2.1 Q1.1 <-> Q2.1 diff --git a/diylc-regression-data/input/v1/netlist/flashing leds_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flashing leds_incl_switches.txt index b6211820a..8bab82d2f 100644 --- a/diylc-regression-data/input/v1/netlist/flashing leds_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flashing leds_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R4.2 - C1.2 <-> R1.2 - C2.1 <-> R2.2 - C2.2 <-> Q2.3 <-> R3.2 - D1.1 <-> R4.1 - D1.2 <-> D2.2 - D2.1 <-> R2.1 + C1.+ <-> R4.2 + C1.- <-> R1.2 + C2.+ <-> R2.2 + C2.- <-> Q2.3 <-> R3.2 + D1.A <-> R4.1 + D1.K <-> D2.K + D2.A <-> R2.1 Q1.1 <-> Q2.1 diff --git a/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_excl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_incl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_comp_pcb_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/flatline_comp_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_comp_perf_excl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_comp_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_comp_perf_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/flatline_comp_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_comp_perf_incl_switches.txt index 42014b4b3..b2fcd9aa6 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_comp_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_comp_perf_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 - C2.2 <-> C4.2 <-> D5.1 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.2 <-> R4.1 + C2.- <-> C4.- <-> D5.A <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R9.1 - C4.1 <-> D5.2 <-> IC1.5 <-> R3.1 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.K <-> IC1.5 <-> R3.1 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.2 <-> R8.2 IC1.7 <-> R5.2 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_excl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_incl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_pcb_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_excl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_incl_switches.txt index 89d9ac7ea..3f5c342f7 100644 --- a/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flatline_compressor_condensed_perf_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> IC1.3 <-> R2.2 - C2.1 <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 - C2.2 <-> C4.2 <-> D5.2 <-> IC1.4 <-> R1.2 <-> R4.2 + C2.+ <-> IC1.8 <-> R2.1 <-> R3.1 <-> R4.1 + C2.- <-> C4.- <-> D5.K <-> IC1.4 <-> R1.2 <-> R4.2 C3.1 <-> IC1.1 <-> R6.1 <-> R7.2 <-> R9.1 - C4.1 <-> D5.1 <-> IC1.5 <-> R3.2 - C5.1 <-> D1.2 <-> D3.2 - C5.2 <-> D2.1 <-> D4.1 - D1.1 <-> D2.2 <-> IC1.6 <-> R5.1 - D3.1 <-> D4.2 <-> R9.2 + C4.+ <-> D5.A <-> IC1.5 <-> R3.2 + C5.1 <-> D1.K <-> D3.K + C5.2 <-> D2.A <-> D4.A + D1.A <-> D2.K <-> IC1.6 <-> R5.1 + D3.A <-> D4.K <-> R9.2 IC1.2 <-> R7.1 <-> R8.2 IC1.7 <-> R5.2 <-> R6.2 diff --git a/diylc-regression-data/input/v1/netlist/flexi_clip_excl_switches.txt b/diylc-regression-data/input/v1/netlist/flexi_clip_excl_switches.txt index f9dac94d0..7feb0eb37 100644 --- a/diylc-regression-data/input/v1/netlist/flexi_clip_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flexi_clip_excl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D2.2 <-> D9.1 <-> Ge1.2 <-> Q2.1 <-> Q2.3 <-> Re1.2 <-> Si1.2 <-> Si2.1 - Ge4.1 <-> Q1.1 <-> Q1.3 + D2.K <-> D9.A <-> Ge1.K <-> Q2.1 <-> Q2.3 <-> Re1.K <-> Si1.K <-> Si2.A + Ge4.A <-> Q1.1 <-> Q1.3 diff --git a/diylc-regression-data/input/v1/netlist/flexi_clip_incl_switches.txt b/diylc-regression-data/input/v1/netlist/flexi_clip_incl_switches.txt index f9dac94d0..7feb0eb37 100644 --- a/diylc-regression-data/input/v1/netlist/flexi_clip_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/flexi_clip_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D2.2 <-> D9.1 <-> Ge1.2 <-> Q2.1 <-> Q2.3 <-> Re1.2 <-> Si1.2 <-> Si2.1 - Ge4.1 <-> Q1.1 <-> Q1.3 + D2.K <-> D9.A <-> Ge1.K <-> Q2.1 <-> Q2.3 <-> Re1.K <-> Si1.K <-> Si2.A + Ge4.A <-> Q1.1 <-> Q1.3 diff --git a/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_excl_switches.txt b/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_excl_switches.txt index 8c8f9d792..36f4ac5c3 100644 --- a/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R6.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R6.1 C3.1 <-> Q2.3 <-> R9.1 C3.2 <-> R10.2 - C4.1 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 - C4.2 <-> R8.2 - C5.1 <-> R10.1 <-> R12.1 <-> R9.2 - C5.2 <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 - C7.1 <-> R11.2 - D1.2 <-> R12.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 + C4.- <-> R8.2 + C5.+ <-> R10.1 <-> R12.1 <-> R9.2 + C5.- <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 + C7.+ <-> R11.2 + D1.K <-> R12.2 Q1.3 <-> R2.2 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_incl_switches.txt b/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_incl_switches.txt index 8c8f9d792..36f4ac5c3 100644 --- a/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/folk_fuzz_3_5_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R6.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R6.1 C3.1 <-> Q2.3 <-> R9.1 C3.2 <-> R10.2 - C4.1 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 - C4.2 <-> R8.2 - C5.1 <-> R10.1 <-> R12.1 <-> R9.2 - C5.2 <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 - C7.1 <-> R11.2 - D1.2 <-> R12.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R7.1 + C4.- <-> R8.2 + C5.+ <-> R10.1 <-> R12.1 <-> R9.2 + C5.- <-> Q3.1 <-> Q3.2 <-> R1.1 <-> R3.1 <-> R5.2 <-> R6.2 <-> R7.2 <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 <-> R11.1 + C7.+ <-> R11.2 + D1.K <-> R12.2 Q1.3 <-> R2.2 <-> R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/folk_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/folk_fuzz_excl_switches.txt index adaf6d3f9..6120c2ff1 100644 --- a/diylc-regression-data/input/v1/netlist/folk_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/folk_fuzz_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> R10.2 <-> R4.1 <-> R7.1 - C2.2 <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C3.2 <-> R6.1 + C2.+ <-> R10.2 <-> R4.1 <-> R7.1 + C2.- <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C3.- <-> R6.1 C4.1 <-> Q2.3 <-> R4.2 - C4.2 <-> C6.1 <-> R7.2 - C5.1 <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 - C5.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 - D1.2 <-> R10.1 + C4.2 <-> C6.+ <-> R7.2 + C5.+ <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 + C5.- <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 + D1.K <-> R10.1 Q1.3 <-> R2.2 <-> R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/folk_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/folk_fuzz_incl_switches.txt index adaf6d3f9..6120c2ff1 100644 --- a/diylc-regression-data/input/v1/netlist/folk_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/folk_fuzz_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R2.1 - C2.1 <-> R10.2 <-> R4.1 <-> R7.1 - C2.2 <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C3.2 <-> R6.1 + C2.+ <-> R10.2 <-> R4.1 <-> R7.1 + C2.- <-> Q3.1 <-> Q3.2 <-> R1.2 <-> R11.2 <-> R3.2 <-> R5.2 <-> R6.2 <-> R8.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C3.- <-> R6.1 C4.1 <-> Q2.3 <-> R4.2 - C4.2 <-> C6.1 <-> R7.2 - C5.1 <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 - C5.2 <-> R8.1 - C6.2 <-> Q3.3 <-> Q4.2 <-> Q4.3 - D1.2 <-> R10.1 + C4.2 <-> C6.+ <-> R7.2 + C5.+ <-> Q2.1 <-> Q2.2 <-> R11.1 <-> R9.2 + C5.- <-> R8.1 + C6.- <-> Q3.3 <-> Q4.2 <-> Q4.3 + D1.K <-> R10.1 Q1.3 <-> R2.2 <-> R3.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt index 143f82676..b20e72e2d 100644 --- a/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt @@ -1,6 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + 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 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt index 143f82676..b20e72e2d 100644 --- a/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt @@ -1,6 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + 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 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt index cc44601b5..272011859 100644 --- a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt @@ -1,9 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C1.- <-> C4.2 <-> C6.- <-> 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.+ <-> Q2.2 <-> Q2.3 <-> R5.1 VR1.3 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt index cc44601b5..272011859 100644 --- a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt @@ -1,9 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C1.- <-> C4.2 <-> C6.- <-> 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.+ <-> Q2.2 <-> Q2.3 <-> R5.1 VR1.3 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt index cc44601b5..272011859 100644 --- a/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt @@ -1,9 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C1.- <-> C4.2 <-> C6.- <-> 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.+ <-> Q2.2 <-> Q2.3 <-> R5.1 VR1.3 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt index cc44601b5..272011859 100644 --- a/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt @@ -1,9 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> Q1.2 <-> Q1.3 <-> R2.1 + C1.- <-> C4.2 <-> C6.- <-> 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.+ <-> Q2.2 <-> Q2.3 <-> R5.1 VR1.3 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/gainy_ruby_excl_switches.txt b/diylc-regression-data/input/v1/netlist/gainy_ruby_excl_switches.txt index a1ee3e25d..f6f7eabac 100644 --- a/diylc-regression-data/input/v1/netlist/gainy_ruby_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/gainy_ruby_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 <-> R6.1 - C1.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C1.+ <-> IC1.7 <-> Q1.1 <-> R6.1 + C1.- <-> C5.1 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2 C3.2 <-> IC1.6 - C4.1 <-> IC1.8 <-> R5.2 + C4.+ <-> IC1.8 <-> R5.2 C5.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/gainy_ruby_incl_switches.txt b/diylc-regression-data/input/v1/netlist/gainy_ruby_incl_switches.txt index a1ee3e25d..f6f7eabac 100644 --- a/diylc-regression-data/input/v1/netlist/gainy_ruby_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/gainy_ruby_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 <-> R6.1 - C1.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C1.+ <-> IC1.7 <-> Q1.1 <-> R6.1 + C1.- <-> C5.1 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2 C3.2 <-> IC1.6 - C4.1 <-> IC1.8 <-> R5.2 + C4.+ <-> IC1.8 <-> R5.2 C5.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt b/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt index dfe3757c4..aa4e79fad 100644 --- a/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> C5.2 <-> D1.K <-> IC1.2 <-> IC1.6 <-> R5.2 + C1.- <-> C2.1 <-> C4.- <-> C7.1 <-> C8.1 <-> D1.A <-> D2.A <-> D4.K <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 + C2.2 <-> C3.1 <-> R1.2 + C3.2 <-> R2.2 + C4.+ <-> R3.1 <-> R4.2 <-> R5.1 + C5.1 <-> C6.+ <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1 + C6.- <-> R7.2 C8.2 <-> R8.1 + D2.K <-> D3.A <-> R7.1 + D3.K <-> D4.A + IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt b/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt index dfe3757c4..aa4e79fad 100644 --- a/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> C5.2 <-> D1.K <-> IC1.2 <-> IC1.6 <-> R5.2 + C1.- <-> C2.1 <-> C4.- <-> C7.1 <-> C8.1 <-> D1.A <-> D2.A <-> D4.K <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 + C2.2 <-> C3.1 <-> R1.2 + C3.2 <-> R2.2 + C4.+ <-> R3.1 <-> R4.2 <-> R5.1 + C5.1 <-> C6.+ <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1 + C6.- <-> R7.2 C8.2 <-> R8.1 + D2.K <-> D3.A <-> R7.1 + D3.K <-> D4.A + IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt index d4ca9ae7b..903e75235 100644 --- a/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt @@ -1,12 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1 + C1.2 <-> C5.- <-> D1.A <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1 C2.2 <-> R2.2 <-> R3.1 - C3.1 <-> R6.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 + C3.+ <-> R6.2 + C3.- <-> R4.2 + C4.+ <-> R7.2 + C4.- <-> R5.2 + C5.+ <-> D1.K <-> D2.K <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2 + D2.A <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2 + Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt index d4ca9ae7b..903e75235 100644 --- a/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt @@ -1,12 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1 + C1.2 <-> C5.- <-> D1.A <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1 C2.2 <-> R2.2 <-> R3.1 - C3.1 <-> R6.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 + C3.+ <-> R6.2 + C3.- <-> R4.2 + C4.+ <-> R7.2 + C4.- <-> R5.2 + C5.+ <-> D1.K <-> D2.K <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2 + D2.A <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2 + Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt index 189e22fdc..c0b286c92 100644 --- a/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> 10k.2 .001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2 @@ -6,7 +6,7 @@ Switch setup: [Default] .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 + 10K.1 <-> 22uf.+ <-> 4.7K.2 <-> 47K.1 + 1K.1 <-> 1K.1 <-> 22uf.- <-> Q1.1 <-> Q1.2 1uf.1 <-> 4.7k.1 diff --git a/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt index 189e22fdc..c0b286c92 100644 --- a/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] .001.1 <-> 10k.2 .001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2 @@ -6,7 +6,7 @@ Switch setup: [Default] .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 + 10K.1 <-> 22uf.+ <-> 4.7K.2 <-> 47K.1 + 1K.1 <-> 1K.1 <-> 22uf.- <-> Q1.1 <-> Q1.2 1uf.1 <-> 4.7k.1 diff --git a/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt b/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt index 0177014f5..d175e4ecc 100644 --- a/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> R3.2 + C2.1 <-> C3.1 <-> D1.A <-> D2.K <-> IC1.2 <-> R6.1 + C2.2 <-> R5.1 + C3.2 <-> C4.2 <-> D1.K <-> D2.A <-> IC1.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 diff --git a/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt b/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt index 0177014f5..d175e4ecc 100644 --- a/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> R3.2 + C2.1 <-> C3.1 <-> D1.A <-> D2.K <-> IC1.2 <-> R6.1 + C2.2 <-> R5.1 + C3.2 <-> C4.2 <-> D1.K <-> D2.A <-> IC1.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 diff --git a/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_excl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_incl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/harmonic_speculator_pcb_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_excl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_incl_switches.txt index 10b7918b8..b577bde61 100644 --- a/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/harmonic_speculator_perf_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> C5.2 <-> R1.2 <-> R2.1 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> R3.2 <-> R4.2 - C4.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 - C4.2 <-> D1.1 <-> R4.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C4.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 + C4.- <-> D1.A <-> R4.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A + D2.K <-> R5.1 Q2.2 <-> Q2.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt index bb43d2cae..93f21031f 100644 --- a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1458.1 <-> C4.2 <-> D2.1 <-> Gain (R9).2 <-> Q1.3 <-> R7.1 - 1458.2 <-> C4.1 <-> D1.1 <-> Gain (R9).3 <-> R5.1 + 1458.1 <-> C4.2 <-> D2.A <-> Gain (R9).2 <-> Q1.3 <-> R7.1 + 1458.2 <-> C4.1 <-> D1.A <-> Gain (R9).1 <-> R5.1 1458.3 <-> C3.1 <-> R4.2 - 1458.4 <-> C1.2 <-> C2.2 <-> C6.2 <-> R2.1 <-> R3.2 <-> Volume (R11).3 - 1458.5 <-> C1.1 <-> R1.1 + 1458.4 <-> C1.- <-> C2.- <-> C6.2 <-> R2.1 <-> R3.2 <-> Volume (R11).1 + 1458.5 <-> C1.+ <-> R1.1 1458.6 <-> 1458.7 <-> C7.2 - 1458.8 <-> C6.1 <-> Tone (R8).1 - C2.1 <-> C5.1 <-> R1.2 <-> R2.2 <-> R4.1 + 1458.8 <-> C6.1 <-> Tone (R8).3 + C2.+ <-> C5.1 <-> R1.2 <-> R2.2 <-> R4.1 C3.2 <-> R3.1 - C5.2 <-> Voice (R6).1 + C5.2 <-> Voice (R6).3 C7.1 <-> R10.1 - D1.2 <-> Q1.1 <-> Q1.2 - D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 - R10.2 <-> Volume (R11).1 + D1.K <-> Q1.1 <-> Q1.2 + D2.K <-> Q2.1 <-> Q2.2 <-> Q2.3 + R10.2 <-> Volume (R11).3 R5.2 <-> Voice (R6).2 R7.2 <-> Tone (R8).2 diff --git a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt index bb43d2cae..93f21031f 100644 --- a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt @@ -1,19 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 1458.1 <-> C4.2 <-> D2.1 <-> Gain (R9).2 <-> Q1.3 <-> R7.1 - 1458.2 <-> C4.1 <-> D1.1 <-> Gain (R9).3 <-> R5.1 + 1458.1 <-> C4.2 <-> D2.A <-> Gain (R9).2 <-> Q1.3 <-> R7.1 + 1458.2 <-> C4.1 <-> D1.A <-> Gain (R9).1 <-> R5.1 1458.3 <-> C3.1 <-> R4.2 - 1458.4 <-> C1.2 <-> C2.2 <-> C6.2 <-> R2.1 <-> R3.2 <-> Volume (R11).3 - 1458.5 <-> C1.1 <-> R1.1 + 1458.4 <-> C1.- <-> C2.- <-> C6.2 <-> R2.1 <-> R3.2 <-> Volume (R11).1 + 1458.5 <-> C1.+ <-> R1.1 1458.6 <-> 1458.7 <-> C7.2 - 1458.8 <-> C6.1 <-> Tone (R8).1 - C2.1 <-> C5.1 <-> R1.2 <-> R2.2 <-> R4.1 + 1458.8 <-> C6.1 <-> Tone (R8).3 + C2.+ <-> C5.1 <-> R1.2 <-> R2.2 <-> R4.1 C3.2 <-> R3.1 - C5.2 <-> Voice (R6).1 + C5.2 <-> Voice (R6).3 C7.1 <-> R10.1 - D1.2 <-> Q1.1 <-> Q1.2 - D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 - R10.2 <-> Volume (R11).1 + D1.K <-> Q1.1 <-> Q1.2 + D2.K <-> Q2.1 <-> Q2.2 <-> Q2.3 + R10.2 <-> Volume (R11).3 R5.2 <-> Voice (R6).2 R7.2 <-> Tone (R8).2 diff --git a/diylc-regression-data/input/v1/netlist/hot_harmonics_excl_switches.txt b/diylc-regression-data/input/v1/netlist/hot_harmonics_excl_switches.txt index b83674399..0f2f2bf06 100644 --- a/diylc-regression-data/input/v1/netlist/hot_harmonics_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hot_harmonics_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.1 <-> R1.1 - C10.1 <-> C9.1 <-> IC1.2 <-> R7.2 - C11.1 <-> IC1.1 <-> R8.1 - C11.2 <-> C2.2 <-> C4.2 <-> IC1.11 <-> IC1.14 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.1 <-> R6.1 + C10.+ <-> C9.1 <-> IC1.2 <-> R7.2 + C11.+ <-> IC1.1 <-> R8.1 + C11.- <-> C2.2 <-> C4.- <-> IC1.11 <-> IC1.14 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.1 <-> R6.1 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C4.1 <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> Q1.2 <-> Q1.3 <-> R2.1 C5.1 <-> IC1.16 <-> R3.2 <-> R7.1 C5.2 <-> C6.2 <-> IC1.15 C6.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/hot_harmonics_incl_switches.txt b/diylc-regression-data/input/v1/netlist/hot_harmonics_incl_switches.txt index b83674399..0f2f2bf06 100644 --- a/diylc-regression-data/input/v1/netlist/hot_harmonics_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/hot_harmonics_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> C2.1 <-> R1.1 - C10.1 <-> C9.1 <-> IC1.2 <-> R7.2 - C11.1 <-> IC1.1 <-> R8.1 - C11.2 <-> C2.2 <-> C4.2 <-> IC1.11 <-> IC1.14 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.1 <-> R6.1 + C10.+ <-> C9.1 <-> IC1.2 <-> R7.2 + C11.+ <-> IC1.1 <-> R8.1 + C11.- <-> C2.2 <-> C4.- <-> IC1.11 <-> IC1.14 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.1 <-> R6.1 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C4.1 <-> Q1.2 <-> Q1.3 <-> R2.1 + C4.+ <-> Q1.2 <-> Q1.3 <-> R2.1 C5.1 <-> IC1.16 <-> R3.2 <-> R7.1 C5.2 <-> C6.2 <-> IC1.15 C6.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_excl_switches.txt index 683a660fa..5a6689b9b 100644 --- a/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_excl_switches.txt @@ -1,28 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R1.1 <-> R7.2 C1.2 <-> IC1.2 <-> IC1.7 <-> R2.2 <-> R5.1 <-> R6.1 C10.2 <-> Level.2 - C11.1 <-> D3.2 <-> IC1.5 <-> IC2.5 <-> R19.1 <-> R9.1 - C11.2 <-> C12.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> Level.3 <-> R18.1 <-> R20.2 - C12.1 <-> R19.2 <-> R20.1 + C11.+ <-> D3.K <-> IC1.5 <-> IC2.5 <-> R19.1 <-> R9.1 + C11.- <-> C12.- <-> C6.- <-> C7.- <-> C9.1 <-> D3.A <-> IC1.4 <-> IC2.4 <-> Level.1 <-> R18.1 <-> R20.2 + C12.+ <-> R19.2 <-> R20.1 C2.1 <-> C3.2 <-> IC1.3 <-> R2.1 <-> R4.1 C2.2 <-> IC1.6 <-> Tone.2 C3.1 <-> R11.2 C4.2 <-> R13.2 - C5.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> Dst.2 <-> IC2.6 - C5.2 <-> D1.2 <-> D2.2 <-> Dst.3 <-> IC2.7 <-> R14.1 <-> R15.2 - C6.1 <-> R14.2 - C7.1 <-> R15.1 - C8.2 <-> R16.2 + C5.1 <-> C8.+ <-> D1.A <-> D2.A <-> Dst.2 <-> IC2.6 + C5.2 <-> D1.K <-> D2.K <-> Dst.1 <-> IC2.7 <-> R14.1 <-> R15.2 + C6.+ <-> R14.2 + C7.+ <-> R15.1 + C8.- <-> R16.2 C9.2 <-> R16.1 <-> R17.2 <-> R18.2 IC1.8 <-> R1.2 <-> R3.1 <-> R5.2 IC2.1 <-> IC2.2 <-> R10.1 <-> R11.1 IC2.3 <-> R12.1 <-> R13.1 IC2.8 <-> R7.1 <-> R8.1 - Level.1 <-> R17.1 + Level.3 <-> R17.1 Q1.1 <-> R8.2 <-> R9.2 Q1.2 <-> Q1.3 <-> R10.2 R12.2 <-> R3.2 <-> R4.2 - R6.2 <-> Tone.3 + R6.2 <-> Tone.1 diff --git a/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_incl_switches.txt index 683a660fa..5a6689b9b 100644 --- a/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ibanez_cyberdrive_incl_switches.txt @@ -1,28 +1,28 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R1.1 <-> R7.2 C1.2 <-> IC1.2 <-> IC1.7 <-> R2.2 <-> R5.1 <-> R6.1 C10.2 <-> Level.2 - C11.1 <-> D3.2 <-> IC1.5 <-> IC2.5 <-> R19.1 <-> R9.1 - C11.2 <-> C12.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> D3.1 <-> IC1.4 <-> IC2.4 <-> Level.3 <-> R18.1 <-> R20.2 - C12.1 <-> R19.2 <-> R20.1 + C11.+ <-> D3.K <-> IC1.5 <-> IC2.5 <-> R19.1 <-> R9.1 + C11.- <-> C12.- <-> C6.- <-> C7.- <-> C9.1 <-> D3.A <-> IC1.4 <-> IC2.4 <-> Level.1 <-> R18.1 <-> R20.2 + C12.+ <-> R19.2 <-> R20.1 C2.1 <-> C3.2 <-> IC1.3 <-> R2.1 <-> R4.1 C2.2 <-> IC1.6 <-> Tone.2 C3.1 <-> R11.2 C4.2 <-> R13.2 - C5.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> Dst.2 <-> IC2.6 - C5.2 <-> D1.2 <-> D2.2 <-> Dst.3 <-> IC2.7 <-> R14.1 <-> R15.2 - C6.1 <-> R14.2 - C7.1 <-> R15.1 - C8.2 <-> R16.2 + C5.1 <-> C8.+ <-> D1.A <-> D2.A <-> Dst.2 <-> IC2.6 + C5.2 <-> D1.K <-> D2.K <-> Dst.1 <-> IC2.7 <-> R14.1 <-> R15.2 + C6.+ <-> R14.2 + C7.+ <-> R15.1 + C8.- <-> R16.2 C9.2 <-> R16.1 <-> R17.2 <-> R18.2 IC1.8 <-> R1.2 <-> R3.1 <-> R5.2 IC2.1 <-> IC2.2 <-> R10.1 <-> R11.1 IC2.3 <-> R12.1 <-> R13.1 IC2.8 <-> R7.1 <-> R8.1 - Level.1 <-> R17.1 + Level.3 <-> R17.1 Q1.1 <-> R8.2 <-> R9.2 Q1.2 <-> Q1.3 <-> R10.2 R12.2 <-> R3.2 <-> R4.2 - R6.2 <-> Tone.3 + R6.2 <-> Tone.1 diff --git a/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt index 4acd6c763..35a601b10 100644 --- a/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> IC1.3 <-> R1.1 <-> R2.2 + C2.+ <-> IC1.2 <-> IC1.7 IC1.4 <-> IC1.8 <-> R1.2 + IC1.6 <-> R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt index 4acd6c763..35a601b10 100644 --- a/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> IC1.3 <-> R1.1 <-> R2.2 + C2.+ <-> IC1.2 <-> IC1.7 IC1.4 <-> IC1.8 <-> R1.2 + IC1.6 <-> R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/j201_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/j201_preamp_excl_switches.txt index ef177002c..434cacd36 100644 --- a/diylc-regression-data/input/v1/netlist/j201_preamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/j201_preamp_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> P1.1 <-> R4.1 + C1.- <-> P1.3 <-> R4.1 Q1.1 <-> R2.1 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/j201_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/j201_preamp_incl_switches.txt index ef177002c..434cacd36 100644 --- a/diylc-regression-data/input/v1/netlist/j201_preamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/j201_preamp_incl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> P1.1 <-> R4.1 + C1.- <-> P1.3 <-> R4.1 Q1.1 <-> R2.1 R1.2 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/javaboost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/javaboost_excl_switches.txt index b5d8b5c5f..8b7c065cb 100644 --- a/diylc-regression-data/input/v1/netlist/javaboost_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/javaboost_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C2.2 <-> Q1.3 C3.2 <-> R2.1 <-> Rb.2 - C5.2 <-> Q1.1 <-> Re.2 + C5.- <-> Q1.1 <-> Re.2 C6.2 <-> R1.2 C7.1 <-> R3.1 Rb.1 <-> Rv.1 diff --git a/diylc-regression-data/input/v1/netlist/javaboost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/javaboost_incl_switches.txt index b5d8b5c5f..8b7c065cb 100644 --- a/diylc-regression-data/input/v1/netlist/javaboost_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/javaboost_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C2.2 <-> Q1.3 C3.2 <-> R2.1 <-> Rb.2 - C5.2 <-> Q1.1 <-> Re.2 + C5.- <-> Q1.1 <-> Re.2 C6.2 <-> R1.2 C7.1 <-> R3.1 Rb.1 <-> Rv.1 diff --git a/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt index c5108543f..245a899ab 100644 --- a/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt @@ -1,6 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2 - 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 + C1.+ <-> C1.- <-> C2.- <-> D1.A <-> D2.A <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2 + C2.+ <-> R2.1 + C3.1 <-> D1.K <-> D2.K <-> D3.A + C3.2 <-> R4.1 + D3.K <-> R3.1 + Q1.2 <-> Q1.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt index c5108543f..245a899ab 100644 --- a/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt @@ -1,6 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2 - 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 + C1.+ <-> C1.- <-> C2.- <-> D1.A <-> D2.A <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2 + C2.+ <-> R2.1 + C3.1 <-> D1.K <-> D2.K <-> D3.A + C3.2 <-> R4.1 + D3.K <-> R3.1 + Q1.2 <-> Q1.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt index a6343b9e5..ee25f16b3 100644 --- a/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt @@ -1,8 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1 - D3.2 <-> R1.1 <-> R2.1 + C1.1 <-> D1.K <-> D2.K <-> D3.A + C1.2 <-> R3.1 + C2.+ <-> VR1.2 + C2.- <-> C3.- <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1 + C3.+ <-> IC.1 + D1.A <-> IC.4 + D2.A <-> IC.6 + D3.K <-> R2.1 + IC.3 <-> Q1.1 + Q1.2 <-> Q1.3 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt index a6343b9e5..ee25f16b3 100644 --- a/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt @@ -1,8 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1 - D3.2 <-> R1.1 <-> R2.1 + C1.1 <-> D1.K <-> D2.K <-> D3.A + C1.2 <-> R3.1 + C2.+ <-> VR1.2 + C2.- <-> C3.- <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1 + C3.+ <-> IC.1 + D1.A <-> IC.4 + D2.A <-> IC.6 + D3.K <-> R2.1 + IC.3 <-> Q1.1 + Q1.2 <-> Q1.3 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/jcm800_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jcm800_excl_switches.txt index edf3f5d7b..5498ec854 100644 --- a/diylc-regression-data/input/v1/netlist/jcm800_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jcm800_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C12.1 <-> Q6.1 <-> VR5.1 C12.2 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/jcm800_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jcm800_incl_switches.txt index edf3f5d7b..5498ec854 100644 --- a/diylc-regression-data/input/v1/netlist/jcm800_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jcm800_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C12.1 <-> Q6.1 <-> VR5.1 C12.2 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/jd_obsidian_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jd_obsidian_excl_switches.txt index 273c4f4ae..4b4512b08 100644 --- a/diylc-regression-data/input/v1/netlist/jd_obsidian_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jd_obsidian_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R3.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 <-> Tone.1 - C10.2 <-> C2.1 <-> C5.1 <-> C7.1 <-> Gain.3 <-> R12.2 <-> R13.2 <-> R16.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R7.2 <-> R9.2 <-> Vol.3 - C2.2 <-> R4.1 + C10.1 <-> R17.2 <-> Tone.3 + C10.2 <-> C2.+ <-> C5.+ <-> C7.+ <-> Gain.1 <-> R12.2 <-> R13.2 <-> R16.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R7.2 <-> R9.2 <-> Vol.1 + C2.- <-> R4.1 C3.1 <-> Q1.1 <-> R5.2 - C3.2 <-> Gain.1 + C3.2 <-> Gain.3 C4.1 <-> R6.1 C4.2 <-> Gain.2 - C5.2 <-> R9.1 + C5.- <-> R9.1 C6.1 <-> Q2.1 <-> R10.2 C6.2 <-> R11.1 - C7.2 <-> R13.1 + C7.- <-> R13.1 C8.1 <-> Q3.1 <-> R15.2 C8.2 <-> C9.1 <-> R17.1 - C9.2 <-> R16.1 <-> Tone.3 + C9.2 <-> R16.1 <-> Tone.1 Q2.2 <-> Q2.3 <-> R6.2 <-> R7.1 <-> R8.2 Q3.2 <-> Q3.3 <-> R11.2 <-> R12.1 <-> R14.2 R1.1 <-> R10.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 - Tone.2 <-> Vol.1 + Tone.2 <-> Vol.3 diff --git a/diylc-regression-data/input/v1/netlist/jd_obsidian_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jd_obsidian_incl_switches.txt index 273c4f4ae..4b4512b08 100644 --- a/diylc-regression-data/input/v1/netlist/jd_obsidian_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jd_obsidian_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R3.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 <-> Tone.1 - C10.2 <-> C2.1 <-> C5.1 <-> C7.1 <-> Gain.3 <-> R12.2 <-> R13.2 <-> R16.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R7.2 <-> R9.2 <-> Vol.3 - C2.2 <-> R4.1 + C10.1 <-> R17.2 <-> Tone.3 + C10.2 <-> C2.+ <-> C5.+ <-> C7.+ <-> Gain.1 <-> R12.2 <-> R13.2 <-> R16.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R7.2 <-> R9.2 <-> Vol.1 + C2.- <-> R4.1 C3.1 <-> Q1.1 <-> R5.2 - C3.2 <-> Gain.1 + C3.2 <-> Gain.3 C4.1 <-> R6.1 C4.2 <-> Gain.2 - C5.2 <-> R9.1 + C5.- <-> R9.1 C6.1 <-> Q2.1 <-> R10.2 C6.2 <-> R11.1 - C7.2 <-> R13.1 + C7.- <-> R13.1 C8.1 <-> Q3.1 <-> R15.2 C8.2 <-> C9.1 <-> R17.1 - C9.2 <-> R16.1 <-> Tone.3 + C9.2 <-> R16.1 <-> Tone.1 Q2.2 <-> Q2.3 <-> R6.2 <-> R7.1 <-> R8.2 Q3.2 <-> Q3.3 <-> R11.2 <-> R12.1 <-> R14.2 R1.1 <-> R10.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 - Tone.2 <-> Vol.1 + Tone.2 <-> Vol.3 diff --git a/diylc-regression-data/input/v1/netlist/jdha_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_pcb_excl_switches.txt index c31a40be4..bba22d1bf 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_pcb_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 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 + C2.+ <-> R8.2 + C2.- <-> 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 + C4.1 <-> C5.- <-> R11.1 C4.2 <-> R5.2 Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/jdha_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_pcb_incl_switches.txt index c31a40be4..bba22d1bf 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_pcb_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 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 + C2.+ <-> R8.2 + C2.- <-> 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 + C4.1 <-> C5.- <-> R11.1 C4.2 <-> R5.2 Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/jdha_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_perf_excl_switches.txt index c31a40be4..bba22d1bf 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_perf_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 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 + C2.+ <-> R8.2 + C2.- <-> 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 + C4.1 <-> C5.- <-> R11.1 C4.2 <-> R5.2 Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/jdha_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_perf_incl_switches.txt index c31a40be4..bba22d1bf 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_perf_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 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 + C2.+ <-> R8.2 + C2.- <-> 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 + C4.1 <-> C5.- <-> R11.1 C4.2 <-> R5.2 Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt index f8bc959bd..44dfe07e0 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt @@ -1,12 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2 + C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 + C2.+ <-> R8.2 + C2.- <-> 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.- <-> R11.1 C4.2 <-> R5.2 - C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 + Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 R3.1 <-> R4.2 + R7.1 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt index f8bc959bd..44dfe07e0 100644 --- a/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt @@ -1,12 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2 + C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 + C2.+ <-> R8.2 + C2.- <-> 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.- <-> R11.1 C4.2 <-> R5.2 - C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 + Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1 Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1 R3.1 <-> R4.2 + R7.1 <-> R8.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_excl_switches.txt index 07fdcd549..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R3.1 - C1.2 <-> IC1.4 <-> R2.2 <-> R3.2 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 IC1.2 <-> R2.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_incl_switches.txt index 07fdcd549..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R3.1 - C1.2 <-> IC1.4 <-> R2.2 <-> R3.2 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 IC1.2 <-> R2.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_excl_switches.txt index 07fdcd549..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R3.1 - C1.2 <-> IC1.4 <-> R2.2 <-> R3.2 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 IC1.2 <-> R2.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_incl_switches.txt index 07fdcd549..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R3.1 - C1.2 <-> IC1.4 <-> R2.2 <-> R3.2 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 IC1.2 <-> R2.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt index 328cd2b74..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 + IC1.2 <-> R2.1 + IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt index 328cd2b74..c15793c50 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.+ <-> IC1.3 <-> R1.2 <-> R3.1 + C1.- <-> IC1.4 <-> R2.2 <-> R3.2 + IC1.2 <-> R2.1 + IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt index cae53e94a..699966fc5 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt @@ -1,8 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1 - D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1 + C1.1 <-> R1.1 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C6.- <-> C8.- <-> 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.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.2 <-> Q2.3 <-> R8.1 + C7.1 <-> Q2.1 <-> R9.1 + C7.2 <-> R11.1 + C8.+ <-> Q3.2 <-> Q3.3 <-> R14.1 + C9.1 <-> Q3.1 <-> R13.1 + C9.2 <-> R16.1 + D1.A <-> R4.1 + D2.A <-> R10.1 + D3.A <-> R15.1 + D3.K <-> R11.2 <-> R12.1 R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 + R16.2 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt index cae53e94a..699966fc5 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt @@ -1,8 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1 - D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1 + C1.1 <-> R1.1 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C6.- <-> C8.- <-> 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.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.2 <-> Q2.3 <-> R8.1 + C7.1 <-> Q2.1 <-> R9.1 + C7.2 <-> R11.1 + C8.+ <-> Q3.2 <-> Q3.3 <-> R14.1 + C9.1 <-> Q3.1 <-> R13.1 + C9.2 <-> R16.1 + D1.A <-> R4.1 + D2.A <-> R10.1 + D3.A <-> R15.1 + D3.K <-> R11.2 <-> R12.1 R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 + R16.2 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_excl_switches.txt index 2143016bc..fb88ca230 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C10.1 <-> R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 - C10.2 <-> C2.2 <-> C6.2 <-> C8.2 <-> Gain.3 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.1 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.1 <-> Vol.3 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 + C1.2 <-> D1.K <-> R2.1 + C10.+ <-> R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 + C10.- <-> C2.- <-> C6.- <-> C8.- <-> Gain.1 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.1 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.1 <-> Vol.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 C3.1 <-> Q1.1 <-> R5.1 - C3.2 <-> Gain.1 + C3.2 <-> Gain.3 C4.1 <-> Gain.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.2 <-> Q2.3 <-> R8.2 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.2 <-> Q2.3 <-> R8.2 C7.1 <-> Q2.1 <-> R9.1 C7.2 <-> R11.1 - C8.1 <-> Q3.3 <-> R14.1 + C8.+ <-> Q3.3 <-> R14.1 C9.1 <-> Q3.1 <-> Q3.2 <-> R13.1 C9.2 <-> R16.2 - D1.1 <-> R4.1 - D2.1 <-> R10.1 - D3.1 <-> R15.1 - D3.2 <-> R11.2 <-> R12.1 - R16.1 <-> R17.2 <-> Vol.1 + D1.A <-> R4.1 + D2.A <-> R10.1 + D3.A <-> R15.1 + D3.K <-> R11.2 <-> R12.1 + R16.1 <-> R17.2 <-> Vol.3 diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_incl_switches.txt index 2143016bc..fb88ca230 100644 --- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_pcb_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C10.1 <-> R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 - C10.2 <-> C2.2 <-> C6.2 <-> C8.2 <-> Gain.3 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.1 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.1 <-> Vol.3 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 + C1.2 <-> D1.K <-> R2.1 + C10.+ <-> R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2 + C10.- <-> C2.- <-> C6.- <-> C8.- <-> Gain.1 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.1 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.1 <-> Vol.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 C3.1 <-> Q1.1 <-> R5.1 - C3.2 <-> Gain.1 + C3.2 <-> Gain.3 C4.1 <-> Gain.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.2 <-> Q2.3 <-> R8.2 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.2 <-> Q2.3 <-> R8.2 C7.1 <-> Q2.1 <-> R9.1 C7.2 <-> R11.1 - C8.1 <-> Q3.3 <-> R14.1 + C8.+ <-> Q3.3 <-> R14.1 C9.1 <-> Q3.1 <-> Q3.2 <-> R13.1 C9.2 <-> R16.2 - D1.1 <-> R4.1 - D2.1 <-> R10.1 - D3.1 <-> R15.1 - D3.2 <-> R11.2 <-> R12.1 - R16.1 <-> R17.2 <-> Vol.1 + D1.A <-> R4.1 + D2.A <-> R10.1 + D3.A <-> R15.1 + D3.K <-> R11.2 <-> R12.1 + R16.1 <-> R17.2 <-> Vol.3 diff --git a/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt index e54855cff..f5259bb67 100644 --- a/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2 + C1.2 <-> D1.K <-> D2.A + C2.1 <-> D1.A <-> D2.K <-> R2.1 <-> R4.2 C4.1 <-> R3.1 <-> R4.1 C4.2 <-> C5.2 <-> C6.2 <-> R1.2 C6.1 <-> Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt index e54855cff..f5259bb67 100644 --- a/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2 - C1.2 <-> D1.2 <-> D2.1 - C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2 + C1.2 <-> D1.K <-> D2.A + C2.1 <-> D1.A <-> D2.K <-> R2.1 <-> R4.2 C4.1 <-> R3.1 <-> R4.1 C4.2 <-> C5.2 <-> C6.2 <-> R1.2 C6.1 <-> Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt index 13b7d50bf..bf4c3c2fa 100644 --- a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> D1.2 <-> D2.1 <-> Q1.2 <-> Q1.3 <-> R3.2 + C1.1 <-> C3.1 <-> D1.K <-> D2.A <-> Q1.2 <-> Q1.3 <-> R3.2 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 <-> D2.2 + C4.1 <-> D1.A <-> D2.K C6.1 <-> Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt index 13b7d50bf..bf4c3c2fa 100644 --- a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> D1.2 <-> D2.1 <-> Q1.2 <-> Q1.3 <-> R3.2 + C1.1 <-> C3.1 <-> D1.K <-> D2.A <-> Q1.2 <-> Q1.3 <-> R3.2 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 <-> D2.2 + C4.1 <-> D1.A <-> D2.K C6.1 <-> Q1.1 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt index 7a0a72b0f..0e2adebe3 100644 --- a/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.1 <-> R4.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 - C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1 + C1.2 <-> R1.1 + C2.1 <-> Q2.3 <-> R4.1 <-> R5.2 + C2.2 <-> C3.- <-> P1.1 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R6.1 + C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1 + C4.2 <-> P1.3 + R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt index 7a0a72b0f..0e2adebe3 100644 --- a/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.1 <-> R4.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 - C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1 + C1.2 <-> R1.1 + C2.1 <-> Q2.3 <-> R4.1 <-> R5.2 + C2.2 <-> C3.- <-> P1.1 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> R6.1 + C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1 + C4.2 <-> P1.3 + R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_excl_switches.txt index c7ead1d67..26b30a3cc 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> D1.1 <-> D2.2 <-> Q2.1 <-> R2.2 + C2.1 <-> D1.A <-> D2.K <-> Q2.1 <-> R2.2 C2.2 <-> R3.1 <-> R4.2 C3.1 <-> Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 <-> R5.2 C3.2 <-> C4.2 <-> R4.1 <-> R5.1 <-> R6.2 - C4.1 <-> D1.2 <-> D2.1 + C4.1 <-> D1.K <-> D2.A diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_incl_switches.txt index c7ead1d67..26b30a3cc 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 - C2.1 <-> D1.1 <-> D2.2 <-> Q2.1 <-> R2.2 + C2.1 <-> D1.A <-> D2.K <-> Q2.1 <-> R2.2 C2.2 <-> R3.1 <-> R4.2 C3.1 <-> Q1.1 <-> Q1.2 <-> Q2.2 <-> Q2.3 <-> R5.2 C3.2 <-> C4.2 <-> R4.1 <-> R5.1 <-> R6.2 - C4.1 <-> D1.2 <-> D2.1 + C4.1 <-> D1.K <-> D2.A diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt index 2f6ac7fa9..b91089e4e 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> R2.2 <-> R4.1 + C2.2 <-> C5.- <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1 - C5.1 <-> R5.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1 + C4.1 <-> D1.A <-> D2.K + C5.+ <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt index 2f6ac7fa9..b91089e4e 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> R2.2 <-> R4.1 + C2.2 <-> C5.- <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1 - C5.1 <-> R5.2 + C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1 + C4.1 <-> D1.A <-> D2.K + C5.+ <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_excl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_incl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb2_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_excl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_incl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_excl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_incl_switches.txt index 84cc961ba..456c9098a 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf2_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R1.1 <-> R4.1 C2.1 <-> R3.2 <-> R4.2 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 C3.1 <-> C4.1 <-> R2.2 <-> R3.1 <-> R5.2 C3.2 <-> Q2.3 <-> R5.1 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_excl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_incl_switches.txt index d3a69e7b9..da96c4477 100644 --- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.3 <-> R3.2 <-> R4.2 C2.1 <-> R2.2 <-> R3.1 - C2.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.2 <-> D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R4.1 C3.1 <-> Q2.3 <-> R5.1 C3.2 <-> C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.1 <-> R5.2 - C4.2 <-> D1.1 <-> D2.2 + C4.2 <-> D1.A <-> D2.K diff --git a/diylc-regression-data/input/v1/netlist/klon_centaur_excl_switches.txt b/diylc-regression-data/input/v1/netlist/klon_centaur_excl_switches.txt index d922ea86c..d6372c21b 100644 --- a/diylc-regression-data/input/v1/netlist/klon_centaur_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/klon_centaur_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.2 C1.2 <-> IC1.3 <-> R10.1 @@ -7,29 +7,29 @@ Switch setup: [Default] C11.1 <-> C9.2 <-> IC2.7 <-> R14.2 <-> R16.2 <-> R18.2 <-> R19.1 C11.2 <-> IC2.6 <-> R19.2 <-> R20.2 <-> R21.1 C12.2 <-> IC2.2 <-> R21.2 <-> R22.1 - C13.1 <-> C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 - C13.2 <-> R1.2 <-> R2.1 - C14.1 <-> C2.1 <-> IC1.6 <-> R3.1 - C14.2 <-> R6.1 - C15.1 <-> IC3.4 - C15.2 <-> C16.2 <-> IC3.2 - C16.1 <-> D3.2 <-> D4.1 - C17.1 <-> D1.2 <-> D3.1 <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 - C17.2 <-> C18.1 <-> C19.2 <-> C20.2 <-> C21.2 <-> D2.1 <-> D5.2 <-> D6.1 <-> IC1.4 <-> IC3.3 <-> R13.2 <-> R2.2 <-> Ra.1 - C18.2 <-> IC2.4 <-> IC3.8 - C19.1 <-> D4.2 <-> IC2.5 + C13.+ <-> C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 + C13.- <-> R1.2 <-> R2.1 + C14.+ <-> C2.1 <-> IC1.6 <-> R3.1 + C14.- <-> R6.1 + C15.+ <-> IC3.4 + C15.- <-> C16.- <-> IC3.2 + C16.+ <-> D3.K <-> D4.A + C17.+ <-> D1.K <-> D3.A <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 + C17.- <-> C18.+ <-> C19.- <-> C20.- <-> C21.- <-> D2.A <-> D5.K <-> D6.A <-> IC1.4 <-> IC3.3 <-> R13.2 <-> R2.2 <-> Ra.1 + C18.- <-> IC2.4 <-> IC3.8 + C19.+ <-> D4.K <-> IC2.5 C2.2 <-> C4.2 <-> IC1.7 <-> R3.2 - C20.1 <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 - C21.1 <-> R12.2 <-> R14.1 - C22.1 <-> IC2.1 <-> R22.2 <-> R23.2 - C22.2 <-> R24.2 + C20.+ <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 + C21.+ <-> R12.2 <-> R14.1 + C22.+ <-> IC2.1 <-> R22.2 <-> R23.2 + C22.- <-> R24.2 C3.2 <-> C5.2 <-> R12.1 <-> R4.2 C4.1 <-> R5.2 C5.1 <-> IC1.8 <-> R4.1 C6.2 <-> C8.1 <-> R7.2 <-> R8.1 - C7.1 <-> D5.1 <-> D6.2 <-> R6.2 + C7.1 <-> D5.A <-> D6.K <-> R6.2 C8.2 <-> R9.1 C9.1 <-> R17.2 - D1.1 <-> D2.2 + D1.A <-> D2.K R15.1 <-> R16.1 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/klon_centaur_incl_switches.txt b/diylc-regression-data/input/v1/netlist/klon_centaur_incl_switches.txt index d922ea86c..d6372c21b 100644 --- a/diylc-regression-data/input/v1/netlist/klon_centaur_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/klon_centaur_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.2 C1.2 <-> IC1.3 <-> R10.1 @@ -7,29 +7,29 @@ Switch setup: [Default] C11.1 <-> C9.2 <-> IC2.7 <-> R14.2 <-> R16.2 <-> R18.2 <-> R19.1 C11.2 <-> IC2.6 <-> R19.2 <-> R20.2 <-> R21.1 C12.2 <-> IC2.2 <-> R21.2 <-> R22.1 - C13.1 <-> C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 - C13.2 <-> R1.2 <-> R2.1 - C14.1 <-> C2.1 <-> IC1.6 <-> R3.1 - C14.2 <-> R6.1 - C15.1 <-> IC3.4 - C15.2 <-> C16.2 <-> IC3.2 - C16.1 <-> D3.2 <-> D4.1 - C17.1 <-> D1.2 <-> D3.1 <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 - C17.2 <-> C18.1 <-> C19.2 <-> C20.2 <-> C21.2 <-> D2.1 <-> D5.2 <-> D6.1 <-> IC1.4 <-> IC3.3 <-> R13.2 <-> R2.2 <-> Ra.1 - C18.2 <-> IC2.4 <-> IC3.8 - C19.1 <-> D4.2 <-> IC2.5 + C13.+ <-> C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 + C13.- <-> R1.2 <-> R2.1 + C14.+ <-> C2.1 <-> IC1.6 <-> R3.1 + C14.- <-> R6.1 + C15.+ <-> IC3.4 + C15.- <-> C16.- <-> IC3.2 + C16.+ <-> D3.K <-> D4.A + C17.+ <-> D1.K <-> D3.A <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 + C17.- <-> C18.+ <-> C19.- <-> C20.- <-> C21.- <-> D2.A <-> D5.K <-> D6.A <-> IC1.4 <-> IC3.3 <-> R13.2 <-> R2.2 <-> Ra.1 + C18.- <-> IC2.4 <-> IC3.8 + C19.+ <-> D4.K <-> IC2.5 C2.2 <-> C4.2 <-> IC1.7 <-> R3.2 - C20.1 <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 - C21.1 <-> R12.2 <-> R14.1 - C22.1 <-> IC2.1 <-> R22.2 <-> R23.2 - C22.2 <-> R24.2 + C20.+ <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 + C21.+ <-> R12.2 <-> R14.1 + C22.+ <-> IC2.1 <-> R22.2 <-> R23.2 + C22.- <-> R24.2 C3.2 <-> C5.2 <-> R12.1 <-> R4.2 C4.1 <-> R5.2 C5.1 <-> IC1.8 <-> R4.1 C6.2 <-> C8.1 <-> R7.2 <-> R8.1 - C7.1 <-> D5.1 <-> D6.2 <-> R6.2 + C7.1 <-> D5.A <-> D6.K <-> R6.2 C8.2 <-> R9.1 C9.1 <-> R17.2 - D1.1 <-> D2.2 + D1.A <-> D2.K R15.1 <-> R16.1 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_excl_switches.txt index a0583c083..95df8dc5e 100644 --- a/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 C1.2 <-> IC1.3 <-> R10.1 @@ -7,28 +7,28 @@ Switch setup: [Default] C11.1 <-> C9.2 <-> IC2.7 <-> R14.2 <-> R16.2 <-> R18.2 <-> R19.1 C11.2 <-> IC2.6 <-> R19.2 <-> R20.1 <-> R21.1 C12.2 <-> IC2.2 <-> R21.2 <-> R22.2 - C14.1 <-> C2.1 <-> IC1.6 <-> R3.1 - C14.2 <-> R6.1 - C15.1 <-> IC3.4 - C15.2 <-> C16.2 <-> IC3.2 - C16.1 <-> D3.2 <-> D4.1 - C17.1 <-> D1.2 <-> D3.1 <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 - C17.2 <-> C18.1 <-> C19.2 <-> C20.2 <-> C21.2 <-> D2.1 <-> D5.2 <-> D6.1 <-> IC1.4 <-> IC3.3 <-> R13.2 <-> Ra.2 - C18.2 <-> IC2.4 <-> IC3.8 - C19.1 <-> D4.2 <-> IC2.5 + C14.+ <-> C2.1 <-> IC1.6 <-> R3.1 + C14.- <-> R6.1 + C15.+ <-> IC3.4 + C15.- <-> C16.- <-> IC3.2 + C16.+ <-> D3.K <-> D4.A + C17.+ <-> D1.K <-> D3.A <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 + C17.- <-> C18.+ <-> C19.- <-> C20.- <-> C21.- <-> D2.A <-> D5.K <-> D6.A <-> IC1.4 <-> IC3.3 <-> R13.2 <-> Ra.2 + C18.- <-> IC2.4 <-> IC3.8 + C19.+ <-> D4.K <-> IC2.5 C2.2 <-> C4.2 <-> IC1.7 <-> R3.2 - C20.1 <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 - C21.1 <-> R12.2 <-> R14.1 - C22.1 <-> IC2.1 <-> R22.1 <-> R23.2 - C22.2 <-> R24.2 + C20.+ <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 + C21.+ <-> R12.2 <-> R14.1 + C22.+ <-> IC2.1 <-> R22.1 <-> R23.2 + C22.- <-> R24.2 C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 C3.2 <-> C5.2 <-> R12.1 <-> R4.2 C4.1 <-> R5.2 C5.1 <-> IC1.8 <-> R4.1 C6.2 <-> C8.1 <-> R7.2 <-> R8.1 - C7.1 <-> D5.1 <-> D6.2 <-> R6.2 + C7.1 <-> D5.A <-> D6.K <-> R6.2 C8.2 <-> R9.1 C9.1 <-> R17.2 - D1.1 <-> D2.2 + D1.A <-> D2.K R15.1 <-> R16.1 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_incl_switches.txt index a0583c083..95df8dc5e 100644 --- a/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/klon_centaur_true_bypass_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 C1.2 <-> IC1.3 <-> R10.1 @@ -7,28 +7,28 @@ Switch setup: [Default] C11.1 <-> C9.2 <-> IC2.7 <-> R14.2 <-> R16.2 <-> R18.2 <-> R19.1 C11.2 <-> IC2.6 <-> R19.2 <-> R20.1 <-> R21.1 C12.2 <-> IC2.2 <-> R21.2 <-> R22.2 - C14.1 <-> C2.1 <-> IC1.6 <-> R3.1 - C14.2 <-> R6.1 - C15.1 <-> IC3.4 - C15.2 <-> C16.2 <-> IC3.2 - C16.1 <-> D3.2 <-> D4.1 - C17.1 <-> D1.2 <-> D3.1 <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 - C17.2 <-> C18.1 <-> C19.2 <-> C20.2 <-> C21.2 <-> D2.1 <-> D5.2 <-> D6.1 <-> IC1.4 <-> IC3.3 <-> R13.2 <-> Ra.2 - C18.2 <-> IC2.4 <-> IC3.8 - C19.1 <-> D4.2 <-> IC2.5 + C14.+ <-> C2.1 <-> IC1.6 <-> R3.1 + C14.- <-> R6.1 + C15.+ <-> IC3.4 + C15.- <-> C16.- <-> IC3.2 + C16.+ <-> D3.K <-> D4.A + C17.+ <-> D1.K <-> D3.A <-> IC1.5 <-> IC3.1 <-> IC3.5 <-> R11.1 + C17.- <-> C18.+ <-> C19.- <-> C20.- <-> C21.- <-> D2.A <-> D5.K <-> D6.A <-> IC1.4 <-> IC3.3 <-> R13.2 <-> Ra.2 + C18.- <-> IC2.4 <-> IC3.8 + C19.+ <-> D4.K <-> IC2.5 C2.2 <-> C4.2 <-> IC1.7 <-> R3.2 - C20.1 <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 - C21.1 <-> R12.2 <-> R14.1 - C22.1 <-> IC2.1 <-> R22.1 <-> R23.2 - C22.2 <-> R24.2 + C20.+ <-> IC2.3 <-> IC2.8 <-> R10.2 <-> R11.2 <-> R13.1 <-> R8.2 <-> R9.2 + C21.+ <-> R12.2 <-> R14.1 + C22.+ <-> IC2.1 <-> R22.1 <-> R23.2 + C22.- <-> R24.2 C3.1 <-> C6.1 <-> IC1.1 <-> IC1.2 <-> R7.1 C3.2 <-> C5.2 <-> R12.1 <-> R4.2 C4.1 <-> R5.2 C5.1 <-> IC1.8 <-> R4.1 C6.2 <-> C8.1 <-> R7.2 <-> R8.1 - C7.1 <-> D5.1 <-> D6.2 <-> R6.2 + C7.1 <-> D5.A <-> D6.K <-> R6.2 C8.2 <-> R9.1 C9.1 <-> R17.2 - D1.1 <-> D2.2 + D1.A <-> D2.K R15.1 <-> R16.1 <-> R17.1 diff --git a/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt b/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt index d134d7765..6629311ae 100644 --- a/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt @@ -1,9 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> R4.1 <-> R5.1 + C2.2 <-> R1.1 + C3.1 <-> R7.1 + C3.2 <-> C4.- <-> D1.K <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2 + C4.+ <-> IC1.4 <-> R11.2 + D1.A <-> 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 diff --git a/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt b/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt index d134d7765..6629311ae 100644 --- a/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt @@ -1,9 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 + C1.2 <-> R4.1 <-> R5.1 + C2.2 <-> R1.1 + C3.1 <-> R7.1 + C3.2 <-> C4.- <-> D1.K <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2 + C4.+ <-> IC1.4 <-> R11.2 + D1.A <-> 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 diff --git a/diylc-regression-data/input/v1/netlist/liquid_sunshine_excl_switches.txt b/diylc-regression-data/input/v1/netlist/liquid_sunshine_excl_switches.txt index 13200d511..9a6b8714d 100644 --- a/diylc-regression-data/input/v1/netlist/liquid_sunshine_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/liquid_sunshine_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R2.2 - C1.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 + C1.2 <-> C6.2 <-> C7.- <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 C2.2 <-> R3.2 C3.1 <-> Q1.3 <-> R4.1 C3.2 <-> R5.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C4.2 <-> C9.2 <-> R8.2 C5.1 <-> Q2.1 <-> VR1.1 C5.2 <-> R6.1 - C7.1 <-> Q3.2 <-> Q3.3 <-> R7.1 + C7.+ <-> Q3.2 <-> Q3.3 <-> R7.1 C8.1 <-> R8.1 C8.2 <-> Q3.1 <-> VR2.1 Q1.1 <-> Q1.2 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/liquid_sunshine_incl_switches.txt b/diylc-regression-data/input/v1/netlist/liquid_sunshine_incl_switches.txt index 13200d511..9a6b8714d 100644 --- a/diylc-regression-data/input/v1/netlist/liquid_sunshine_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/liquid_sunshine_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R2.2 - C1.2 <-> C6.2 <-> C7.2 <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 + C1.2 <-> C6.2 <-> C7.- <-> C9.1 <-> R1.2 <-> R3.1 <-> R4.2 <-> R7.2 C2.2 <-> R3.2 C3.1 <-> Q1.3 <-> R4.1 C3.2 <-> R5.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C4.2 <-> C9.2 <-> R8.2 C5.1 <-> Q2.1 <-> VR1.1 C5.2 <-> R6.1 - C7.1 <-> Q3.2 <-> Q3.3 <-> R7.1 + C7.+ <-> Q3.2 <-> Q3.3 <-> R7.1 C8.1 <-> R8.1 C8.2 <-> Q3.1 <-> VR2.1 Q1.1 <-> Q1.2 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3 diff --git a/diylc-regression-data/input/v1/netlist/little_gem_excl_switches.txt b/diylc-regression-data/input/v1/netlist/little_gem_excl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/v1/netlist/little_gem_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/little_gem_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/little_gem_incl_switches.txt b/diylc-regression-data/input/v1/netlist/little_gem_incl_switches.txt index ed5ef23ef..6154d741d 100644 --- a/diylc-regression-data/input/v1/netlist/little_gem_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/little_gem_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.2 - C2.1 <-> C3.2 <-> IC1.3 <-> IC1.4 - C2.2 <-> C4.1 <-> R1.2 - C3.1 <-> IC1.7 + C2.1 <-> C3.- <-> IC1.3 <-> IC1.4 + C2.2 <-> C4.+ <-> R1.2 + C3.+ <-> IC1.7 IC1.8 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/little_gem_mk2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/little_gem_mk2_excl_switches.txt index 1bdfaeb12..b766b475b 100644 --- a/diylc-regression-data/input/v1/netlist/little_gem_mk2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/little_gem_mk2_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> IC2.7 <-> Q1.1 - C1.2 <-> IC1.3 <-> IC1.4 <-> IC2.2 <-> IC2.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> IC2.7 <-> Q1.1 + C1.- <-> IC1.3 <-> IC1.4 <-> IC2.2 <-> IC2.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C3.1 <-> IC1.1 - C3.2 <-> IC1.5 - C4.1 <-> IC2.1 - C4.2 <-> IC2.5 + C3.+ <-> IC1.1 + C3.- <-> IC1.5 + C4.+ <-> IC2.1 + C4.- <-> IC2.5 C5.1 <-> R3.2 C5.2 <-> IC2.8 IC1.2 <-> IC2.3 diff --git a/diylc-regression-data/input/v1/netlist/little_gem_mk2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/little_gem_mk2_incl_switches.txt index 1bdfaeb12..b766b475b 100644 --- a/diylc-regression-data/input/v1/netlist/little_gem_mk2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/little_gem_mk2_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> IC2.7 <-> Q1.1 - C1.2 <-> IC1.3 <-> IC1.4 <-> IC2.2 <-> IC2.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> IC2.7 <-> Q1.1 + C1.- <-> IC1.3 <-> IC1.4 <-> IC2.2 <-> IC2.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 - C3.1 <-> IC1.1 - C3.2 <-> IC1.5 - C4.1 <-> IC2.1 - C4.2 <-> IC2.5 + C3.+ <-> IC1.1 + C3.- <-> IC1.5 + C4.+ <-> IC2.1 + C4.- <-> IC2.5 C5.1 <-> R3.2 C5.2 <-> IC2.8 IC1.2 <-> IC2.3 diff --git a/diylc-regression-data/input/v1/netlist/lm741_dist_excl_switches.txt b/diylc-regression-data/input/v1/netlist/lm741_dist_excl_switches.txt index 03ecd5feb..9329df275 100644 --- a/diylc-regression-data/input/v1/netlist/lm741_dist_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lm741_dist_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R2.1 - C1.2 <-> IC1.4 <-> R2.2 - C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.7 + C1.+ <-> IC1.3 <-> R1.2 <-> R2.1 + C1.- <-> IC1.4 <-> R2.2 + C2.1 <-> C3.1 <-> D1.A <-> D2.K <-> IC1.7 C2.2 <-> C3.2 C4.1 <-> R3.1 - D1.2 <-> IC1.2 <-> R3.2 + D1.K <-> IC1.2 <-> R3.2 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/lm741_dist_incl_switches.txt b/diylc-regression-data/input/v1/netlist/lm741_dist_incl_switches.txt index 03ecd5feb..9329df275 100644 --- a/diylc-regression-data/input/v1/netlist/lm741_dist_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lm741_dist_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.3 <-> R1.2 <-> R2.1 - C1.2 <-> IC1.4 <-> R2.2 - C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.7 + C1.+ <-> IC1.3 <-> R1.2 <-> R2.1 + C1.- <-> IC1.4 <-> R2.2 + C2.1 <-> C3.1 <-> D1.A <-> D2.K <-> IC1.7 C2.2 <-> C3.2 C4.1 <-> R3.1 - D1.2 <-> IC1.2 <-> R3.2 + D1.K <-> IC1.2 <-> R3.2 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/low_ride_bass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/low_ride_bass_excl_switches.txt index 4242a55e4..69faf98ab 100644 --- a/diylc-regression-data/input/v1/netlist/low_ride_bass_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/low_ride_bass_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 C10.2 <-> S2.3 C11.2 <-> S2.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 <-> S2.2 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 <-> S3.2 + C3.2 <-> IC1.3 <-> P3A.1 + C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 <-> S2.2 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 <-> S3.2 C5.1 <-> R6.1 <-> S1.1 C5.2 <-> P1O.2 <-> S1.2 C6.2 <-> S4.1 @@ -21,18 +21,18 @@ Switch setup: [Default] C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 <-> S3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 - IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 <-> S4.2 + D1.K <-> D2.A + D2.K <-> D3.A <-> S3.1 + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 + IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 <-> S4.2 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> S5.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 <-> S1.3 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 R18.2 <-> S5.1 diff --git a/diylc-regression-data/input/v1/netlist/low_ride_bass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/low_ride_bass_incl_switches.txt index c3775b30e..fe6358e2d 100644 --- a/diylc-regression-data/input/v1/netlist/low_ride_bass_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/low_ride_bass_incl_switches.txt @@ -1,1040 +1,1040 @@ -Switch setup: [S1.ON1:S2.ON1:S3.ON1:S4.ON1:S5.ON1] +Switch setup: [ S1.ON1:S2.ON1:S3.ON1:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON1:S4.ON1:S5.ON2] +Switch setup: [ S1.ON1:S2.ON1:S3.ON1:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON1:S4.ON2:S5.ON1] +Switch setup: [ S1.ON1:S2.ON1:S3.ON1:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON1:S4.ON2:S5.ON2] +Switch setup: [ S1.ON1:S2.ON1:S3.ON1:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON2:S4.ON1:S5.ON1] +Switch setup: [ S1.ON1:S2.ON1:S3.ON2:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON2:S4.ON1:S5.ON2] +Switch setup: [ S1.ON1:S2.ON1:S3.ON2:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON2:S4.ON2:S5.ON1] +Switch setup: [ S1.ON1:S2.ON1:S3.ON2:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON1:S3.ON2:S4.ON2:S5.ON2] +Switch setup: [ S1.ON1:S2.ON1:S3.ON2:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON1:S4.ON1:S5.ON1] +Switch setup: [ S1.ON1:S2.ON2:S3.ON1:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON1:S4.ON1:S5.ON2] +Switch setup: [ S1.ON1:S2.ON2:S3.ON1:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON1:S4.ON2:S5.ON1] +Switch setup: [ S1.ON1:S2.ON2:S3.ON1:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON1:S4.ON2:S5.ON2] +Switch setup: [ S1.ON1:S2.ON2:S3.ON1:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON2:S4.ON1:S5.ON1] +Switch setup: [ S1.ON1:S2.ON2:S3.ON2:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON2:S4.ON1:S5.ON2] +Switch setup: [ S1.ON1:S2.ON2:S3.ON2:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON2:S4.ON2:S5.ON1] +Switch setup: [ S1.ON1:S2.ON2:S3.ON2:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON1:S2.ON2:S3.ON2:S4.ON2:S5.ON2] +Switch setup: [ S1.ON1:S2.ON2:S3.ON2:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> C5.2 <-> P1O.2 <-> R6.1 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P2B.2 <-> R5.2 - P2B.3 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON1:S4.ON1:S5.ON1] +Switch setup: [ S1.ON2:S2.ON1:S3.ON1:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON1:S4.ON1:S5.ON2] +Switch setup: [ S1.ON2:S2.ON1:S3.ON1:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON1:S4.ON2:S5.ON1] +Switch setup: [ S1.ON2:S2.ON1:S3.ON1:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON1:S4.ON2:S5.ON2] +Switch setup: [ S1.ON2:S2.ON1:S3.ON1:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON2:S4.ON1:S5.ON1] +Switch setup: [ S1.ON2:S2.ON1:S3.ON2:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON2:S4.ON1:S5.ON2] +Switch setup: [ S1.ON2:S2.ON1:S3.ON2:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON2:S4.ON2:S5.ON1] +Switch setup: [ S1.ON2:S2.ON1:S3.ON2:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON1:S3.ON2:S4.ON2:S5.ON2] +Switch setup: [ S1.ON2:S2.ON1:S3.ON2:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C11.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C11.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON1:S4.ON1:S5.ON1] +Switch setup: [ S1.ON2:S2.ON2:S3.ON1:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON1:S4.ON1:S5.ON2] +Switch setup: [ S1.ON2:S2.ON2:S3.ON1:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON1:S4.ON2:S5.ON1] +Switch setup: [ S1.ON2:S2.ON2:S3.ON1:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON1:S4.ON2:S5.ON2] +Switch setup: [ S1.ON2:S2.ON2:S3.ON1:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> D2.2 <-> D3.1 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> D2.K <-> D3.A <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON2:S4.ON1:S5.ON1] +Switch setup: [ S1.ON2:S2.ON2:S3.ON2:S4.ON1:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON2:S4.ON1:S5.ON2] +Switch setup: [ S1.ON2:S2.ON2:S3.ON2:S4.ON1:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C6.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C6.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON2:S4.ON2:S5.ON1] +Switch setup: [ S1.ON2:S2.ON2:S3.ON2:S4.ON2:S5.ON1 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 <-> R18.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 -Switch setup: [S1.ON2:S2.ON2:S3.ON2:S4.ON2:S5.ON2] +Switch setup: [ S1.ON2:S2.ON2:S3.ON2:S4.ON2:S5.ON2 ] - C1.1 <-> C12.1 <-> C13.2 <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.1 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 + C1.1 <-> C12.+ <-> C13.- <-> C14.1 <-> C6.1 <-> C7.1 <-> D5.A <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R13.1 <-> R16.2 <-> R3.2 <-> R7.1 C1.2 <-> C2.1 <-> R1.2 C10.1 <-> C11.1 <-> R15.2 - C10.2 <-> C4.1 <-> D1.1 <-> D4.2 <-> IC1.2 <-> R5.1 - C12.2 <-> D5.2 <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 - C13.1 <-> IC2.8 <-> P3A.1 <-> P3B.3 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 + C10.2 <-> C4.1 <-> D1.A <-> D4.K <-> IC1.2 <-> R5.1 + C12.- <-> D5.K <-> IC1.5 <-> IC2.5 <-> Q1.1 <-> R17.2 + C13.+ <-> IC2.8 <-> P3A.3 <-> P3B.1 <-> R15.1 <-> R16.1 <-> R17.1 <-> R2.1 <-> R9.2 C14.2 <-> R18.1 C2.2 <-> R2.2 C3.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.2 <-> IC1.3 <-> P3A.3 - C4.2 <-> IC1.1 <-> P1O.3 <-> R4.1 + C3.2 <-> IC1.3 <-> P3A.1 + C4.2 <-> IC1.1 <-> P1O.1 <-> R4.1 C5.1 <-> R6.1 C5.2 <-> P1O.2 <-> P2B.2 <-> R5.2 - C7.2 <-> IC1.8 <-> P4T.3 <-> R4.2 <-> R9.1 + C7.2 <-> IC1.8 <-> P4T.1 <-> R4.2 <-> R9.1 C8.1 <-> R7.2 C8.2 <-> P4T.2 C9.1 <-> R10.2 C9.2 <-> R13.2 - D1.2 <-> D2.1 - D2.2 <-> D3.1 - D3.2 <-> D4.1 - IC1.6 <-> P3B.1 <-> R8.2 - IC1.7 <-> P4T.1 <-> R8.1 + D1.K <-> D2.A + D2.K <-> D3.A + D3.K <-> D4.A + IC1.6 <-> P3B.3 <-> R8.2 + IC1.7 <-> P4T.3 <-> R8.1 IC2.1 <-> IC2.2 <-> R11.2 IC2.3 <-> P3A.2 IC2.6 <-> R10.1 <-> R12.1 - IC2.7 <-> P5V.3 <-> R11.1 <-> R14.2 - P2B.3 <-> R6.2 + IC2.7 <-> P5V.1 <-> R11.1 <-> R14.2 + P2B.1 <-> R6.2 P3B.2 <-> R14.1 P5V.2 <-> R12.2 diff --git a/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt index c035b989a..f0a492311 100644 --- a/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R3.1 <-> R4.1 - C1.2 <-> C2.2 <-> R5.1 + C1.2 <-> R5.1 C2.1 <-> R2.1 Q1.1 <-> Q1.2 <-> R1.1 R1.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt index c035b989a..f0a492311 100644 --- a/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R3.1 <-> R4.1 - C1.2 <-> C2.2 <-> R5.1 + C1.2 <-> R5.1 C2.1 <-> R2.1 Q1.1 <-> Q1.2 <-> R1.1 R1.2 <-> R4.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_excl_switches.txt b/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_excl_switches.txt index 272631a90..1746e66d7 100644 --- a/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.1 <-> IC1.13 <-> IC1.7 <-> R1.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R6.1 C1.2 <-> IC1.2 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_incl_switches.txt b/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_incl_switches.txt index 272631a90..1746e66d7 100644 --- a/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lxh2_cab_sim_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.1 <-> IC1.13 <-> IC1.7 <-> R1.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R6.1 C1.2 <-> IC1.2 <-> R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_excl_switches.txt b/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_excl_switches.txt index 75b6a95d1..3611a7b0e 100644 --- a/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R3.2 C10.1 <-> C9.1 <-> R22.1 @@ -17,8 +17,8 @@ Switch setup: [Default] C6.1 <-> IC2.13 <-> IC2.14 <-> R21.1 C7.1 <-> C8.1 <-> R21.2 C9.2 <-> IC2.8 <-> IC2.9 - D1.1 <-> D2.2 <-> IC2.12 <-> R19.2 - D1.2 <-> D2.1 <-> IC2.3 <-> IC3.10 <-> IC3.12 <-> IC4.3 <-> R1.2 <-> R10.2 <-> R16.1 <-> R17.2 <-> R2.2 <-> R20.1 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.2 <-> R9.2 <-> VR1.3 + D1.A <-> D2.K <-> IC2.12 <-> R19.2 + D1.K <-> D2.A <-> IC2.3 <-> IC3.10 <-> IC3.12 <-> IC4.3 <-> R1.2 <-> R10.2 <-> R16.1 <-> R17.2 <-> R2.2 <-> R20.1 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.2 <-> R9.2 <-> VR1.3 IC1.10 <-> R8.2 <-> R9.1 IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.4 IC1.12 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_incl_switches.txt b/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_incl_switches.txt index 75b6a95d1..3611a7b0e 100644 --- a/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/lxh2_marshall_amp_sim_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R3.2 C10.1 <-> C9.1 <-> R22.1 @@ -17,8 +17,8 @@ Switch setup: [Default] C6.1 <-> IC2.13 <-> IC2.14 <-> R21.1 C7.1 <-> C8.1 <-> R21.2 C9.2 <-> IC2.8 <-> IC2.9 - D1.1 <-> D2.2 <-> IC2.12 <-> R19.2 - D1.2 <-> D2.1 <-> IC2.3 <-> IC3.10 <-> IC3.12 <-> IC4.3 <-> R1.2 <-> R10.2 <-> R16.1 <-> R17.2 <-> R2.2 <-> R20.1 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.2 <-> R9.2 <-> VR1.3 + D1.A <-> D2.K <-> IC2.12 <-> R19.2 + D1.K <-> D2.A <-> IC2.3 <-> IC3.10 <-> IC3.12 <-> IC4.3 <-> R1.2 <-> R10.2 <-> R16.1 <-> R17.2 <-> R2.2 <-> R20.1 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.2 <-> R9.2 <-> VR1.3 IC1.10 <-> R8.2 <-> R9.1 IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.4 IC1.12 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_excl_switches.txt index 64a0c79ba..64e21d44e 100644 --- a/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> R1.1 C2.1 <-> C3.1 <-> IC1.1 <-> R3.1 C2.2 <-> IC1.2 <-> R2.1 <-> R3.2 - C3.2 <-> Choke.1 - C4.1 <-> Choke.2 <-> R5.1 + C3.2 <-> Choke.A + C4.1 <-> Choke.K <-> R5.1 C4.2 <-> R4.1 IC1.3 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_incl_switches.txt index 64a0c79ba..64e21d44e 100644 --- a/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mesa_boogie_triaxis_cabinet_simulator_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> R1.1 C2.1 <-> C3.1 <-> IC1.1 <-> R3.1 C2.2 <-> IC1.2 <-> R2.1 <-> R3.2 - C3.2 <-> Choke.1 - C4.1 <-> Choke.2 <-> R5.1 + C3.2 <-> Choke.A + C4.1 <-> Choke.K <-> R5.1 C4.2 <-> R4.1 IC1.3 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_excl_switches.txt index b7fd5da8b..1ff9f848f 100644 --- a/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C10.1 <-> D1.2 <-> IC1.5 <-> R10.2 - C10.2 <-> C11.2 <-> C2.1 <-> C5.2 <-> C8.1 <-> C9.1 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R11.1 <-> VOLUME.3 - C11.1 <-> IC1.8 <-> R10.1 <-> R11.2 <-> R2.1 + C10.+ <-> D1.K <-> IC1.5 <-> R10.2 + C10.- <-> C11.- <-> C2.1 <-> C5.- <-> C8.1 <-> C9.1 <-> D1.A <-> D2.K <-> D3.A <-> IC1.4 <-> R11.1 <-> VOLUME.1 + C11.+ <-> IC1.8 <-> R10.1 <-> R11.2 <-> R2.1 C2.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C3.1 <-> GAIN.1 + C3.1 <-> GAIN.3 C3.2 <-> R4.1 C4.1 <-> GAIN.2 <-> IC1.1 - C4.2 <-> GAIN.3 <-> IC1.2 <-> R3.2 - C5.1 <-> R3.1 - C6.1 <-> C7.1 <-> IC1.6 <-> R5.1 + C4.2 <-> GAIN.1 <-> IC1.2 <-> R3.2 + C5.+ <-> R3.1 + C6.1 <-> C7.+ <-> IC1.6 <-> R5.1 C6.2 <-> IC1.7 <-> R4.2 <-> R5.2 - C7.2 <-> R6.2 - C8.2 <-> R8.1 <-> TONE.2 <-> TONE.3 + C7.- <-> R6.2 + C8.2 <-> R8.1 <-> TONE.1 <-> TONE.2 C9.2 <-> R9.2 - D2.1 <-> D3.2 <-> R6.1 <-> R7.2 - R7.1 <-> TONE.1 - R8.2 <-> R9.1 <-> VOLUME.1 + D2.A <-> D3.K <-> R6.1 <-> R7.2 + R7.1 <-> TONE.3 + R8.2 <-> R9.1 <-> VOLUME.3 diff --git a/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_incl_switches.txt index b7fd5da8b..1ff9f848f 100644 --- a/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mi_audio_crunch_box_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C10.1 <-> D1.2 <-> IC1.5 <-> R10.2 - C10.2 <-> C11.2 <-> C2.1 <-> C5.2 <-> C8.1 <-> C9.1 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R11.1 <-> VOLUME.3 - C11.1 <-> IC1.8 <-> R10.1 <-> R11.2 <-> R2.1 + C10.+ <-> D1.K <-> IC1.5 <-> R10.2 + C10.- <-> C11.- <-> C2.1 <-> C5.- <-> C8.1 <-> C9.1 <-> D1.A <-> D2.K <-> D3.A <-> IC1.4 <-> R11.1 <-> VOLUME.1 + C11.+ <-> IC1.8 <-> R10.1 <-> R11.2 <-> R2.1 C2.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C3.1 <-> GAIN.1 + C3.1 <-> GAIN.3 C3.2 <-> R4.1 C4.1 <-> GAIN.2 <-> IC1.1 - C4.2 <-> GAIN.3 <-> IC1.2 <-> R3.2 - C5.1 <-> R3.1 - C6.1 <-> C7.1 <-> IC1.6 <-> R5.1 + C4.2 <-> GAIN.1 <-> IC1.2 <-> R3.2 + C5.+ <-> R3.1 + C6.1 <-> C7.+ <-> IC1.6 <-> R5.1 C6.2 <-> IC1.7 <-> R4.2 <-> R5.2 - C7.2 <-> R6.2 - C8.2 <-> R8.1 <-> TONE.2 <-> TONE.3 + C7.- <-> R6.2 + C8.2 <-> R8.1 <-> TONE.1 <-> TONE.2 C9.2 <-> R9.2 - D2.1 <-> D3.2 <-> R6.1 <-> R7.2 - R7.1 <-> TONE.1 - R8.2 <-> R9.1 <-> VOLUME.1 + D2.A <-> D3.K <-> R6.1 <-> R7.2 + R7.1 <-> TONE.3 + R8.2 <-> R9.1 <-> VOLUME.3 diff --git a/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt index 68f3862c3..3f697a85d 100644 --- a/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt @@ -1,9 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 - C1.2 <-> C3.1 - C2.1 <-> Q1.1 <-> R1.2 - C2.2 <-> R1.1 <-> R4.1 - C3.2 <-> R2.2 <-> R3.2 <-> R4.2 + C2.+ <-> Q1.1 <-> R1.2 + C2.- <-> R4.1 + C3.- <-> R2.2 <-> R3.2 <-> R4.2 Q1.2 <-> Q1.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt index 68f3862c3..3f697a85d 100644 --- a/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt @@ -1,9 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 - C1.2 <-> C3.1 - C2.1 <-> Q1.1 <-> R1.2 - C2.2 <-> R1.1 <-> R4.1 - C3.2 <-> R2.2 <-> R3.2 <-> R4.2 + C2.+ <-> Q1.1 <-> R1.2 + C2.- <-> R4.1 + C3.- <-> R2.2 <-> R3.2 <-> R4.2 Q1.2 <-> Q1.3 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt index 9d3d48441..2d971bb75 100644 --- a/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> Q1.3 <-> R2.1 - D1.2 <-> D2.1 <-> R1.1 <-> R1.2 + D1.A <-> Q1.3 <-> R2.1 + D1.K <-> R1.2 + D2.A <-> R1.1 Q1.1 <-> Q1.2 <-> Q2.3 - Q2.1 <-> Q2.2 <-> R2.2 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt index 9d3d48441..2d971bb75 100644 --- a/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> Q1.3 <-> R2.1 - D1.2 <-> D2.1 <-> R1.1 <-> R1.2 + D1.A <-> Q1.3 <-> R2.1 + D1.K <-> R1.2 + D2.A <-> R1.1 Q1.1 <-> Q1.2 <-> Q2.3 - Q2.1 <-> Q2.2 <-> R2.2 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/millenium_bypass_2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium_bypass_2_excl_switches.txt index 0009072b7..b2b8b9a92 100644 --- a/diylc-regression-data/input/v1/netlist/millenium_bypass_2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium_bypass_2_excl_switches.txt @@ -1,6 +1,6 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.2 <-> Q1.3 <-> R2.1 - D2.1 <-> R1.1 + D1.K <-> Q1.3 <-> R2.1 + D2.A <-> R1.1 S1.3 <-> S1.4 diff --git a/diylc-regression-data/input/v1/netlist/millenium_bypass_2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium_bypass_2_incl_switches.txt index b03188ee0..0d28f0a3e 100644 --- a/diylc-regression-data/input/v1/netlist/millenium_bypass_2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium_bypass_2_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - D1.2 <-> Q1.3 <-> R2.1 - D2.1 <-> R1.1 + D1.K <-> Q1.3 <-> R2.1 + D2.A <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/millenium_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium_bypass_excl_switches.txt index f5af7e879..b72e05a33 100644 --- a/diylc-regression-data/input/v1/netlist/millenium_bypass_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium_bypass_excl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.2 <-> Q1.1 <-> Q1.2 + D1.K <-> Q1.1 <-> Q1.2 Q1.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/millenium_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium_bypass_incl_switches.txt index f5af7e879..b72e05a33 100644 --- a/diylc-regression-data/input/v1/netlist/millenium_bypass_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/millenium_bypass_incl_switches.txt @@ -1,5 +1,5 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.2 <-> Q1.1 <-> Q1.2 + D1.K <-> Q1.1 <-> Q1.2 Q1.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/mockman_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mockman_excl_switches.txt index 509dcac94..2ac29f155 100644 --- a/diylc-regression-data/input/v1/netlist/mockman_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mockman_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .01uf.1 <-> 100pf.1 <-> 470K.1 <-> D1.1 <-> D2.2 <-> RC4558.1 + .01uf.1 <-> 100pf.1 <-> 470K.1 <-> D1.A <-> D2.K <-> RC4558.1 .01uf.1 <-> 100pf.1 <-> 470K.1 <-> RC4558.6 - .01uf.2 <-> 100pf.2 <-> 470K.2 <-> D1.2 <-> D2.1 <-> RC4558.2 + .01uf.2 <-> 100pf.2 <-> 470K.2 <-> D1.K <-> D2.A <-> RC4558.2 100pf.2 <-> 10K.2 <-> 470K.2 <-> RC4558.7 - 10uf.1 <-> 22K.2 <-> RC4558.5 - 10uf.2 <-> 22K.1 <-> 22K.1 <-> RC4558.3 <-> RC4558.8 + 10uf.+ <-> 22K.2 <-> RC4558.5 + 10uf.- <-> 22K.1 <-> 22K.1 <-> RC4558.3 <-> RC4558.8 22K.2 <-> RC4558.4 diff --git a/diylc-regression-data/input/v1/netlist/mockman_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mockman_incl_switches.txt index 509dcac94..2ac29f155 100644 --- a/diylc-regression-data/input/v1/netlist/mockman_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mockman_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .01uf.1 <-> 100pf.1 <-> 470K.1 <-> D1.1 <-> D2.2 <-> RC4558.1 + .01uf.1 <-> 100pf.1 <-> 470K.1 <-> D1.A <-> D2.K <-> RC4558.1 .01uf.1 <-> 100pf.1 <-> 470K.1 <-> RC4558.6 - .01uf.2 <-> 100pf.2 <-> 470K.2 <-> D1.2 <-> D2.1 <-> RC4558.2 + .01uf.2 <-> 100pf.2 <-> 470K.2 <-> D1.K <-> D2.A <-> RC4558.2 100pf.2 <-> 10K.2 <-> 470K.2 <-> RC4558.7 - 10uf.1 <-> 22K.2 <-> RC4558.5 - 10uf.2 <-> 22K.1 <-> 22K.1 <-> RC4558.3 <-> RC4558.8 + 10uf.+ <-> 22K.2 <-> RC4558.5 + 10uf.- <-> 22K.1 <-> 22K.1 <-> RC4558.3 <-> RC4558.8 22K.2 <-> RC4558.4 diff --git a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_excl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_incl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_pcb_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_excl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_incl_switches.txt index e365165b0..a88238dc5 100644 --- a/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/modified_mosfet_booster_perf_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Ra.1 - C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R3.2 - C2.2 <-> C3.2 <-> C5.2 <-> R1.2 <-> R5.2 <-> Ra.2 - C3.1 <-> R1.1 <-> R2.2 <-> R3.1 + C1.2 <-> C2.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R3.2 + C2.2 <-> C3.- <-> C5.- <-> R1.2 <-> R5.2 <-> Ra.2 + C3.+ <-> R1.1 <-> R2.2 <-> R3.1 C4.1 <-> Q1.1 <-> R4.2 - C5.1 <-> D1.1 <-> R5.1 + C5.+ <-> D1.A <-> R5.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt b/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt index beef422fc..59c9356e7 100644 --- a/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1 - IC1.1 <-> IC1.9 + C1.1 <-> R1.1 + C1.2 <-> C4.1 <-> IC1.5 <-> R3.2 + C2.1 <-> R2.1 <-> R3.1 + C2.2 <-> C6.- <-> D1.K <-> IC1.3 <-> IC1.7 <-> IC1.8 + C3.1 <-> C5.- <-> IC1.4 <-> R2.2 + C3.2 <-> C4.2 <-> D1.A <-> R4.2 + C6.+ <-> IC1.16 <-> R5.2 <-> R6.2 + C7.+ <-> IC1.11 <-> R7.2 + C7.- <-> IC1.10 <-> R6.1 + IC1.13 <-> R5.1 + IC1.14 <-> IC1.15 diff --git a/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt b/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt index beef422fc..59c9356e7 100644 --- a/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1 - IC1.1 <-> IC1.9 + C1.1 <-> R1.1 + C1.2 <-> C4.1 <-> IC1.5 <-> R3.2 + C2.1 <-> R2.1 <-> R3.1 + C2.2 <-> C6.- <-> D1.K <-> IC1.3 <-> IC1.7 <-> IC1.8 + C3.1 <-> C5.- <-> IC1.4 <-> R2.2 + C3.2 <-> C4.2 <-> D1.A <-> R4.2 + C6.+ <-> IC1.16 <-> R5.2 <-> R6.2 + C7.+ <-> IC1.11 <-> R7.2 + C7.- <-> IC1.10 <-> R6.1 + IC1.13 <-> R5.1 + IC1.14 <-> IC1.15 diff --git a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_excl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_incl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_pcb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_excl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_incl_switches.txt index 26d06778a..e7b7ae74a 100644 --- a/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mosrite_fuzzrite_perf_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> Q1.3 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/mutron_micro_v_excl_switches.txt b/diylc-regression-data/input/v1/netlist/mutron_micro_v_excl_switches.txt index 246d19dcf..6c96196d9 100644 --- a/diylc-regression-data/input/v1/netlist/mutron_micro_v_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mutron_micro_v_excl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C10.1 <-> IC1.5 <-> IC2.6 <-> Q1.1 <-> R9.1 - C10.2 <-> R13.2 - C11.1 <-> C2.1 <-> C5.1 <-> C6.2 <-> IC1.3 <-> IC1.8 <-> IC2.2 <-> R14.1 <-> R2.2 <-> R7.1 <-> R8.1 + C10.+ <-> IC1.5 <-> IC2.6 <-> Q1.1 <-> R9.1 + C10.- <-> R13.2 + C11.1 <-> C2.1 <-> C5.+ <-> C6.2 <-> IC1.3 <-> IC1.8 <-> IC2.2 <-> R14.1 <-> R2.2 <-> R7.1 <-> R8.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 - C3.1 <-> R4.1 - C3.2 <-> R3.1 + C3.+ <-> R4.1 + C3.- <-> R3.1 C4.1 <-> C9.2 C4.2 <-> C8.2 <-> R11.1 <-> R12.2 - C5.2 <-> Q2.2 <-> Q2.3 <-> R6.1 <-> R7.2 + C5.- <-> Q2.2 <-> Q2.3 <-> R6.1 <-> R7.2 C6.1 <-> C7.1 <-> IC1.7 <-> R10.1 C7.2 <-> C8.1 <-> IC1.6 <-> R12.1 C9.1 <-> IC2.7 <-> R10.2 - D1.1 <-> D2.2 <-> IC1.1 - D1.2 <-> IC1.2 <-> R4.2 <-> R5.1 - D2.1 <-> R6.2 + D1.A <-> D2.K <-> IC1.1 + D1.K <-> IC1.2 <-> R4.2 <-> R5.1 + D2.A <-> R6.2 IC1.4 <-> R13.1 <-> R3.2 IC2.8 <-> R9.2 Q2.1 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/mutron_micro_v_incl_switches.txt b/diylc-regression-data/input/v1/netlist/mutron_micro_v_incl_switches.txt index 246d19dcf..6c96196d9 100644 --- a/diylc-regression-data/input/v1/netlist/mutron_micro_v_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/mutron_micro_v_incl_switches.txt @@ -1,21 +1,21 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C10.1 <-> IC1.5 <-> IC2.6 <-> Q1.1 <-> R9.1 - C10.2 <-> R13.2 - C11.1 <-> C2.1 <-> C5.1 <-> C6.2 <-> IC1.3 <-> IC1.8 <-> IC2.2 <-> R14.1 <-> R2.2 <-> R7.1 <-> R8.1 + C10.+ <-> IC1.5 <-> IC2.6 <-> Q1.1 <-> R9.1 + C10.- <-> R13.2 + C11.1 <-> C2.1 <-> C5.+ <-> C6.2 <-> IC1.3 <-> IC1.8 <-> IC2.2 <-> R14.1 <-> R2.2 <-> R7.1 <-> R8.1 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 - C3.1 <-> R4.1 - C3.2 <-> R3.1 + C3.+ <-> R4.1 + C3.- <-> R3.1 C4.1 <-> C9.2 C4.2 <-> C8.2 <-> R11.1 <-> R12.2 - C5.2 <-> Q2.2 <-> Q2.3 <-> R6.1 <-> R7.2 + C5.- <-> Q2.2 <-> Q2.3 <-> R6.1 <-> R7.2 C6.1 <-> C7.1 <-> IC1.7 <-> R10.1 C7.2 <-> C8.1 <-> IC1.6 <-> R12.1 C9.1 <-> IC2.7 <-> R10.2 - D1.1 <-> D2.2 <-> IC1.1 - D1.2 <-> IC1.2 <-> R4.2 <-> R5.1 - D2.1 <-> R6.2 + D1.A <-> D2.K <-> IC1.1 + D1.K <-> IC1.2 <-> R4.2 <-> R5.1 + D2.A <-> R6.2 IC1.4 <-> R13.1 <-> R3.2 IC2.8 <-> R9.2 Q2.1 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt index 048bb789b..c6a3cbdd9 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.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 + C1.1 <-> C2.+ <-> C2.- <-> D1.A <-> D2.K <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 + C1.2 <-> C3.- <-> C5.- <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1 + C3.+ <-> 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.+ <-> R7.2 + IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt index 048bb789b..c6a3cbdd9 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.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 + C1.1 <-> C2.+ <-> C2.- <-> D1.A <-> D2.K <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 + C1.2 <-> C3.- <-> C5.- <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1 + C3.+ <-> 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.+ <-> R7.2 + IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_pcb_excl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_pcb_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_pcb_incl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_pcb_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_perf_excl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_perf_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_perf_incl_switches.txt index a4f50d1cd..f185df17b 100644 --- a/diylc-regression-data/input/v1/netlist/new_clipper_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/new_clipper_perf_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 C1.2 <-> IC1.3 <-> R1.2 <-> R2.2 - C2.1 <-> R5.2 - C2.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R2.1 <-> R3.2 - C3.1 <-> IC1.7 <-> R4.1 - C3.2 <-> R6.1 + C2.+ <-> R5.2 + C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2 + C3.+ <-> IC1.7 <-> R4.1 + C3.- <-> R6.1 C4.1 <-> R7.2 - D1.1 <-> D2.2 <-> R6.2 <-> R7.1 + D1.A <-> D2.K <-> R6.2 <-> R7.1 IC1.2 <-> R4.2 <-> R5.1 IC1.6 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_excl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_incl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_pcb_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_excl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_incl_switches.txt index 32e345e11..0b3cb59cd 100644 --- a/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/nvn_tone_dog_perf_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> Q1.3 <-> R1.2 <-> R2.2 - C2.1 <-> C4.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 - C3.2 <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 - C5.1 <-> D1.2 <-> D2.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 - C5.2 <-> Q2.1 <-> Q2.2 <-> R7.1 - C6.1 <-> D1.1 <-> D2.2 + C1.+ <-> R3.2 + C1.- <-> Q1.3 <-> R1.2 <-> R2.2 + C2.+ <-> C4.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 + C3.- <-> C4.2 <-> Q2.3 <-> R5.1 <-> R6.2 + C5.+ <-> D1.K <-> D2.A <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.2 <-> R7.2 + C5.- <-> Q2.1 <-> Q2.2 <-> R7.1 + C6.1 <-> D1.A <-> D2.K R1.1 <-> R6.1 diff --git a/diylc-regression-data/input/v1/netlist/octobooster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/octobooster_excl_switches.txt index 1c62db050..9a18fa7b0 100644 --- a/diylc-regression-data/input/v1/netlist/octobooster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/octobooster_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R2.2 - C2.1 <-> R2.1 <-> VR1.2 - D1.2 <-> D2.2 <-> S1.1 - D2.1 <-> S1.3 + C1.+ <-> Q1.3 <-> R2.2 + C2.+ <-> R2.1 <-> VR1.2 + D1.K <-> D2.K <-> S1.1 + D2.A <-> S1.3 Q1.1 <-> VR1.3 R1.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/octobooster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/octobooster_incl_switches.txt index 2dbf6715f..23a3df453 100644 --- a/diylc-regression-data/input/v1/netlist/octobooster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/octobooster_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R2.2 - C2.1 <-> R2.1 <-> VR1.2 - D1.2 <-> D2.2 + C1.+ <-> Q1.3 <-> R2.2 + C2.+ <-> R2.1 <-> VR1.2 + D1.K <-> D2.K Q1.1 <-> VR1.3 R1.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt b/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt index 3f173f117..01336d85d 100644 --- a/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2 + C1.1 <-> Q1.3 <-> R2.2 + C1.2 <-> R1.1 + C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1 + C2.2 <-> R5.1 + C3.+ <-> Q3.3 <-> Q4.3 <-> R4.1 + C3.- <-> C6.- <-> D1.A <-> 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.+ <-> D1.K <-> R7.2 <-> R8.1 <-> R9.2 + Q1.1 <-> Q1.2 <-> Q2.3 diff --git a/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt b/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt index 3f173f117..01336d85d 100644 --- a/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt @@ -1,7 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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 - C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2 + C1.1 <-> Q1.3 <-> R2.2 + C1.2 <-> R1.1 + C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1 + C2.2 <-> R5.1 + C3.+ <-> Q3.3 <-> Q4.3 <-> R4.1 + C3.- <-> C6.- <-> D1.A <-> 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.+ <-> D1.K <-> R7.2 <-> R8.1 <-> R9.2 + Q1.1 <-> Q1.2 <-> Q2.3 diff --git a/diylc-regression-data/input/v1/netlist/od_250_excl_switches.txt b/diylc-regression-data/input/v1/netlist/od_250_excl_switches.txt index 2aa7c7a79..2ac0c54ee 100644 --- a/diylc-regression-data/input/v1/netlist/od_250_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/od_250_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R3.1 <-> R4.2 - C2.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C2.+ <-> R2.1 <-> R3.1 <-> R4.2 + C2.- <-> C5.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/od_250_incl_switches.txt b/diylc-regression-data/input/v1/netlist/od_250_incl_switches.txt index 2aa7c7a79..2ac0c54ee 100644 --- a/diylc-regression-data/input/v1/netlist/od_250_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/od_250_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> R1.1 - C2.1 <-> R2.1 <-> R3.1 <-> R4.2 - C2.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R3.2 + C2.+ <-> R2.1 <-> R3.1 <-> R4.2 + C2.- <-> C5.2 <-> D1.A <-> D2.K <-> IC1.4 <-> R3.2 C3.1 <-> IC1.2 <-> R5.1 C3.2 <-> R6.1 - C4.1 <-> IC1.7 <-> R5.2 - C4.2 <-> R7.2 - C5.1 <-> D1.2 <-> D2.1 <-> R7.1 + C4.+ <-> IC1.7 <-> R5.2 + C4.- <-> R7.2 + C5.1 <-> D1.K <-> D2.A <-> R7.1 IC1.3 <-> R1.2 <-> R2.2 IC1.6 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/old_school_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/old_school_fuzz_excl_switches.txt index eaf9e1614..353ba8a96 100644 --- a/diylc-regression-data/input/v1/netlist/old_school_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/old_school_fuzz_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.3 <-> R2.2 C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/old_school_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/old_school_fuzz_incl_switches.txt index eaf9e1614..353ba8a96 100644 --- a/diylc-regression-data/input/v1/netlist/old_school_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/old_school_fuzz_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.3 <-> R2.2 C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> D1.1 <-> D2.2 - D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2 + C2.2 <-> D1.A <-> D2.K + D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_excl_switches.txt index 69645f539..ad0eab1ed 100644 --- a/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_incl_switches.txt index 69645f539..ad0eab1ed 100644 --- a/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/one_knob_fat_fuzz_vero_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_excl_switches.txt index ce2bb1466..a3d279e98 100644 --- a/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_incl_switches.txt index ce2bb1466..a3d279e98 100644 --- a/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_squeezer_pcb_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_excl_switches.txt index ce2bb1466..a3d279e98 100644 --- a/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_incl_switches.txt index ce2bb1466..a3d279e98 100644 --- a/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_squeezer_perf_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 - C2.2 <-> C5.2 <-> C7.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 + C2.+ <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.3 + C2.- <-> C5.- <-> C7.- <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R10.1 <-> R9.1 <-> VR1.1 <-> VR1.2 C3.1 <-> R4.1 C3.2 <-> C4.2 <-> Q2.1 <-> R2.2 C4.1 <-> IC1.3 <-> R8.2 <-> R9.2 - C5.1 <-> R7.2 - C6.1 <-> IC1.1 <-> R6.2 - C6.2 <-> R11.2 - C7.1 <-> D1.2 <-> R10.2 <-> R5.2 - D1.1 <-> R11.1 + C5.+ <-> R7.2 + C6.+ <-> IC1.1 <-> R6.2 + C6.- <-> R11.2 + C7.+ <-> D1.K <-> R10.2 <-> R5.2 + D1.A <-> R11.1 IC1.2 <-> R6.1 <-> R7.1 IC1.5 <-> Q1.1 <-> R8.1 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_excl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_incl_switches.txt index 531ba74cd..479f0303b 100644 --- a/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_sunshine_fuzz_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R4.1 C1.2 <-> Q1.3 <-> R5.1 - C2.1 <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 - C2.2 <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 + C2.+ <-> Q2.1 <-> Q2.2 <-> R5.2 <-> R6.1 + C2.- <-> Q1.1 <-> Q1.2 <-> R4.2 <-> R6.2 C3.1 <-> R1.1 <-> R2.2 Q2.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_excl_switches.txt index c9cda1aed..5012c9c48 100644 --- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] 3PDT.1 <-> C3.1 3PDT.3 <-> 3PDT.6 3PDT.4 <-> 500K Linear.2 3PDT.7 <-> R2.2 <-> R4.2 3PDT.8 <-> R5.1 - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_incl_switches.txt index 131e5ae2c..c4358003e 100644 --- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_2_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [3PDT.ON1] +Switch setup: [ 3PDT.ON1 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 <-> R5.1 -Switch setup: [3PDT.ON2] +Switch setup: [ 3PDT.ON2 ] - 500K Linear.1 <-> C2.2 - 500K Linear.3 <-> C1.2 + 500K Linear.1 <-> C1.2 + 500K Linear.3 <-> C2.2 C1.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - C2.1 <-> C4.2 <-> D1.2 <-> R1.1 <-> R3.1 + C2.1 <-> C4.- <-> D1.K <-> R1.1 <-> R3.1 C3.2 <-> R2.1 - C4.1 <-> Q1.1 <-> R1.2 - D1.1 <-> R5.2 + C4.+ <-> Q1.1 <-> R1.2 + D1.A <-> R5.2 R2.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt index 092f8574f..e29663ad8 100644 --- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C4.1 <-> R1.2 <-> R2.2 - C2.1 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2 - C3.2 <-> Q1.1 <-> R3.1 <-> R3.2 <-> R4.1 - C4.2 <-> R1.1 + C1.2 <-> C4.+ <-> R1.2 <-> R2.2 + C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2 + C3.2 <-> Q1.1 <-> R3.1 + C4.- <-> R1.1 + R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt index 092f8574f..e29663ad8 100644 --- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> C4.1 <-> R1.2 <-> R2.2 - C2.1 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2 - C3.2 <-> Q1.1 <-> R3.1 <-> R3.2 <-> R4.1 - C4.2 <-> R1.1 + C1.2 <-> C4.+ <-> R1.2 <-> R2.2 + C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2 + C3.2 <-> Q1.1 <-> R3.1 + C4.- <-> R1.1 + R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/para-q_excl_switches.txt b/diylc-regression-data/input/v1/netlist/para-q_excl_switches.txt index c00213215..8f8bad516 100644 --- a/diylc-regression-data/input/v1/netlist/para-q_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/para-q_excl_switches.txt @@ -1,52 +1,52 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C6.2 - .2 <-> .3 <-> C7.1 <-> HiMidFreq.2 <-> HiMidFreq.3 <-> IC2.8 - .1 <-> R18.2 - .2 <-> .3 <-> C10.2 <-> IC3.3 <-> LoMidFreq.2 <-> LoMidFreq.3 - Bass.1 <-> C11.2 <-> R20.1 + .1 <-> .2 <-> C7.1 <-> HiMidFreq.1 <-> HiMidFreq.2 <-> IC2.8 + .3 <-> C6.2 + .1 <-> .2 <-> C10.2 <-> IC3.3 <-> LoMidFreq.1 <-> LoMidFreq.2 + .3 <-> R18.2 + Bass.1 <-> C13.2 <-> C14.2 <-> R22.2 Bass.2 <-> C11.1 <-> C12.2 <-> C13.1 <-> C14.1 - Bass.3 <-> C13.2 <-> C14.2 <-> R22.2 + Bass.3 <-> C11.2 <-> R20.1 C1.1 <-> R1.2 C1.2 <-> R2.1 <-> R3.1 - C10.1 <-> C20.2 <-> C24.1 <-> C25.1 <-> C7.2 <-> D5.2 <-> IC2.3 <-> IC3.8 <-> IC4.3 <-> P7.3 <-> R1.1 <-> R12.1 <-> R18.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R28.2 <-> R3.2 + C10.1 <-> C20.- <-> C24.+ <-> C25.+ <-> C7.2 <-> D5.K <-> IC2.3 <-> IC3.8 <-> IC4.3 <-> P7.1 <-> R1.1 <-> R12.1 <-> R18.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R28.2 <-> R3.2 C12.1 <-> IC3.7 <-> R21.1 - C15.1 <-> IC3.6 <-> R21.2 - C15.2 <-> C16.1 <-> R22.1 <-> R23.2 - C16.2 <-> P7.1 <-> R24.2 - C17.1 <-> C18.1 <-> IC1.7 <-> R26.1 - C17.2 <-> R25.2 - C18.2 <-> C19.1 <-> IC1.6 <-> R26.2 - C19.2 <-> R27.2 - C2.1 <-> IC1.1 <-> IC1.2 - C2.2 <-> R4.2 <-> R5.1 - C20.1 <-> C5.2 <-> C8.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> Q1.1 <-> Q2.1 <-> R15.1 <-> R9.2 - C21.1 <-> D2.1 <-> D3.2 - C21.2 <-> C22.1 <-> IC4.2 - C22.2 <-> C23.1 <-> IC4.4 - C23.2 <-> D4.1 <-> D5.1 <-> D6.2 - C24.2 <-> D4.2 <-> IC4.8 - C25.2 <-> D6.1 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R10.1 <-> R16.1 + C15.+ <-> IC3.6 <-> R21.2 + C15.- <-> C16.+ <-> R22.1 <-> R23.2 + C16.- <-> P7.3 <-> R24.2 + C17.+ <-> C18.1 <-> IC1.7 <-> R26.1 + C17.- <-> R25.2 + C18.2 <-> C19.+ <-> IC1.6 <-> R26.2 + C19.- <-> R27.2 + C2.+ <-> IC1.1 <-> IC1.2 + C2.- <-> R4.2 <-> R5.1 + C20.+ <-> C5.2 <-> C8.2 <-> D2.K <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> Q1.1 <-> Q2.1 <-> R15.1 <-> R9.2 + C21.+ <-> D2.A <-> D3.K + C21.- <-> C22.+ <-> IC4.2 + C22.- <-> C23.+ <-> IC4.4 + C23.- <-> D4.A <-> D5.A <-> D6.K + C24.- <-> D4.K <-> IC4.8 + C25.- <-> D6.A <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R10.1 <-> R16.1 C3.1 <-> C4.1 <-> Treble.2 C3.2 <-> IC2.2 <-> R5.2 <-> R7.1 - C4.2 <-> R6.1 <-> Treble.3 + C4.2 <-> R6.1 <-> Treble.1 C5.1 <-> HiMid.2 <-> Q1.3 <-> R9.1 C6.1 <-> R11.1 C8.1 <-> LoMid.2 <-> Q2.3 <-> R15.2 C9.1 <-> R17.2 - C9.2 <-> LoMidFreq.1 - D1.1 <-> Q4.3 - D1.2 <-> D3.1 <-> IC4.5 <-> Q4.1 - HiMid.1 <-> IC2.6 <-> LoMid.3 <-> R13.1 <-> R14.2 - HiMid.3 <-> IC2.1 <-> R6.2 <-> R7.2 <-> R8.1 - HiMidFreq.1 <-> R12.2 + C9.2 <-> LoMidFreq.3 + D1.A <-> Q4.3 + D1.K <-> D3.A <-> IC4.5 <-> Q4.1 + HiMid.1 <-> IC2.1 <-> R6.2 <-> R7.2 <-> R8.1 + HiMid.3 <-> IC2.6 <-> LoMid.1 <-> R13.1 <-> R14.2 + HiMidFreq.3 <-> R12.2 IC1.3 <-> R2.2 IC1.8 <-> P7.2 <-> R24.1 IC2.7 <-> R13.2 <-> R8.2 - IC3.1 <-> LoMid.1 <-> R19.2 <-> R20.2 + IC3.1 <-> LoMid.3 <-> R19.2 <-> R20.2 IC3.2 <-> R14.1 <-> R19.1 Q3.3 <-> R28.1 R10.2 <-> R11.2 R16.2 <-> R17.1 - R4.1 <-> Treble.1 + R4.1 <-> Treble.3 diff --git a/diylc-regression-data/input/v1/netlist/para-q_incl_switches.txt b/diylc-regression-data/input/v1/netlist/para-q_incl_switches.txt index c00213215..8f8bad516 100644 --- a/diylc-regression-data/input/v1/netlist/para-q_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/para-q_incl_switches.txt @@ -1,52 +1,52 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C6.2 - .2 <-> .3 <-> C7.1 <-> HiMidFreq.2 <-> HiMidFreq.3 <-> IC2.8 - .1 <-> R18.2 - .2 <-> .3 <-> C10.2 <-> IC3.3 <-> LoMidFreq.2 <-> LoMidFreq.3 - Bass.1 <-> C11.2 <-> R20.1 + .1 <-> .2 <-> C7.1 <-> HiMidFreq.1 <-> HiMidFreq.2 <-> IC2.8 + .3 <-> C6.2 + .1 <-> .2 <-> C10.2 <-> IC3.3 <-> LoMidFreq.1 <-> LoMidFreq.2 + .3 <-> R18.2 + Bass.1 <-> C13.2 <-> C14.2 <-> R22.2 Bass.2 <-> C11.1 <-> C12.2 <-> C13.1 <-> C14.1 - Bass.3 <-> C13.2 <-> C14.2 <-> R22.2 + Bass.3 <-> C11.2 <-> R20.1 C1.1 <-> R1.2 C1.2 <-> R2.1 <-> R3.1 - C10.1 <-> C20.2 <-> C24.1 <-> C25.1 <-> C7.2 <-> D5.2 <-> IC2.3 <-> IC3.8 <-> IC4.3 <-> P7.3 <-> R1.1 <-> R12.1 <-> R18.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R28.2 <-> R3.2 + C10.1 <-> C20.- <-> C24.+ <-> C25.+ <-> C7.2 <-> D5.K <-> IC2.3 <-> IC3.8 <-> IC4.3 <-> P7.1 <-> R1.1 <-> R12.1 <-> R18.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R28.2 <-> R3.2 C12.1 <-> IC3.7 <-> R21.1 - C15.1 <-> IC3.6 <-> R21.2 - C15.2 <-> C16.1 <-> R22.1 <-> R23.2 - C16.2 <-> P7.1 <-> R24.2 - C17.1 <-> C18.1 <-> IC1.7 <-> R26.1 - C17.2 <-> R25.2 - C18.2 <-> C19.1 <-> IC1.6 <-> R26.2 - C19.2 <-> R27.2 - C2.1 <-> IC1.1 <-> IC1.2 - C2.2 <-> R4.2 <-> R5.1 - C20.1 <-> C5.2 <-> C8.2 <-> D2.2 <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> Q1.1 <-> Q2.1 <-> R15.1 <-> R9.2 - C21.1 <-> D2.1 <-> D3.2 - C21.2 <-> C22.1 <-> IC4.2 - C22.2 <-> C23.1 <-> IC4.4 - C23.2 <-> D4.1 <-> D5.1 <-> D6.2 - C24.2 <-> D4.2 <-> IC4.8 - C25.2 <-> D6.1 <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R10.1 <-> R16.1 + C15.+ <-> IC3.6 <-> R21.2 + C15.- <-> C16.+ <-> R22.1 <-> R23.2 + C16.- <-> P7.3 <-> R24.2 + C17.+ <-> C18.1 <-> IC1.7 <-> R26.1 + C17.- <-> R25.2 + C18.2 <-> C19.+ <-> IC1.6 <-> R26.2 + C19.- <-> R27.2 + C2.+ <-> IC1.1 <-> IC1.2 + C2.- <-> R4.2 <-> R5.1 + C20.+ <-> C5.2 <-> C8.2 <-> D2.K <-> IC1.5 <-> IC2.5 <-> IC3.5 <-> Q1.1 <-> Q2.1 <-> R15.1 <-> R9.2 + C21.+ <-> D2.A <-> D3.K + C21.- <-> C22.+ <-> IC4.2 + C22.- <-> C23.+ <-> IC4.4 + C23.- <-> D4.A <-> D5.A <-> D6.K + C24.- <-> D4.K <-> IC4.8 + C25.- <-> D6.A <-> IC1.4 <-> IC2.4 <-> IC3.4 <-> R10.1 <-> R16.1 C3.1 <-> C4.1 <-> Treble.2 C3.2 <-> IC2.2 <-> R5.2 <-> R7.1 - C4.2 <-> R6.1 <-> Treble.3 + C4.2 <-> R6.1 <-> Treble.1 C5.1 <-> HiMid.2 <-> Q1.3 <-> R9.1 C6.1 <-> R11.1 C8.1 <-> LoMid.2 <-> Q2.3 <-> R15.2 C9.1 <-> R17.2 - C9.2 <-> LoMidFreq.1 - D1.1 <-> Q4.3 - D1.2 <-> D3.1 <-> IC4.5 <-> Q4.1 - HiMid.1 <-> IC2.6 <-> LoMid.3 <-> R13.1 <-> R14.2 - HiMid.3 <-> IC2.1 <-> R6.2 <-> R7.2 <-> R8.1 - HiMidFreq.1 <-> R12.2 + C9.2 <-> LoMidFreq.3 + D1.A <-> Q4.3 + D1.K <-> D3.A <-> IC4.5 <-> Q4.1 + HiMid.1 <-> IC2.1 <-> R6.2 <-> R7.2 <-> R8.1 + HiMid.3 <-> IC2.6 <-> LoMid.1 <-> R13.1 <-> R14.2 + HiMidFreq.3 <-> R12.2 IC1.3 <-> R2.2 IC1.8 <-> P7.2 <-> R24.1 IC2.7 <-> R13.2 <-> R8.2 - IC3.1 <-> LoMid.1 <-> R19.2 <-> R20.2 + IC3.1 <-> LoMid.3 <-> R19.2 <-> R20.2 IC3.2 <-> R14.1 <-> R19.1 Q3.3 <-> R28.1 R10.2 <-> R11.2 R16.2 <-> R17.1 - R4.1 <-> Treble.1 + R4.1 <-> Treble.3 diff --git a/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt index f5ad7c377..ab844e4c5 100644 --- a/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> P1.3 - C1.2 <-> C3.2 <-> P1.1 <-> P3.2 <-> P3.3 <-> R1.1 + C1.1 <-> P1.1 + C1.2 <-> R1.1 C2.1 <-> C3.1 <-> R1.2 C2.2 <-> P2.2 - P2.3 <-> P3.1 + C3.2 <-> P1.3 <-> P3.1 <-> P3.2 + P2.1 <-> P3.3 diff --git a/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt index f5ad7c377..ab844e4c5 100644 --- a/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> P1.3 - C1.2 <-> C3.2 <-> P1.1 <-> P3.2 <-> P3.3 <-> R1.1 + C1.1 <-> P1.1 + C1.2 <-> R1.1 C2.1 <-> C3.1 <-> R1.2 C2.2 <-> P2.2 - P2.3 <-> P3.1 + C3.2 <-> P1.3 <-> P3.1 <-> P3.2 + P2.1 <-> P3.3 diff --git a/diylc-regression-data/input/v1/netlist/peppermill_excl_switches.txt b/diylc-regression-data/input/v1/netlist/peppermill_excl_switches.txt index 9fd932944..7d3d1f6f1 100644 --- a/diylc-regression-data/input/v1/netlist/peppermill_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/peppermill_excl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 + C1.2 <-> D1.A <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R2.2 <-> R4.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 - C3.2 <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> Q2.2 <-> Q2.3 <-> R6.1 + C3.- <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C4.1 <-> Q2.1 <-> VR1.3 C4.2 <-> R7.2 C5.2 <-> R7.1 - D1.2 <-> R3.1 + D1.K <-> R3.1 R4.2 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/peppermill_incl_switches.txt b/diylc-regression-data/input/v1/netlist/peppermill_incl_switches.txt index 9fd932944..7d3d1f6f1 100644 --- a/diylc-regression-data/input/v1/netlist/peppermill_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/peppermill_incl_switches.txt @@ -1,12 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 + C1.2 <-> D1.A <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R2.2 <-> R4.1 - C3.1 <-> Q2.2 <-> Q2.3 <-> R6.1 - C3.2 <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> Q2.2 <-> Q2.3 <-> R6.1 + C3.- <-> C5.1 <-> R1.2 <-> R3.2 <-> R5.2 <-> R6.2 C4.1 <-> Q2.1 <-> VR1.3 C4.2 <-> R7.2 C5.2 <-> R7.1 - D1.2 <-> R3.1 + D1.K <-> R3.1 R4.2 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt b/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt index 0f7972497..0747b386b 100644 --- a/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt @@ -1,4 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> D7.1 <-> D7.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 + C1.+ <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R5.2 + C1.- <-> C4.2 <-> C5.- <-> D1.A <-> D5.K <-> IC1.4 <-> R11.1 <-> R2.2 <-> R7.2 + C2.2 <-> IC1.3 <-> R3.1 + C3.+ <-> IC1.1 <-> R4.1 + C3.- <-> D1.K <-> D2.A + C4.1 <-> D2.K <-> D3.A + C5.+ <-> R6.2 <-> R7.1 <-> R8.1 + C6.1 <-> R8.2 <-> R9.1 + C7.1 <-> C8.2 <-> R9.2 + C7.2 <-> IC1.7 <-> R10.1 + C8.1 <-> C9.1 <-> IC1.6 <-> R10.2 + C9.2 <-> R11.2 + D3.K <-> R6.1 + D4.A <-> IC1.5 <-> R1.2 + D4.K <-> D6.A + D6.K <-> D7.A + IC1.2 <-> R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt b/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt index 0f7972497..0747b386b 100644 --- a/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt @@ -1,4 +1,20 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - 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.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> D7.1 <-> D7.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 + C1.+ <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R5.2 + C1.- <-> C4.2 <-> C5.- <-> D1.A <-> D5.K <-> IC1.4 <-> R11.1 <-> R2.2 <-> R7.2 + C2.2 <-> IC1.3 <-> R3.1 + C3.+ <-> IC1.1 <-> R4.1 + C3.- <-> D1.K <-> D2.A + C4.1 <-> D2.K <-> D3.A + C5.+ <-> R6.2 <-> R7.1 <-> R8.1 + C6.1 <-> R8.2 <-> R9.1 + C7.1 <-> C8.2 <-> R9.2 + C7.2 <-> IC1.7 <-> R10.1 + C8.1 <-> C9.1 <-> IC1.6 <-> R10.2 + C9.2 <-> R11.2 + D3.K <-> R6.1 + D4.A <-> IC1.5 <-> R1.2 + D4.K <-> D6.A + D6.K <-> D7.A + IC1.2 <-> R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt index a8fa6e05f..24bfd89d1 100644 --- a/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R2.2 <-> R3.2 - C2.1 <-> C4.2 <-> R1.1 <-> R3.1 <-> R4.1 + C1.1 <-> C2.2 <-> R2.2 + C1.2 <-> Q1.1 <-> Q1.2 <-> R3.2 + C2.1 <-> C4.- <-> R1.1 <-> R3.1 <-> R4.1 C3.1 <-> R5.2 C3.2 <-> Q1.3 <-> R4.2 - R1.2 <-> R2.1 <-> R5.1 + R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt index a8fa6e05f..24bfd89d1 100644 --- a/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R2.2 <-> R3.2 - C2.1 <-> C4.2 <-> R1.1 <-> R3.1 <-> R4.1 + C1.1 <-> C2.2 <-> R2.2 + C1.2 <-> Q1.1 <-> Q1.2 <-> R3.2 + C2.1 <-> C4.- <-> R1.1 <-> R3.1 <-> R4.1 C3.1 <-> R5.2 C3.2 <-> Q1.3 <-> R4.2 - R1.2 <-> R2.1 <-> R5.1 + R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt index 933233066..7ef7e628e 100644 --- a/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt @@ -1,7 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.1 <-> Q2.3 <-> R4.3 - C1.2 <-> C2.2 <-> C3.1 <-> R3.2 <-> R5.1 <-> R5.2 - C2.1 <-> C3.2 <-> C4.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R4.1 <-> R4.2 <-> R6.2 <-> R7.2 - C4.2 <-> R1.1 <-> R2.1 <-> R7.1 + C1.2 <-> R3.2 <-> R5.1 + C2.1 <-> C3.- <-> R7.2 + C2.2 <-> C3.+ <-> R5.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R4.1 <-> R4.2 <-> R6.2 + C4.- <-> R1.1 <-> R2.1 <-> R7.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt index 933233066..7ef7e628e 100644 --- a/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt @@ -1,7 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.1 <-> Q2.3 <-> R4.3 - C1.2 <-> C2.2 <-> C3.1 <-> R3.2 <-> R5.1 <-> R5.2 - C2.1 <-> C3.2 <-> C4.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R4.1 <-> R4.2 <-> R6.2 <-> R7.2 - C4.2 <-> R1.1 <-> R2.1 <-> R7.1 + C1.2 <-> R3.2 <-> R5.1 + C2.1 <-> C3.- <-> R7.2 + C2.2 <-> C3.+ <-> R5.2 + C4.+ <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R4.1 <-> R4.2 <-> R6.2 + C4.- <-> R1.1 <-> R2.1 <-> R7.1 + Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/pig_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/pig_booster_excl_switches.txt index ea737cd58..401172bcf 100644 --- a/diylc-regression-data/input/v1/netlist/pig_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/pig_booster_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.1 - C1.2 <-> R1.1 - C2.1 <-> IC1.3 <-> IC1.8 <-> R4.2 <-> R5.1 - C2.2 <-> IC1.4 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> IC1.6 - C3.2 <-> R6.1 + C1.+ <-> R2.1 + C1.- <-> R1.1 + C2.+ <-> IC1.3 <-> IC1.8 <-> R4.2 <-> R5.1 + C2.- <-> IC1.4 <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> IC1.6 + C3.- <-> R6.1 IC1.1 <-> R3.1 <-> R7.2 IC1.2 <-> R2.2 <-> R3.2 IC1.5 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/pig_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/pig_booster_incl_switches.txt index ea737cd58..401172bcf 100644 --- a/diylc-regression-data/input/v1/netlist/pig_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/pig_booster_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R2.1 - C1.2 <-> R1.1 - C2.1 <-> IC1.3 <-> IC1.8 <-> R4.2 <-> R5.1 - C2.2 <-> IC1.4 <-> R1.2 <-> R5.2 <-> R6.2 - C3.1 <-> IC1.6 - C3.2 <-> R6.1 + C1.+ <-> R2.1 + C1.- <-> R1.1 + C2.+ <-> IC1.3 <-> IC1.8 <-> R4.2 <-> R5.1 + C2.- <-> IC1.4 <-> R1.2 <-> R5.2 <-> R6.2 + C3.+ <-> IC1.6 + C3.- <-> R6.1 IC1.1 <-> R3.1 <-> R7.2 IC1.2 <-> R2.2 <-> R3.2 IC1.5 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/polarity_protection_excl_switches.txt b/diylc-regression-data/input/v1/netlist/polarity_protection_excl_switches.txt index 1e469e4f2..f713dc80c 100644 --- a/diylc-regression-data/input/v1/netlist/polarity_protection_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/polarity_protection_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 - D1.2 <-> Q2.3 <-> R1.1 <-> R3.2 + D1.A <-> Q2.1 <-> Q2.2 <-> R1.2 + D1.K <-> Q2.3 <-> R1.1 <-> R3.2 Q1.1 <-> Q1.2 <-> R2.2 <-> R3.1 Q1.3 <-> R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/polarity_protection_incl_switches.txt b/diylc-regression-data/input/v1/netlist/polarity_protection_incl_switches.txt index 1e469e4f2..f713dc80c 100644 --- a/diylc-regression-data/input/v1/netlist/polarity_protection_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/polarity_protection_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - D1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 - D1.2 <-> Q2.3 <-> R1.1 <-> R3.2 + D1.A <-> Q2.1 <-> Q2.2 <-> R1.2 + D1.K <-> Q2.3 <-> R1.1 <-> R3.2 Q1.1 <-> Q1.2 <-> R2.2 <-> R3.1 Q1.3 <-> R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt b/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt index 51ffda55c..9084ad269 100644 --- a/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt @@ -1,7 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> C5.2 <-> C6.2 <-> C8.1 <-> C9.1 <-> D3.2 <-> D4.2 <-> D7.1 <-> Q1.1 <-> Q1.2 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D6.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 - C2.1 <-> C4.1 <-> C7.1 <-> D1.2 <-> D4.1 <-> D6.1 <-> D7.2 <-> Q2.1 - C6.1 <-> C7.2 <-> C8.2 <-> C9.2 <-> D2.2 <-> D3.1 + C1.+ <-> D3.K <-> D4.K <-> Q1.1 <-> Q1.2 + C1.- <-> C2.- <-> C3.- <-> C4.2 <-> C5.1 <-> D1.A <-> D2.A <-> Q1.3 <-> Q2.2 <-> Q2.3 + C2.+ <-> C4.1 <-> C7.+ <-> D1.K <-> D4.A <-> D6.A <-> D7.K <-> Q2.1 + C3.+ <-> C5.2 + C6.+ <-> C7.- <-> C8.2 <-> C9.2 <-> D2.K <-> D3.A + C6.- <-> C8.1 <-> C9.1 <-> D7.A diff --git a/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt b/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt index 51ffda55c..9084ad269 100644 --- a/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt @@ -1,7 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> C5.2 <-> C6.2 <-> C8.1 <-> C9.1 <-> D3.2 <-> D4.2 <-> D7.1 <-> Q1.1 <-> Q1.2 - C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D6.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 - C2.1 <-> C4.1 <-> C7.1 <-> D1.2 <-> D4.1 <-> D6.1 <-> D7.2 <-> Q2.1 - C6.1 <-> C7.2 <-> C8.2 <-> C9.2 <-> D2.2 <-> D3.1 + C1.+ <-> D3.K <-> D4.K <-> Q1.1 <-> Q1.2 + C1.- <-> C2.- <-> C3.- <-> C4.2 <-> C5.1 <-> D1.A <-> D2.A <-> Q1.3 <-> Q2.2 <-> Q2.3 + C2.+ <-> C4.1 <-> C7.+ <-> D1.K <-> D4.A <-> D6.A <-> D7.K <-> Q2.1 + C3.+ <-> C5.2 + C6.+ <-> C7.- <-> C8.2 <-> C9.2 <-> D2.K <-> D3.A + C6.- <-> C8.1 <-> C9.1 <-> D7.A diff --git a/diylc-regression-data/input/v1/netlist/puzzle87_comp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/puzzle87_comp_excl_switches.txt index 3f9264d33..b3b261f4c 100644 --- a/diylc-regression-data/input/v1/netlist/puzzle87_comp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/puzzle87_comp_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Attack.1 <-> Attack.2 <-> D1.2 <-> D2.2 - Attack.3 <-> C10.1 <-> Ratio.1 + Attack.1 <-> C10.+ <-> Ratio.3 + Attack.2 <-> Attack.3 <-> D1.K <-> D2.K C1.1 <-> R2.2 C1.2 <-> R1.2 <-> S1.3 - C10.2 <-> C12.1 <-> C3.2 <-> C5.2 <-> C6.1 <-> C7.2 <-> IC1.4 <-> IC2.4 <-> Level.3 <-> R1.1 <-> R10.2 <-> R11.2 <-> R12.1 <-> R15.1 <-> R4.1 + C10.- <-> C12.1 <-> C3.- <-> C5.- <-> C6.1 <-> C7.- <-> IC1.4 <-> IC2.4 <-> Level.1 <-> R1.1 <-> R10.2 <-> R11.2 <-> R12.1 <-> R15.1 <-> R4.1 C11.1 <-> IC2.8 <-> Q2.1 <-> R15.2 C11.2 <-> R14.2 - C12.2 <-> C6.2 <-> C7.1 <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 + C12.2 <-> C6.2 <-> C7.+ <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 C2.1 <-> Q1.1 <-> R14.1 <-> R2.1 C2.2 <-> IC1.3 <-> R3.1 <-> R4.2 - C3.1 <-> R5.1 - C4.1 <-> C8.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 - C4.2 <-> Level.1 - C5.1 <-> IC1.8 <-> R8.2 - C8.2 <-> D1.1 <-> R10.1 - C9.1 <-> IC1.6 <-> R9.2 - C9.2 <-> D2.1 <-> R11.1 + C3.+ <-> R5.1 + C4.1 <-> C8.+ <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 + C4.2 <-> Level.3 + C5.+ <-> IC1.8 <-> R8.2 + C8.- <-> D1.A <-> R10.1 + C9.+ <-> IC1.6 <-> R9.2 + C9.- <-> D2.A <-> R11.1 IC1.2 <-> R5.2 <-> R6.1 IC1.7 <-> R7.2 <-> R9.1 IC2.1 <-> IC2.2 <-> R13.1 @@ -24,8 +24,8 @@ Switch setup: [Default] IC2.6 <-> Q1.2 <-> Q1.3 <-> R16.2 IC2.7 <-> R13.2 <-> R16.1 Level.2 <-> S1.8 - R12.2 <-> Ratio.3 + R12.2 <-> Ratio.1 S1.1 <-> S1.9 - Thres.1 <-> VR1.3 - Thres.2 <-> Thres.3 + Thres.1 <-> Thres.2 + Thres.3 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/puzzle87_comp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/puzzle87_comp_incl_switches.txt index 42472c5ea..142c9f234 100644 --- a/diylc-regression-data/input/v1/netlist/puzzle87_comp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/puzzle87_comp_incl_switches.txt @@ -1,29 +1,29 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - Attack.1 <-> Attack.2 <-> D1.2 <-> D2.2 - Attack.3 <-> C10.1 <-> Ratio.1 + Attack.1 <-> C10.+ <-> Ratio.3 + Attack.2 <-> Attack.3 <-> D1.K <-> D2.K C1.1 <-> R2.2 C1.2 <-> R1.2 - C10.2 <-> C12.1 <-> C3.2 <-> C5.2 <-> C6.1 <-> C7.2 <-> IC1.4 <-> IC2.4 <-> Level.3 <-> R1.1 <-> R10.2 <-> R11.2 <-> R12.1 <-> R15.1 <-> R4.1 + C10.- <-> C12.1 <-> C3.- <-> C5.- <-> C6.1 <-> C7.- <-> IC1.4 <-> IC2.4 <-> Level.1 <-> R1.1 <-> R10.2 <-> R11.2 <-> R12.1 <-> R15.1 <-> R4.1 C11.1 <-> IC2.8 <-> Q2.1 <-> R15.2 C11.2 <-> R14.2 - C12.2 <-> C6.2 <-> C7.1 <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 + C12.2 <-> C6.2 <-> C7.+ <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 C2.1 <-> Q1.1 <-> R14.1 <-> R2.1 C2.2 <-> IC1.3 <-> R3.1 <-> R4.2 - C3.1 <-> R5.1 - C4.1 <-> C8.1 <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 - C4.2 <-> Level.1 - C5.1 <-> IC1.8 <-> R8.2 - C8.2 <-> D1.1 <-> R10.1 - C9.1 <-> IC1.6 <-> R9.2 - C9.2 <-> D2.1 <-> R11.1 + C3.+ <-> R5.1 + C4.1 <-> C8.+ <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 + C4.2 <-> Level.3 + C5.+ <-> IC1.8 <-> R8.2 + C8.- <-> D1.A <-> R10.1 + C9.+ <-> IC1.6 <-> R9.2 + C9.- <-> D2.A <-> R11.1 IC1.2 <-> R5.2 <-> R6.1 IC1.7 <-> R7.2 <-> R9.1 IC2.1 <-> IC2.2 <-> R13.1 IC2.3 <-> Ratio.2 IC2.6 <-> Q1.2 <-> Q1.3 <-> R16.2 IC2.7 <-> R13.2 <-> R16.1 - R12.2 <-> Ratio.3 - Thres.1 <-> VR1.3 - Thres.2 <-> Thres.3 + R12.2 <-> Ratio.1 + Thres.1 <-> Thres.2 + Thres.3 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt index b58c82d0d..e77c34f3f 100644 --- a/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> JRC386D.6 - C1.2 <-> C3.2 <-> JRC386D.4 <-> Octave.3 <-> Volume.3 <-> VR1.2 - C2.1 <-> JRC386D.8 - C2.2 <-> Volume.1 - C3.1 <-> Gain.2 <-> Gain.3 - D1.1 <-> D2.2 - D1.2 <-> JRC386D.3 <-> VR1.1 <-> VR1.3 - D2.1 <-> Octave.1 - Gain.1 <-> R1.2 + C1.+ <-> JRC386D.6 + C1.- <-> C3.- <-> JRC386D.4 <-> Octave.1 <-> Volume.1 <-> VR1.2 + C2.+ <-> JRC386D.8 + C2.- <-> Volume.3 + C3.+ <-> Gain.1 <-> Gain.2 + D1.A <-> D2.K + D1.K <-> JRC386D.3 <-> VR1.1 <-> VR1.3 + D2.A <-> Octave.3 + Gain.3 <-> R1.2 JRC386D.1 <-> JRC386D.5 <-> R1.1 JRC386D.2 <-> Octave.2 diff --git a/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt index b58c82d0d..e77c34f3f 100644 --- a/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> JRC386D.6 - C1.2 <-> C3.2 <-> JRC386D.4 <-> Octave.3 <-> Volume.3 <-> VR1.2 - C2.1 <-> JRC386D.8 - C2.2 <-> Volume.1 - C3.1 <-> Gain.2 <-> Gain.3 - D1.1 <-> D2.2 - D1.2 <-> JRC386D.3 <-> VR1.1 <-> VR1.3 - D2.1 <-> Octave.1 - Gain.1 <-> R1.2 + C1.+ <-> JRC386D.6 + C1.- <-> C3.- <-> JRC386D.4 <-> Octave.1 <-> Volume.1 <-> VR1.2 + C2.+ <-> JRC386D.8 + C2.- <-> Volume.3 + C3.+ <-> Gain.1 <-> Gain.2 + D1.A <-> D2.K + D1.K <-> JRC386D.3 <-> VR1.1 <-> VR1.3 + D2.A <-> Octave.3 + Gain.3 <-> R1.2 JRC386D.1 <-> JRC386D.5 <-> R1.1 JRC386D.2 <-> Octave.2 diff --git a/diylc-regression-data/input/v1/netlist/range_pig_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/range_pig_pcb_excl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/v1/netlist/range_pig_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/range_pig_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/range_pig_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/range_pig_pcb_incl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/v1/netlist/range_pig_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/range_pig_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/range_pig_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/range_pig_perf_excl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/v1/netlist/range_pig_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/range_pig_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/range_pig_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/range_pig_perf_incl_switches.txt index bfd1c8f58..6cf6b8977 100644 --- a/diylc-regression-data/input/v1/netlist/range_pig_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/range_pig_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 <-> R3.1 - C2.1 <-> R1.1 <-> R3.2 <-> R4.2 - C2.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.+ <-> R1.1 <-> R3.2 <-> R4.2 + C2.- <-> Q2.1 <-> Q2.2 <-> R4.1 Q1.1 <-> Q1.2 <-> VR1.1 Q2.3 <-> VR1.2 <-> VR1.3 diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_excl_switches.txt index fe575ee4a..bbe9f9395 100644 --- a/diylc-regression-data/input/v1/netlist/rangemaster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rangemaster_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.1 <-> R3.1 - C1.2 <-> Q1.1 <-> R1.2 - C2.2 <-> R2.2 + C1.+ <-> C2.+ <-> R1.1 <-> R3.1 + C1.- <-> Q1.1 <-> R1.2 + C2.- <-> R2.2 C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_incl_switches.txt index fe575ee4a..bbe9f9395 100644 --- a/diylc-regression-data/input/v1/netlist/rangemaster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rangemaster_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R1.1 <-> R3.1 - C1.2 <-> Q1.1 <-> R1.2 - C2.2 <-> R2.2 + C1.+ <-> C2.+ <-> R1.1 <-> R3.1 + C1.- <-> Q1.1 <-> R1.2 + C2.- <-> R2.2 C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt index 1b9756ed4..d791c2732 100644 --- a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 - C1.2 <-> C4.1 <-> Q1.3 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 - C3.1 <-> R2.2 - C4.2 <-> R1.1 <-> R5.1 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> C3.- <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 + C3.+ <-> R2.2 + C4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt index 1b9756ed4..d791c2732 100644 --- a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R3.1 - C1.2 <-> C4.1 <-> Q1.3 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1 - C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 - C3.1 <-> R2.2 - C4.2 <-> R1.1 <-> R5.1 + C1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R4.1 + C2.- <-> C3.- <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 + C3.+ <-> R2.2 + C4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/rebote_25_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rebote_25_excl_switches.txt index 1a26d5bae..a4d5c3a9d 100644 --- a/diylc-regression-data/input/v1/netlist/rebote_25_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rebote_25_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> IC1.8 C10.1 <-> R6.2 <-> R7.2 <-> R8.2 C11.1 <-> IC2.2 <-> R18.1 <-> R19.1 <-> R20.2 - C11.2 <-> C23.1 <-> IC2.1 + C11.2 <-> C23.+ <-> IC2.1 C12.1 <-> R11.2 C12.2 <-> C9.1 <-> R10.2 <-> R8.1 - C13.1 <-> IC1.2 - C14.1 <-> C15.2 <-> IC1.1 <-> Q1.1 - C16.2 <-> IC1.3 <-> IC1.4 <-> Q1.3 - C17.1 <-> IC2.5 - C18.1 <-> R12.1 <-> R13.2 <-> R14.1 <-> R15.1 - C18.2 <-> C2.1 <-> C7.2 <-> R22.2 - C19.1 <-> R20.1 - C19.2 <-> R10.1 + C13.+ <-> IC1.2 + C14.+ <-> C15.2 <-> IC1.1 <-> Q1.1 + C16.- <-> IC1.3 <-> IC1.4 <-> Q1.3 + C17.+ <-> IC2.5 + C18.+ <-> R12.1 <-> R13.2 <-> R14.1 <-> R15.1 + C18.- <-> C2.1 <-> C7.2 <-> R22.2 + C19.+ <-> R20.1 + C19.- <-> R10.1 C2.2 <-> IC1.7 - C20.2 <-> C21.1 <-> R16.1 + C20.2 <-> C21.+ <-> R16.1 C22.1 <-> R9.1 C22.2 <-> R17.1 - C23.2 <-> R22.1 - C25.1 <-> R19.2 + C23.- <-> R22.1 + C25.+ <-> R19.2 C26.1 <-> IC2.7 <-> R17.2 <-> R21.1 C26.2 <-> IC2.6 <-> R21.2 C3.1 <-> IC1.14 diff --git a/diylc-regression-data/input/v1/netlist/rebote_25_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rebote_25_incl_switches.txt index 1a26d5bae..a4d5c3a9d 100644 --- a/diylc-regression-data/input/v1/netlist/rebote_25_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rebote_25_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> IC1.8 C10.1 <-> R6.2 <-> R7.2 <-> R8.2 C11.1 <-> IC2.2 <-> R18.1 <-> R19.1 <-> R20.2 - C11.2 <-> C23.1 <-> IC2.1 + C11.2 <-> C23.+ <-> IC2.1 C12.1 <-> R11.2 C12.2 <-> C9.1 <-> R10.2 <-> R8.1 - C13.1 <-> IC1.2 - C14.1 <-> C15.2 <-> IC1.1 <-> Q1.1 - C16.2 <-> IC1.3 <-> IC1.4 <-> Q1.3 - C17.1 <-> IC2.5 - C18.1 <-> R12.1 <-> R13.2 <-> R14.1 <-> R15.1 - C18.2 <-> C2.1 <-> C7.2 <-> R22.2 - C19.1 <-> R20.1 - C19.2 <-> R10.1 + C13.+ <-> IC1.2 + C14.+ <-> C15.2 <-> IC1.1 <-> Q1.1 + C16.- <-> IC1.3 <-> IC1.4 <-> Q1.3 + C17.+ <-> IC2.5 + C18.+ <-> R12.1 <-> R13.2 <-> R14.1 <-> R15.1 + C18.- <-> C2.1 <-> C7.2 <-> R22.2 + C19.+ <-> R20.1 + C19.- <-> R10.1 C2.2 <-> IC1.7 - C20.2 <-> C21.1 <-> R16.1 + C20.2 <-> C21.+ <-> R16.1 C22.1 <-> R9.1 C22.2 <-> R17.1 - C23.2 <-> R22.1 - C25.1 <-> R19.2 + C23.- <-> R22.1 + C25.+ <-> R19.2 C26.1 <-> IC2.7 <-> R17.2 <-> R21.1 C26.2 <-> IC2.6 <-> R21.2 C3.1 <-> IC1.14 diff --git a/diylc-regression-data/input/v1/netlist/red_llama_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/red_llama_pcb_excl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/v1/netlist/red_llama_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/red_llama_pcb_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/red_llama_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/red_llama_pcb_incl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/v1/netlist/red_llama_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/red_llama_pcb_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/red_llama_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/red_llama_perf_excl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/v1/netlist/red_llama_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/red_llama_perf_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/red_llama_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/red_llama_perf_incl_switches.txt index 52260fb1c..fb4050413 100644 --- a/diylc-regression-data/input/v1/netlist/red_llama_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/red_llama_perf_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> IC1.5 <-> R2.1 C1.2 <-> R1.2 <-> R6.1 C2.2 <-> C3.2 <-> IC1.4 - C3.1 <-> C4.2 <-> C5.1 <-> IC1.3 <-> R3.2 + C3.1 <-> C4.2 <-> C5.+ <-> IC1.3 <-> R3.2 C4.1 <-> IC1.2 <-> R3.1 - C6.1 <-> D1.1 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 - C6.2 <-> D1.2 <-> IC1.1 <-> R5.2 + C6.+ <-> D1.A <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.7 <-> IC1.8 <-> R4.2 <-> R6.2 + C6.- <-> D1.K <-> IC1.1 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt index ab45f1d43..1d314427b 100644 --- a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt @@ -1,13 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R14.1 - C1.2 <-> C2.2 <-> D3.1 <-> R14.2 <-> R2.2 <-> R4.2 - C10.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> D3.2 <-> IC1.11 <-> IC1.16 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.1 <-> R7.1 - C2.1 <-> C8.1 <-> C9.2 <-> IC1.10 <-> IC1.2 <-> R3.2 - C3.1 <-> C5.1 <-> R10.1 <-> R6.1 <-> R8.1 <-> R9.1 - C4.1 <-> C7.1 <-> R11.1 <-> R8.2 - C4.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> IC1.15 <-> IC1.7 <-> R7.2 - C6.2 <-> C7.2 <-> IC1.14 <-> IC1.6 <-> R10.2 <-> R4.1 <-> R5.1 <-> R6.2 - C8.2 <-> IC1.13 <-> IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 <-> R13.2 - C9.1 <-> IC1.12 <-> IC1.4 <-> R12.2 <-> R5.2 + C1.1 <-> IC1.9 <-> R1.1 + C1.2 <-> R2.2 + C10.+ <-> IC1.1 <-> R14.1 + C10.- <-> C5.2 <-> D3.K <-> IC1.3 <-> IC1.8 <-> R1.2 + C2.1 <-> C8.1 <-> IC1.10 <-> R3.2 + C2.2 <-> R4.2 + C3.1 <-> R6.1 + C3.2 <-> D1.A <-> D2.A <-> IC1.16 <-> R7.1 + C4.1 <-> R8.2 + C4.2 <-> D1.K <-> D2.K <-> IC1.15 <-> R7.2 + C5.1 <-> R10.1 <-> R8.1 <-> R9.1 + C6.1 <-> IC1.7 + C6.2 <-> C7.2 <-> IC1.6 <-> R10.2 + C7.1 <-> R11.1 + C8.2 <-> R13.2 + C9.1 <-> IC1.4 <-> R12.2 + D3.A <-> R14.2 + IC1.11 <-> R2.1 <-> R3.1 + IC1.12 <-> R5.2 + IC1.14 <-> R4.1 <-> R5.1 + IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 diff --git a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt index ab45f1d43..1d314427b 100644 --- a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt @@ -1,13 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C10.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R14.1 - C1.2 <-> C2.2 <-> D3.1 <-> R14.2 <-> R2.2 <-> R4.2 - C10.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> D3.2 <-> IC1.11 <-> IC1.16 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.1 <-> R7.1 - C2.1 <-> C8.1 <-> C9.2 <-> IC1.10 <-> IC1.2 <-> R3.2 - C3.1 <-> C5.1 <-> R10.1 <-> R6.1 <-> R8.1 <-> R9.1 - C4.1 <-> C7.1 <-> R11.1 <-> R8.2 - C4.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> IC1.15 <-> IC1.7 <-> R7.2 - C6.2 <-> C7.2 <-> IC1.14 <-> IC1.6 <-> R10.2 <-> R4.1 <-> R5.1 <-> R6.2 - C8.2 <-> IC1.13 <-> IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 <-> R13.2 - C9.1 <-> IC1.12 <-> IC1.4 <-> R12.2 <-> R5.2 + C1.1 <-> IC1.9 <-> R1.1 + C1.2 <-> R2.2 + C10.+ <-> IC1.1 <-> R14.1 + C10.- <-> C5.2 <-> D3.K <-> IC1.3 <-> IC1.8 <-> R1.2 + C2.1 <-> C8.1 <-> IC1.10 <-> R3.2 + C2.2 <-> R4.2 + C3.1 <-> R6.1 + C3.2 <-> D1.A <-> D2.A <-> IC1.16 <-> R7.1 + C4.1 <-> R8.2 + C4.2 <-> D1.K <-> D2.K <-> IC1.15 <-> R7.2 + C5.1 <-> R10.1 <-> R8.1 <-> R9.1 + C6.1 <-> IC1.7 + C6.2 <-> C7.2 <-> IC1.6 <-> R10.2 + C7.1 <-> R11.1 + C8.2 <-> R13.2 + C9.1 <-> IC1.4 <-> R12.2 + D3.A <-> R14.2 + IC1.11 <-> R2.1 <-> R3.1 + IC1.12 <-> R5.2 + IC1.14 <-> R4.1 <-> R5.1 + IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 diff --git a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_excl_switches.txt b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_excl_switches.txt index 365a02b99..f4ab8a06f 100644 --- a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R4.2 C1.2 <-> R1.1 - C10.1 <-> D2.1 <-> Q3.1 <-> Q3.2 <-> R14.2 <-> R17.2 - C10.2 <-> R17.1 + C10.+ <-> D2.A <-> Q3.1 <-> Q3.2 <-> R14.2 <-> R17.2 + C10.- <-> R17.1 C11.2 <-> Q4.3 <-> R18.1 <-> R19.2 C12.1 <-> Q4.1 <-> Q4.2 <-> R20.1 C12.2 <-> R21.2 - C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> C3.2 <-> C5.1 <-> C6.2 <-> R1.2 <-> R13.2 <-> R14.1 <-> R16.2 <-> R19.1 <-> R20.2 <-> R21.1 <-> R4.1 <-> R6.2 <-> R8.2 - C4.1 <-> R5.2 <-> R9.1 + C2.+ <-> R2.1 <-> R3.1 + C2.- <-> C3.2 <-> C5.1 <-> C6.2 <-> R1.2 <-> R13.2 <-> R14.1 <-> R16.2 <-> R19.1 <-> R20.2 <-> R21.1 <-> R4.1 <-> R6.2 <-> R8.2 + C4.+ <-> R5.2 <-> R9.1 C5.2 <-> Q2.1 <-> Q2.2 <-> R8.1 C6.1 <-> R7.2 C7.1 <-> R11.2 <-> R9.2 C7.2 <-> Q3.3 <-> R10.1 <-> R13.1 - C8.1 <-> D1.1 <-> R12.2 <-> R15.2 - C8.2 <-> R15.1 - C9.2 <-> D1.2 <-> D2.2 <-> R16.1 + C8.+ <-> D1.A <-> R12.2 <-> R15.2 + C8.- <-> R15.1 + C9.2 <-> D1.K <-> D2.K <-> R16.1 Q1.1 <-> R5.1 Q2.3 <-> R6.1 <-> R7.1 R10.2 <-> R11.1 <-> R12.1 <-> R18.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_incl_switches.txt b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_incl_switches.txt index 365a02b99..f4ab8a06f 100644 --- a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C3.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R4.2 C1.2 <-> R1.1 - C10.1 <-> D2.1 <-> Q3.1 <-> Q3.2 <-> R14.2 <-> R17.2 - C10.2 <-> R17.1 + C10.+ <-> D2.A <-> Q3.1 <-> Q3.2 <-> R14.2 <-> R17.2 + C10.- <-> R17.1 C11.2 <-> Q4.3 <-> R18.1 <-> R19.2 C12.1 <-> Q4.1 <-> Q4.2 <-> R20.1 C12.2 <-> R21.2 - C2.1 <-> R2.1 <-> R3.1 - C2.2 <-> C3.2 <-> C5.1 <-> C6.2 <-> R1.2 <-> R13.2 <-> R14.1 <-> R16.2 <-> R19.1 <-> R20.2 <-> R21.1 <-> R4.1 <-> R6.2 <-> R8.2 - C4.1 <-> R5.2 <-> R9.1 + C2.+ <-> R2.1 <-> R3.1 + C2.- <-> C3.2 <-> C5.1 <-> C6.2 <-> R1.2 <-> R13.2 <-> R14.1 <-> R16.2 <-> R19.1 <-> R20.2 <-> R21.1 <-> R4.1 <-> R6.2 <-> R8.2 + C4.+ <-> R5.2 <-> R9.1 C5.2 <-> Q2.1 <-> Q2.2 <-> R8.1 C6.1 <-> R7.2 C7.1 <-> R11.2 <-> R9.2 C7.2 <-> Q3.3 <-> R10.1 <-> R13.1 - C8.1 <-> D1.1 <-> R12.2 <-> R15.2 - C8.2 <-> R15.1 - C9.2 <-> D1.2 <-> D2.2 <-> R16.1 + C8.+ <-> D1.A <-> R12.2 <-> R15.2 + C8.- <-> R15.1 + C9.2 <-> D1.K <-> D2.K <-> R16.1 Q1.1 <-> R5.1 Q2.3 <-> R6.1 <-> R7.1 R10.2 <-> R11.1 <-> R12.1 <-> R18.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/roger_mayer_octavia_vero_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_excl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_incl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_compressor_pcb_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/ross_compressor_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_compressor_perf_excl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/v1/netlist/ross_compressor_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_compressor_perf_excl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/ross_compressor_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_compressor_perf_incl_switches.txt index a8f7c2801..d1cf4dd30 100644 --- a/diylc-regression-data/input/v1/netlist/ross_compressor_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_compressor_perf_incl_switches.txt @@ -1,24 +1,24 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C10.2 <-> Q1.1 <-> R11.2 + C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C10.- <-> Q1.1 <-> R11.2 C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3 - C11.2 <-> C12.1 <-> R14.2 - C12.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 - C13.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C11.2 <-> C12.+ <-> R14.2 + C12.- <-> C16.- <-> C2.1 <-> C4.- <-> C5.- <-> C6.2 <-> C7.- <-> C8.- <-> C9.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 + C13.1 <-> D2.K <-> Q4.3 <-> R17.1 C13.2 <-> R16.1 C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C14.2 <-> R21.1 - C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C16.1 <-> Q5.3 <-> R20.1 + C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C16.+ <-> Q5.3 <-> R20.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> C6.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 - C7.1 <-> R5.2 <-> R8.1 - C8.1 <-> R10.2 <-> R7.2 - C9.1 <-> R9.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> C6.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C7.+ <-> R5.2 <-> R8.1 + C8.+ <-> R10.2 <-> R7.2 + C9.+ <-> R9.2 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 Q5.1 <-> Q5.2 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_excl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_incl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_perf_excl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_perf_incl_switches.txt index 96de835e6..62e99627c 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R2.1 <-> R5.1 - C1.2 <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 + C1.+ <-> R1.2 <-> R2.1 <-> R5.1 + C1.- <-> C2.2 <-> C3.2 <-> C7.2 <-> D1.K <-> D2.A <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2 C2.1 <-> IC1.5 <-> R1.1 C3.1 <-> C4.1 <-> R3.1 C4.2 <-> R4.1 @@ -9,7 +9,7 @@ Switch setup: [Default] C5.2 <-> R7.1 C6.1 <-> IC1.1 <-> R6.1 C6.2 <-> R8.1 - C7.1 <-> D1.1 <-> D2.2 <-> R8.2 + C7.1 <-> D1.A <-> D2.K <-> R8.2 IC1.3 <-> R4.2 <-> R5.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_excl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_incl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_pcb_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_excl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_incl_switches.txt index 5fb71ddef..b787e5b18 100644 --- a/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ross_distortion_usa_perf_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> R1.1 - C1.2 <-> C4.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> IC1.4 <-> R1.2 <-> R7.2 + C1.2 <-> C4.2 <-> C6.- <-> D1.A <-> D2.K <-> IC1.4 <-> R1.2 <-> R7.2 C2.2 <-> R2.1 - C3.1 <-> IC1.1 <-> R3.1 - C3.2 <-> R4.1 - C4.1 <-> D1.2 <-> D2.1 <-> R4.2 + C3.+ <-> IC1.1 <-> R3.1 + C3.- <-> R4.1 + C4.1 <-> D1.K <-> D2.A <-> R4.2 C5.1 <-> IC1.2 <-> R3.2 C5.2 <-> R5.2 - C6.1 <-> R6.2 <-> R7.1 <-> R8.1 + C6.+ <-> R6.2 <-> R7.1 <-> R8.1 C7.1 <-> IC1.5 <-> R6.1 IC1.3 <-> R2.2 <-> R8.2 IC1.6 <-> IC1.7 diff --git a/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt index 35f6f93a9..f31bd78a0 100644 --- a/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.2 - C3.1 <-> IC1.2 <-> IC1.6 + C1.1 <-> Q1.3 <-> R2.2 + C2.+ <-> IC1.7 + C2.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C3.1 <-> IC1.6 C4.1 <-> R3.1 - IC1.1 <-> IC1.5 + C5.+ <-> IC1.8 <-> R3.2 Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt index 35f6f93a9..f31bd78a0 100644 --- a/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.2 - C3.1 <-> IC1.2 <-> IC1.6 + C1.1 <-> Q1.3 <-> R2.2 + C2.+ <-> IC1.7 + C2.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C3.1 <-> IC1.6 C4.1 <-> R3.1 - IC1.1 <-> IC1.5 + C5.+ <-> IC1.8 <-> R3.2 Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby2_excl_switches.txt index 16061cbbf..426b1a915 100644 --- a/diylc-regression-data/input/v1/netlist/ruby2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby2_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.1 C2.1 <-> IC1.6 C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C3.1 <-> R3.2 - C4.1 <-> IC1.8 <-> R3.1 - C5.1 <-> IC1.7 <-> Q1.1 + C4.+ <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.7 <-> Q1.1 diff --git a/diylc-regression-data/input/v1/netlist/ruby2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby2_incl_switches.txt index 16061cbbf..426b1a915 100644 --- a/diylc-regression-data/input/v1/netlist/ruby2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby2_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R2.1 C2.1 <-> IC1.6 C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C3.1 <-> R3.2 - C4.1 <-> IC1.8 <-> R3.1 - C5.1 <-> IC1.7 <-> Q1.1 + C4.+ <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.7 <-> Q1.1 diff --git a/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt index a7fa11c1c..8e1b42b9e 100644 --- a/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.- <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.1 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.+ <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt index a7fa11c1c..8e1b42b9e 100644 --- a/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 + C2.1 <-> C3.2 <-> C4.- <-> IC1.3 <-> IC1.4 <-> R2.1 <-> R3.1 C2.2 <-> R1.1 C3.1 <-> IC1.6 - C4.1 <-> IC1.7 <-> Q1.1 - C5.1 <-> IC1.8 <-> R1.2 + C4.+ <-> IC1.7 <-> Q1.1 + C5.+ <-> IC1.8 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby_amp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_amp_excl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_amp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_amp_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/ruby_amp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_amp_incl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_amp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_amp_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt index 564e7ccda..dea2fb4ab 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 - C3.1 <-> IC1.2 <-> IC1.6 + C1.1 <-> Q1.3 <-> R2.2 + C2.+ <-> C5.+ <-> IC1.7 <-> R3.1 + C2.- <-> C3.2 <-> C4.2 <-> C5.- <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C3.1 <-> IC1.6 C4.1 <-> R3.2 - IC1.1 <-> IC1.5 Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt index 564e7ccda..dea2fb4ab 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 - C3.1 <-> IC1.2 <-> IC1.6 + C1.1 <-> Q1.3 <-> R2.2 + C2.+ <-> C5.+ <-> IC1.7 <-> R3.1 + C2.- <-> C3.2 <-> C4.2 <-> C5.- <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1 + C3.1 <-> IC1.6 C4.1 <-> R3.2 - IC1.1 <-> IC1.5 Q1.1 <-> Q1.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_excl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_incl_switches.txt index bdb7eeaaf..c9fe5e331 100644 --- a/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ruby_mini_amp_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.7 <-> Q1.1 - C1.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 + C1.+ <-> IC1.7 <-> Q1.1 + C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2 C2.1 <-> Q1.2 <-> Q1.3 <-> R2.1 C3.1 <-> IC1.6 C4.1 <-> R3.2 - C5.1 <-> IC1.8 <-> R3.1 + C5.+ <-> IC1.8 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_excl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_incl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/saffross_squeeze_pcb_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_excl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_excl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_incl_switches.txt index c5f502116..a7bd6671f 100644 --- a/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/saffross_squeeze_perf_incl_switches.txt @@ -1,23 +1,23 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R6.1 C1.2 <-> C2.2 <-> R1.1 - C10.1 <-> C9.1 <-> R14.1 - C10.2 <-> C14.2 <-> C16.2 <-> C2.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.1 <-> D3.1 <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 - C11.1 <-> D2.2 <-> Q4.3 <-> R17.1 + C10.+ <-> C9.1 <-> R14.1 + C10.- <-> C14.- <-> C16.2 <-> C2.1 <-> C4.- <-> C5.- <-> C6.- <-> C7.- <-> D1.A <-> D2.A <-> D3.A <-> IC1.4 <-> Q3.1 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R11.1 <-> R12.2 <-> R13.2 <-> R15.2 <-> R17.2 <-> R18.1 <-> R2.2 <-> R22.2 + C11.1 <-> D2.K <-> Q4.3 <-> R17.1 C11.2 <-> R16.1 C12.1 <-> C13.1 <-> Q2.1 <-> Q2.2 <-> R15.1 C12.2 <-> R21.1 - C13.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2 - C14.1 <-> C15.2 <-> Q5.3 <-> R20.1 - C15.1 <-> C16.1 <-> D1.2 <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 + C13.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2 + C14.+ <-> C15.- <-> Q5.3 <-> R20.1 + C15.+ <-> C16.1 <-> D1.K <-> IC1.6 <-> R16.2 <-> R20.2 <-> R4.2 <-> R7.1 <-> R9.1 C3.1 <-> IC1.7 <-> Q2.3 <-> R3.2 - C3.2 <-> C4.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 - C5.1 <-> R5.2 <-> R8.1 - C6.1 <-> R10.2 <-> R7.2 - C7.1 <-> R9.2 - C8.1 <-> IC1.2 <-> R12.1 <-> VR1.1 - C8.2 <-> Q1.1 <-> R11.2 + C3.2 <-> C4.+ <-> R2.1 <-> R3.1 <-> R4.1 <-> R5.1 + C5.+ <-> R5.2 <-> R8.1 + C6.+ <-> R10.2 <-> R7.2 + C7.+ <-> R9.2 + C8.+ <-> IC1.2 <-> R12.1 <-> VR1.1 + C8.- <-> Q1.1 <-> R11.2 C9.2 <-> IC1.3 <-> R13.1 <-> R14.2 <-> VR1.3 IC1.8 <-> R19.1 Q1.2 <-> Q1.3 <-> R6.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/screaming_bird_excl_switches.txt b/diylc-regression-data/input/v1/netlist/screaming_bird_excl_switches.txt index 6bdc9eeda..37c999c95 100644 --- a/diylc-regression-data/input/v1/netlist/screaming_bird_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/screaming_bird_excl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R3.1 - C2.2 <-> P1.3 - P1.1 <-> R2.2 <-> R4.2 + C2.2 <-> P1.1 + P1.3 <-> R2.2 <-> R4.2 R1.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/screaming_bird_incl_switches.txt b/diylc-regression-data/input/v1/netlist/screaming_bird_incl_switches.txt index 6bdc9eeda..37c999c95 100644 --- a/diylc-regression-data/input/v1/netlist/screaming_bird_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/screaming_bird_incl_switches.txt @@ -1,8 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.1 <-> R2.1 C2.1 <-> Q1.1 <-> R3.1 - C2.2 <-> P1.3 - P1.1 <-> R2.2 <-> R4.2 + C2.2 <-> P1.1 + P1.3 <-> R2.2 <-> R4.2 R1.2 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt b/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt index 9d8a0b0dd..006bb63b0 100644 --- a/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> R2.1 C2.1 <-> C4.2 <-> IC1.1 C2.2 <-> R3.1 - C3.1 <-> Q1.3 <-> R6.1 - C3.2 <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 + C3.+ <-> Q1.3 <-> R6.1 + C3.- <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 C4.1 <-> IC1.2 <-> R8.1 C5.1 <-> Q1.1 <-> VR2.2 <-> VR2.3 C7.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt b/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt index 9d8a0b0dd..006bb63b0 100644 --- a/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt @@ -1,11 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> IC1.3 <-> R2.1 C2.1 <-> C4.2 <-> IC1.1 C2.2 <-> R3.1 - C3.1 <-> Q1.3 <-> R6.1 - C3.2 <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 + C3.+ <-> Q1.3 <-> R6.1 + C3.- <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2 C4.1 <-> IC1.2 <-> R8.1 C5.1 <-> Q1.1 <-> VR2.2 <-> VR2.3 C7.2 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt index 23db2e08e..b58b26f6d 100644 --- a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt @@ -1,9 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.2 <-> R1.1 - C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.3 <-> Q2.3 <-> R2.2 <-> R5.1 - C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1 - C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2 - C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> R2.1 <-> R3.1 + C3.1 <-> R3.2 <-> R4.1 + C3.2 <-> R4.2 <-> R6.2 + C4.2 <-> Q2.3 <-> R5.1 + C5.2 <-> C6.1 <-> R5.2 <-> R6.1 + C7.1 <-> R7.1 + C7.2 <-> R8.1 + C8.1 <-> R7.2 <-> R8.2 Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt index 23db2e08e..b58b26f6d 100644 --- a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt @@ -1,9 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C6.2 <-> R1.1 - C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.3 <-> Q2.3 <-> R2.2 <-> R5.1 - C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1 - C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2 - C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1 + C1.1 <-> R1.1 + C1.2 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> R2.1 <-> R3.1 + C3.1 <-> R3.2 <-> R4.1 + C3.2 <-> R4.2 <-> R6.2 + C4.2 <-> Q2.3 <-> R5.1 + C5.2 <-> C6.1 <-> R5.2 <-> R6.1 + C7.1 <-> R7.1 + C7.2 <-> R8.1 + C8.1 <-> R7.2 <-> R8.2 Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_gen_excl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_gen_excl_switches.txt index 26423285d..3337f9c9f 100644 --- a/diylc-regression-data/input/v1/netlist/signal_gen_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_gen_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> P1.3 <-> P2B.2 <-> P2B.3 <-> R1.1 <-> R2.2 <-> R3.2 - C1.2 <-> IC1.4 <-> R2.1 + C1.+ <-> C3.1 <-> P1.1 <-> P2B.1 <-> P2B.2 <-> R1.1 <-> R2.2 <-> R3.2 + C1.- <-> IC1.4 <-> R2.1 C2.1 <-> C3.2 <-> IC1.8 <-> R7.1 - C2.2 <-> P2A.2 <-> P2A.3 - D1.1 <-> D2.2 <-> R4.2 <-> R5.1 - D1.2 <-> D2.1 <-> IC1.6 <-> P1.1 <-> R5.2 <-> R6.1 + C2.2 <-> P2A.1 <-> P2A.2 + D1.A <-> D2.K <-> R4.2 <-> R5.1 + D1.K <-> D2.A <-> IC1.6 <-> P1.3 <-> R5.2 <-> R6.1 IC1.1 <-> IC1.2 IC1.3 <-> P1.2 IC1.5 <-> R1.2 <-> S1.1 IC1.7 <-> R3.1 <-> R4.1 - P2A.1 <-> R6.2 - P2B.1 <-> R7.2 + P2A.3 <-> R6.2 + P2B.3 <-> R7.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_gen_incl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_gen_incl_switches.txt index 484c662c7..cb8ada17e 100644 --- a/diylc-regression-data/input/v1/netlist/signal_gen_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_gen_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - C1.1 <-> C3.1 <-> P1.3 <-> P2B.2 <-> P2B.3 <-> R1.1 <-> R2.2 <-> R3.2 - C1.2 <-> IC1.4 <-> R2.1 + C1.+ <-> C3.1 <-> P1.1 <-> P2B.1 <-> P2B.2 <-> R1.1 <-> R2.2 <-> R3.2 + C1.- <-> IC1.4 <-> R2.1 C2.1 <-> C3.2 <-> IC1.8 <-> R7.1 - C2.2 <-> P2A.2 <-> P2A.3 - D1.1 <-> D2.2 <-> R4.2 <-> R5.1 - D1.2 <-> D2.1 <-> IC1.6 <-> P1.1 <-> R5.2 <-> R6.1 + C2.2 <-> P2A.1 <-> P2A.2 + D1.A <-> D2.K <-> R4.2 <-> R5.1 + D1.K <-> D2.A <-> IC1.6 <-> P1.3 <-> R5.2 <-> R6.1 IC1.1 <-> IC1.2 IC1.3 <-> P1.2 IC1.5 <-> R1.2 IC1.7 <-> R3.1 <-> R4.1 - P2A.1 <-> R6.2 - P2B.1 <-> R7.2 + P2A.3 <-> R6.2 + P2B.3 <-> R7.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_excl_switches.txt index c014158a6..245d02b91 100644 --- a/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 - C2.1 <-> R1.1 + C1.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.2 + C2.+ <-> R1.1 Q1.1 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_incl_switches.txt index c014158a6..245d02b91 100644 --- a/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_tracer_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 - C2.1 <-> R1.1 + C1.1 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.2 + C2.+ <-> R1.1 Q1.1 <-> Q2.3 Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt index 87b3e3f48..7ab3fbc88 100644 --- a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.1 - C2.1 <-> R1.2 + C1.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.+ <-> R1.2 Q1.1 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt index 87b3e3f48..7ab3fbc88 100644 --- a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt @@ -1,6 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.1 - C2.1 <-> R1.2 + C1.2 <-> D1.K <-> Q1.2 <-> Q1.3 <-> R1.1 + C2.+ <-> R1.2 Q1.1 <-> Q2.3 + Q2.1 <-> Q2.2 diff --git a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_excl_switches.txt index 7dafb8caf..7dc277007 100644 --- a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_incl_switches.txt index 7dafb8caf..7dc277007 100644 --- a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_excl_switches.txt index 9775528dd..a1256763e 100644 --- a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_excl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 @@ -6,6 +6,6 @@ Switch setup: [Default] C2.2 <-> Q1.3 <-> R5.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> C4.1 <-> R1.2 - C5.2 <-> Q1.1 <-> Q1.2 <-> R4.2 + C5.- <-> Q1.1 <-> Q1.2 <-> R4.2 Q2.1 <-> Q2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_incl_switches.txt index 9775528dd..a1256763e 100644 --- a/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/silicon_70s_fuzz_pcb_incl_switches.txt @@ -1,4 +1,4 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R2.1 <-> R3.1 C1.2 <-> R1.1 <-> R2.2 @@ -6,6 +6,6 @@ Switch setup: [Default] C2.2 <-> Q1.3 <-> R5.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> C4.1 <-> R1.2 - C5.2 <-> Q1.1 <-> Q1.2 <-> R4.2 + C5.- <-> Q1.1 <-> Q1.2 <-> R4.2 Q2.1 <-> Q2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt index 0a0c68c2f..70497a9b1 100644 --- a/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C4.1 <-> C4.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1 <-> VR1.2 - C1.2 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2 - C2.1 <-> C3.2 <-> Q2.3 <-> R1.2 <-> R2.1 <-> R6.1 - C2.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R4.1 <-> R4.2 <-> R5.1 - C3.1 <-> R1.1 <-> VR1.3 + C1.+ <-> R2.2 <-> R3.2 + C1.- <-> C5.- <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2 + C2.1 <-> R1.2 <-> R6.1 + C2.2 <-> C6.1 <-> Q1.3 <-> R4.1 + C3.1 <-> VR1.3 + C3.2 <-> Q2.3 <-> R2.1 + C4.1 <-> R3.1 <-> VR1.1 <-> VR1.2 + C5.+ <-> C6.2 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt index 0a0c68c2f..70497a9b1 100644 --- a/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt @@ -1,8 +1,11 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C4.1 <-> C4.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1 <-> VR1.2 - C1.2 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2 - C2.1 <-> C3.2 <-> Q2.3 <-> R1.2 <-> R2.1 <-> R6.1 - C2.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R4.1 <-> R4.2 <-> R5.1 - C3.1 <-> R1.1 <-> VR1.3 + C1.+ <-> R2.2 <-> R3.2 + C1.- <-> C5.- <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2 + C2.1 <-> R1.2 <-> R6.1 + C2.2 <-> C6.1 <-> Q1.3 <-> R4.1 + C3.1 <-> VR1.3 + C3.2 <-> Q2.3 <-> R2.1 + C4.1 <-> R3.1 <-> VR1.1 <-> VR1.2 + C5.+ <-> C6.2 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt index c3c9c2ddd..1291311ef 100644 --- a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt @@ -1,7 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> P2.1 <-> P3.3 <-> R1.1 - C1.2 <-> C3.2 <-> P1.1 <-> P2.2 + C1.1 <-> R1.1 + C1.2 <-> P1.3 C2.1 <-> C3.1 <-> R1.2 - C2.2 <-> P1.3 <-> P3.1 <-> P3.2 + C2.2 <-> P1.1 <-> P3.2 <-> P3.3 + C3.2 <-> P2.2 + P2.3 <-> P3.1 diff --git a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt index c3c9c2ddd..1291311ef 100644 --- a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt @@ -1,7 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> P2.1 <-> P3.3 <-> R1.1 - C1.2 <-> C3.2 <-> P1.1 <-> P2.2 + C1.1 <-> R1.1 + C1.2 <-> P1.3 C2.1 <-> C3.1 <-> R1.2 - C2.2 <-> P1.3 <-> P3.1 <-> P3.2 + C2.2 <-> P1.1 <-> P3.2 <-> P3.3 + C3.2 <-> P2.2 + P2.3 <-> P3.1 diff --git a/diylc-regression-data/input/v1/netlist/slacktrem_excl_switches.txt b/diylc-regression-data/input/v1/netlist/slacktrem_excl_switches.txt index c1f5e3500..23d489aaa 100644 --- a/diylc-regression-data/input/v1/netlist/slacktrem_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/slacktrem_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C2.1 <-> IC1.2 <-> R2.2 - C2.2 <-> D1.2 <-> R3.2 + C2.2 <-> D1.K <-> R3.2 C3.1 <-> R5.2 - C3.2 <-> D2.2 <-> R4.1 + C3.2 <-> D2.K <-> R4.1 C4.1 <-> IC1.4 <-> R6.2 C4.2 <-> R7.1 - C5.1 <-> IC1.14 <-> R9.2 <-> VR1.3 - C5.2 <-> C7.2 <-> IC1.5 <-> IC1.7 <-> R3.1 <-> R4.2 <-> R7.2 <-> VR1.1 - C6.1 <-> IC1.12 - C6.2 <-> R11.2 - C7.1 <-> IC1.8 <-> R12.2 - D1.1 <-> D2.1 <-> R8.2 + C5.+ <-> IC1.14 <-> R9.2 <-> VR1.3 + C5.- <-> C7.- <-> IC1.5 <-> IC1.7 <-> R3.1 <-> R4.2 <-> R7.2 <-> VR1.1 + C6.+ <-> IC1.12 + C6.- <-> R11.2 + C7.+ <-> IC1.8 <-> R12.2 + D1.A <-> D2.A <-> R8.2 IC1.1 <-> R1.1 <-> R2.1 IC1.10 <-> IC1.11 <-> R10.2 IC1.13 <-> IC1.9 <-> R11.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/slacktrem_incl_switches.txt b/diylc-regression-data/input/v1/netlist/slacktrem_incl_switches.txt index c1f5e3500..23d489aaa 100644 --- a/diylc-regression-data/input/v1/netlist/slacktrem_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/slacktrem_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C2.1 <-> IC1.2 <-> R2.2 - C2.2 <-> D1.2 <-> R3.2 + C2.2 <-> D1.K <-> R3.2 C3.1 <-> R5.2 - C3.2 <-> D2.2 <-> R4.1 + C3.2 <-> D2.K <-> R4.1 C4.1 <-> IC1.4 <-> R6.2 C4.2 <-> R7.1 - C5.1 <-> IC1.14 <-> R9.2 <-> VR1.3 - C5.2 <-> C7.2 <-> IC1.5 <-> IC1.7 <-> R3.1 <-> R4.2 <-> R7.2 <-> VR1.1 - C6.1 <-> IC1.12 - C6.2 <-> R11.2 - C7.1 <-> IC1.8 <-> R12.2 - D1.1 <-> D2.1 <-> R8.2 + C5.+ <-> IC1.14 <-> R9.2 <-> VR1.3 + C5.- <-> C7.- <-> IC1.5 <-> IC1.7 <-> R3.1 <-> R4.2 <-> R7.2 <-> VR1.1 + C6.+ <-> IC1.12 + C6.- <-> R11.2 + C7.+ <-> IC1.8 <-> R12.2 + D1.A <-> D2.A <-> R8.2 IC1.1 <-> R1.1 <-> R2.1 IC1.10 <-> IC1.11 <-> R10.2 IC1.13 <-> IC1.9 <-> R11.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt index 7f6e48aad..15155f8fb 100644 --- a/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C4.1 <-> IC1.3 <-> IC1.7 - C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.4 <-> IC1.8 - C3.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R1.2 - IC1.2 <-> IC1.6 + C1.2 <-> C2.1 <-> IC1.3 + C2.2 <-> C3.- <-> C4.- <-> IC1.4 + C3.+ <-> IC1.5 <-> R1.2 + C4.+ <-> IC1.7 + C5.1 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt index 7f6e48aad..15155f8fb 100644 --- a/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C1.2 <-> C2.1 <-> C4.1 <-> IC1.3 <-> IC1.7 - C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.4 <-> IC1.8 - C3.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R1.2 - IC1.2 <-> IC1.6 + C1.2 <-> C2.1 <-> IC1.3 + C2.2 <-> C3.- <-> C4.- <-> IC1.4 + C3.+ <-> IC1.5 <-> R1.2 + C4.+ <-> IC1.7 + C5.1 <-> IC1.8 diff --git a/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_excl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_incl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/snakebite_boost_pcb_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_excl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_incl_switches.txt index 9a3e92f60..5affb4cd0 100644 --- a/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/snakebite_boost_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.1 <-> R1.2 - C2.1 <-> R4.1 + C1.+ <-> Q1.1 <-> R1.2 + C2.+ <-> R4.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_excl_switches.txt index a55f4e270..af7854155 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_incl_switches.txt index a55f4e270..af7854155 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_pcb_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_excl_switches.txt index a55f4e270..af7854155 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_incl_switches.txt index a55f4e270..af7854155 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v1_perf_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 <-> Q1.1 <-> R1.2 C1.2 <-> Q2.3 <-> R3.2 <-> R4.1 C2.2 <-> R2.1 - C3.1 <-> R7.2 - C3.2 <-> C4.2 <-> C7.2 <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 - C4.1 <-> R10.2 <-> R8.1 <-> R9.1 + C3.+ <-> R7.2 + C3.- <-> C4.- <-> C7.- <-> R12.2 <-> R4.2 <-> R6.2 <-> R9.2 + C4.+ <-> R10.2 <-> R8.1 <-> R9.1 C5.2 <-> C6.1 <-> R5.2 C6.2 <-> R11.1 - C7.1 <-> R11.2 <-> R12.1 <-> VR1.1 + C7.+ <-> R11.2 <-> R12.1 <-> VR1.1 Q1.2 <-> Q1.3 <-> R2.2 <-> R8.2 Q2.1 <-> Q2.2 <-> R6.1 <-> R7.1 Q3.1 <-> Q4.1 <-> R3.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_excl_switches.txt index 70028b9de..3f4dd2cd7 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_incl_switches.txt index 70028b9de..3f4dd2cd7 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_pcb_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_excl_switches.txt index 70028b9de..3f4dd2cd7 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_incl_switches.txt index 70028b9de..3f4dd2cd7 100644 --- a/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/so_simple_comp_v2_perf_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> R4.2 - C2.2 <-> C4.2 <-> C7.2 <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 + C2.+ <-> R4.2 + C2.- <-> C4.- <-> C7.- <-> R1.1 <-> R10.2 <-> R3.2 <-> R7.2 C3.1 <-> Q2.1 <-> R2.2 C3.2 <-> R5.1 - C4.1 <-> R6.2 <-> R7.1 <-> R8.2 + C4.+ <-> R6.2 <-> R7.1 <-> R8.2 C5.1 <-> C6.1 <-> Q1.1 <-> VR1.3 C6.2 <-> R9.1 - C7.1 <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 + C7.+ <-> R10.1 <-> R9.2 <-> VR2.1 <-> VR2.2 Q1.2 <-> Q1.3 <-> R3.1 <-> R4.1 Q2.2 <-> Q2.3 <-> R5.2 <-> R6.1 Q3.1 <-> Q3.2 <-> Q4.1 <-> VR1.1 <-> VR1.2 diff --git a/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt index 069717166..1307dd3cc 100644 --- a/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt @@ -1,12 +1,19 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Attack.1 <-> S1.1 - Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> S2.4 <-> S2.5 <-> Volume.1 - Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> S2.1 <-> S2.2 <-> Tone.1 <-> Tone.3 <-> Volume.3 - C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2 + Attack.1 <-> C2.2 <-> C5.2 <-> D1.K <-> D2.A <-> R2.2 <-> R8.2 <-> Volume.1 + Attack.2 <-> C1.1 + Attack.3 <-> S1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.1 <-> R3.1 <-> R4.2 + C3.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 <-> S2.2 + C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2 + C4.1 <-> R7.1 <-> S2.1 + C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3 C6.1 <-> Tone.2 + C6.2 <-> S2.4 C7.1 <-> S2.3 C7.2 <-> S2.6 + D1.A <-> D2.K <-> S2.5 <-> Volume.3 S1.3 <-> S1.6 S1.4 <-> Volume.2 diff --git a/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt index 0d1ed6708..2e7d88ad3 100644 --- a/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt @@ -1,14 +1,25 @@ -Switch setup: [S1.ON1:S2.ON1, S1.ON2:S2.ON1] +Switch setup: [ S2.ON1 ] - Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> Volume.1 - Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> Tone.1 <-> Tone.3 <-> Volume.3 - C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2 + Attack.1 <-> C2.2 <-> C5.2 <-> D1.K <-> D2.A <-> R2.2 <-> R8.2 <-> Volume.1 + Attack.2 <-> C1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.1 <-> R3.1 <-> R4.2 + C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 <-> R7.1 + C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2 + C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3 C6.1 <-> Tone.2 + C6.2 <-> D1.A <-> D2.K <-> Volume.3 -Switch setup: [S1.ON1:S2.ON2, S1.ON2:S2.ON2] +Switch setup: [ S2.ON2 ] - Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> Volume.1 - Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> Tone.1 <-> Tone.3 <-> Volume.3 - C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2 + Attack.1 <-> C2.2 <-> C5.2 <-> D1.K <-> D2.A <-> R2.2 <-> R8.2 <-> Volume.1 + Attack.2 <-> C1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.1 <-> R3.1 <-> R4.2 + C3.1 <-> C7.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 + C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2 + C4.1 <-> R7.1 + C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3 C6.1 <-> Tone.2 + C7.2 <-> D1.A <-> D2.K <-> Volume.3 diff --git a/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt index d0bd5b051..a57beb00a 100644 --- a/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt @@ -1,9 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - Attack.1 <-> Attack.2 <-> C1.1 <-> C1.2 <-> C2.2 <-> C4.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R2.2 <-> R3.2 <-> Volume.1 <-> Volume.3 - Attack.3 <-> S1.1 - C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2 - C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 + Attack.1 <-> S1.1 + Attack.2 <-> C1.1 + Attack.3 <-> C2.2 <-> D1.K <-> D2.A <-> R2.2 <-> Volume.3 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.1 <-> R3.1 <-> R4.2 + C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 + C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2 + C4.2 <-> D1.A <-> D2.K <-> Volume.1 S1.3 <-> S1.6 S1.4 <-> Volume.2 diff --git a/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt index 613af1ceb..85b01b5e5 100644 --- a/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt @@ -1,6 +1,10 @@ -Switch setup: [S1.ON1, S1.ON2] +Switch setup: [ ALL ] - Attack.1 <-> Attack.2 <-> C1.1 <-> C1.2 <-> C2.2 <-> C4.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R2.2 <-> R3.2 <-> Volume.1 <-> Volume.3 - C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2 - C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 + Attack.2 <-> C1.1 + Attack.3 <-> C2.2 <-> D1.K <-> D2.A <-> R2.2 <-> Volume.3 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 + C2.1 <-> R3.1 <-> R4.2 + C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 + C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2 + C4.2 <-> D1.A <-> D2.K <-> Volume.1 diff --git a/diylc-regression-data/input/v1/netlist/solar_garden_lamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/solar_garden_lamp_excl_switches.txt index 5c31af0b7..33922e796 100644 --- a/diylc-regression-data/input/v1/netlist/solar_garden_lamp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/solar_garden_lamp_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> I 1.2 <-> Q2.1 <-> R1.1 <-> R3.1 + C1.1 <-> D1.K <-> I 1.2 <-> Q2.1 <-> R1.1 <-> R3.1 C1.2 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.1 - C2.2 <-> D2.1 <-> D3.1 <-> I 1.1 - D2.2 <-> D3.2 <-> LDR.2 <-> Q1.1 <-> Q1.2 <-> Q3.1 <-> Q3.2 + C2.2 <-> D2.A <-> D3.A <-> I 1.1 + D2.K <-> D3.K <-> LDR.2 <-> Q1.1 <-> Q1.2 <-> Q3.1 <-> Q3.2 LDR.1 <-> Q1.3 <-> R3.2 <-> R4.2 Q3.3 <-> R5.2 R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/solar_garden_lamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/solar_garden_lamp_incl_switches.txt index 5c31af0b7..33922e796 100644 --- a/diylc-regression-data/input/v1/netlist/solar_garden_lamp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/solar_garden_lamp_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> I 1.2 <-> Q2.1 <-> R1.1 <-> R3.1 + C1.1 <-> D1.K <-> I 1.2 <-> Q2.1 <-> R1.1 <-> R3.1 C1.2 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.1 - C2.2 <-> D2.1 <-> D3.1 <-> I 1.1 - D2.2 <-> D3.2 <-> LDR.2 <-> Q1.1 <-> Q1.2 <-> Q3.1 <-> Q3.2 + C2.2 <-> D2.A <-> D3.A <-> I 1.1 + D2.K <-> D3.K <-> LDR.2 <-> Q1.1 <-> Q1.2 <-> Q3.1 <-> Q3.2 LDR.1 <-> Q1.3 <-> R3.2 <-> R4.2 Q3.3 <-> R5.2 R4.1 <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt index 3aa82eb21..ef5348d81 100644 --- a/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt @@ -1,9 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 <-> Rled.2 - C1.2 <-> C11.2 <-> C12.1 <-> C12.2 <-> C14.2 <-> C3.2 <-> C7.2 <-> C8.1 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> IC1.8 <-> Q1.3 <-> R12.1 <-> R13.2 <-> R16.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.2 <-> R6.1 - C10.1 <-> C10.2 <-> C11.1 <-> C14.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R15.2 <-> R17.1 <-> R18.2 <-> R6.2 <-> Rled.1 - C13.1 <-> C13.2 <-> C2.2 <-> C3.1 <-> C5.1 <-> C7.1 <-> D2.1 <-> D3.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R13.1 <-> R14.2 <-> R19.2 <-> R7.1 - C2.1 <-> C4.2 <-> IC1.3 <-> IC1.7 <-> R14.1 <-> R15.1 <-> R17.2 <-> R3.2 <-> R8.2 - C6.2 <-> C9.1 <-> C9.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R7.2 + C1.+ <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 + C1.- <-> C11.- <-> C14.- <-> C7.2 <-> C8.2 <-> D1.A <-> D2.K <-> D3.A <-> IC1.4 <-> R12.1 <-> R18.1 <-> R19.1 <-> R2.2 <-> R6.1 + C10.1 <-> R17.1 + C10.2 <-> R18.2 + C11.+ <-> R15.2 + C12.1 <-> IC1.8 <-> R16.2 + C13.1 <-> IC1.6 <-> R14.2 + C14.+ <-> D1.K <-> IC1.5 <-> R1.1 <-> Rled.1 + C2.1 <-> R3.2 + C2.2 <-> R19.2 + C3.+ <-> C5.1 <-> IC1.2 <-> R7.1 + C3.- <-> R5.2 + C4.1 <-> Q1.1 <-> Q1.2 <-> R6.2 + C4.2 <-> IC1.3 <-> R8.2 + C5.2 <-> C6.+ <-> IC1.1 + C6.- <-> R10.2 + C7.1 <-> D2.A <-> D3.K <-> R10.1 <-> R11.1 <-> R13.1 + C8.1 <-> R13.2 + C9.1 <-> R11.2 + C9.2 <-> R12.2 + IC1.7 <-> R14.1 <-> R15.1 + Q1.3 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt index 3aa82eb21..ef5348d81 100644 --- a/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt @@ -1,9 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 <-> Rled.2 - C1.2 <-> C11.2 <-> C12.1 <-> C12.2 <-> C14.2 <-> C3.2 <-> C7.2 <-> C8.1 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> IC1.8 <-> Q1.3 <-> R12.1 <-> R13.2 <-> R16.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.2 <-> R6.1 - C10.1 <-> C10.2 <-> C11.1 <-> C14.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R15.2 <-> R17.1 <-> R18.2 <-> R6.2 <-> Rled.1 - C13.1 <-> C13.2 <-> C2.2 <-> C3.1 <-> C5.1 <-> C7.1 <-> D2.1 <-> D3.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R13.1 <-> R14.2 <-> R19.2 <-> R7.1 - C2.1 <-> C4.2 <-> IC1.3 <-> IC1.7 <-> R14.1 <-> R15.1 <-> R17.2 <-> R3.2 <-> R8.2 - C6.2 <-> C9.1 <-> C9.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R7.2 + C1.+ <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 + C1.- <-> C11.- <-> C14.- <-> C7.2 <-> C8.2 <-> D1.A <-> D2.K <-> D3.A <-> IC1.4 <-> R12.1 <-> R18.1 <-> R19.1 <-> R2.2 <-> R6.1 + C10.1 <-> R17.1 + C10.2 <-> R18.2 + C11.+ <-> R15.2 + C12.1 <-> IC1.8 <-> R16.2 + C13.1 <-> IC1.6 <-> R14.2 + C14.+ <-> D1.K <-> IC1.5 <-> R1.1 <-> Rled.1 + C2.1 <-> R3.2 + C2.2 <-> R19.2 + C3.+ <-> C5.1 <-> IC1.2 <-> R7.1 + C3.- <-> R5.2 + C4.1 <-> Q1.1 <-> Q1.2 <-> R6.2 + C4.2 <-> IC1.3 <-> R8.2 + C5.2 <-> C6.+ <-> IC1.1 + C6.- <-> R10.2 + C7.1 <-> D2.A <-> D3.K <-> R10.1 <-> R11.1 <-> R13.1 + C8.1 <-> R13.2 + C9.1 <-> R11.2 + C9.2 <-> R12.2 + IC1.7 <-> R14.1 <-> R15.1 + Q1.3 <-> R3.1 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_excl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_incl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soul_preacher_pcb_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/v1/netlist/soul_preacher_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soul_preacher_perf_excl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/v1/netlist/soul_preacher_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soul_preacher_perf_excl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/v1/netlist/soul_preacher_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soul_preacher_perf_incl_switches.txt index 2552ca701..b19d2dab9 100644 --- a/diylc-regression-data/input/v1/netlist/soul_preacher_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/soul_preacher_perf_incl_switches.txt @@ -1,25 +1,25 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 - C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C4.2 <-> C9.2 <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 - C10.1 <-> IC1.8 <-> R16.1 - C11.1 <-> R19.2 - C12.1 <-> C14.1 <-> D2.2 <-> IC1.1 <-> R16.2 <-> R17.2 - C12.2 <-> C13.1 <-> R20.2 + C1.+ <-> C3.2 <-> IC1.5 <-> Q1.3 <-> R1.2 + C1.- <-> C10.- <-> C11.- <-> C2.- <-> C4.- <-> C9.- <-> IC1.4 <-> R12.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R7.2 <-> R8.2 <-> R9.2 + C10.+ <-> IC1.8 <-> R16.1 + C11.+ <-> R19.2 + C12.+ <-> C14.1 <-> D2.K <-> IC1.1 <-> R16.2 <-> R17.2 + C12.- <-> C13.1 <-> R20.2 C14.2 <-> IC1.2 <-> R18.1 <-> R19.1 - C2.1 <-> R1.1 + C2.+ <-> R1.1 C3.1 <-> Q1.1 <-> Q1.2 <-> R2.1 <-> R6.1 - C4.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 + C4.+ <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1 C5.1 <-> Q3.3 <-> R6.2 <-> R7.1 C5.2 <-> R22.1 - C6.1 <-> Q3.1 <-> Q3.2 <-> R8.1 - C6.2 <-> C7.1 <-> R9.1 + C6.+ <-> Q3.1 <-> Q3.2 <-> R8.1 + C6.- <-> C7.1 <-> R9.1 C7.2 <-> R10.1 C8.1 <-> IC1.3 <-> R21.1 C8.2 <-> Q4.1 <-> R10.2 - C9.1 <-> R11.1 <-> R12.1 - D1.1 <-> D2.1 <-> Q5.2 <-> Q5.3 <-> R14.2 - D1.2 <-> IC1.6 <-> R15.1 + C9.+ <-> R11.1 <-> R12.1 + D1.A <-> D2.A <-> Q5.2 <-> Q5.3 <-> R14.2 + D1.K <-> IC1.6 <-> R15.1 IC1.7 <-> R15.2 <-> R17.1 Q2.1 <-> Q4.2 <-> Q4.3 <-> R13.2 <-> R21.2 <-> R4.1 Q5.1 <-> R13.1 <-> R14.1 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt index 173823256..4d31f8979 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> R1.1 - C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1 - C2.1 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 R1.2 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt index 173823256..4d31f8979 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt @@ -1,8 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> R1.1 - C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1 - C2.1 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 + C1.1 <-> R1.1 + C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 + C2.+ <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 R1.2 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_excl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_incl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_excl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_incl_switches.txt index 33d35098f..f0b311dfb 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_j201_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 - C3.2 <-> R4.1 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C3.+ <-> Q1.1 <-> VR1.1 <-> VR1.2 + C3.- <-> R4.1 R1.1 <-> R2.2 <-> R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt index 60e809992..36983a347 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> R3.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> VR1.3 - C3.2 <-> R4.1 + C2.+ <-> R3.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> VR1.3 + C3.- <-> R4.1 R1.1 <-> R2.1 <-> R3.1 <-> R4.2 R5.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt index 60e809992..36983a347 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R2.2 - C2.1 <-> R3.2 - C3.1 <-> Q1.1 <-> Q1.2 <-> VR1.3 - C3.2 <-> R4.1 + C2.+ <-> R3.2 + C3.+ <-> Q1.1 <-> Q1.2 <-> VR1.3 + C3.- <-> R4.1 R1.1 <-> R2.1 <-> R3.1 <-> R4.2 R5.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_excl_switches.txt index 9e1ce2159..e137e9dfa 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.3 <-> R2.1 - C2.2 <-> VR2.3 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 - C3.2 <-> R4.1 <-> VR3.1 + C2.- <-> VR2.3 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 <-> VR3.1 R1.2 <-> R2.2 <-> VR3.3 R5.1 <-> VR1.1 VR2.1 <-> VR2.2 diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_incl_switches.txt index 9e1ce2159..e137e9dfa 100644 --- a/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_perf_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> Q1.3 <-> R2.1 - C2.2 <-> VR2.3 - C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3 - C3.2 <-> R4.1 <-> VR3.1 + C2.- <-> VR2.3 + C3.+ <-> Q1.1 <-> VR1.2 <-> VR1.3 + C3.- <-> R4.1 <-> VR3.1 R1.2 <-> R2.2 <-> VR3.3 R5.1 <-> VR1.1 VR2.1 <-> VR2.2 diff --git a/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_excl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_incl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/stratoblaster_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/stratoblaster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/stratoblaster_perf_excl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/v1/netlist/stratoblaster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/stratoblaster_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/stratoblaster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/stratoblaster_perf_incl_switches.txt index ec7abc8dd..328b451f2 100644 --- a/diylc-regression-data/input/v1/netlist/stratoblaster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/stratoblaster_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R3.2 - C1.2 <-> C2.2 <-> R2.2 <-> R4.2 <-> R5.2 - C3.1 <-> Q1.1 <-> R3.1 - C3.2 <-> R5.1 + C1.+ <-> R3.2 + C1.- <-> C2.- <-> R2.2 <-> R4.2 <-> R5.2 + C3.+ <-> Q1.1 <-> R3.1 + C3.- <-> R5.1 Q1.2 <-> Q1.3 <-> R4.1 R1.1 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt b/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt index e0601ec46..db5d21603 100644 --- a/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.1 <-> R1.2 <-> R2.1 - C1.2 <-> R3.1 <-> R5.1 - C2.1 <-> C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2 - C3.1 <-> C3.2 <-> R2.2 <-> R4.1 <-> R5.2 - D1.1 <-> Q1.1 <-> Q1.2 + C1.+ <-> R1.1 + C1.- <-> R3.1 <-> R5.1 + C2.2 <-> D1.K <-> Q1.3 <-> R3.2 <-> R4.2 + C3.+ <-> R2.2 <-> R4.1 + C3.- <-> R5.2 + D1.A <-> Q1.1 <-> Q1.2 + R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt b/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt index e0601ec46..db5d21603 100644 --- a/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt @@ -1,8 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> R1.1 <-> R1.2 <-> R2.1 - C1.2 <-> R3.1 <-> R5.1 - C2.1 <-> C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2 - C3.1 <-> C3.2 <-> R2.2 <-> R4.1 <-> R5.2 - D1.1 <-> Q1.1 <-> Q1.2 + C1.+ <-> R1.1 + C1.- <-> R3.1 <-> R5.1 + C2.2 <-> D1.K <-> Q1.3 <-> R3.2 <-> R4.2 + C3.+ <-> R2.2 <-> R4.1 + C3.- <-> R5.2 + D1.A <-> Q1.1 <-> Q1.2 + R1.2 <-> R2.1 diff --git a/diylc-regression-data/input/v1/netlist/sw_tripod_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sw_tripod_excl_switches.txt index 87f2a211b..cf3d3a041 100644 --- a/diylc-regression-data/input/v1/netlist/sw_tripod_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sw_tripod_excl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.1 <-> VR1.3 C1.2 <-> C3.1 <-> C3.2 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R4.1 <-> R5.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.2 <-> C6.2 <-> C7.2 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R8.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R2.2 + C2.- <-> C6.2 <-> C7.- <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R8.2 C4.1 <-> R6.1 C4.2 <-> IC1.4 <-> R5.2 - C5.1 <-> IC1.2 <-> R7.2 - C5.2 <-> R8.1 <-> R9.1 - C7.1 <-> IC1.1 <-> R10.2 + C5.+ <-> IC1.2 <-> R7.2 + C5.- <-> R8.1 <-> R9.1 + C7.+ <-> IC1.1 <-> R10.2 IC1.3 <-> R6.2 <-> R7.1 R10.1 <-> R11.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/sw_tripod_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sw_tripod_incl_switches.txt index 87f2a211b..cf3d3a041 100644 --- a/diylc-regression-data/input/v1/netlist/sw_tripod_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/sw_tripod_incl_switches.txt @@ -1,14 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.1 <-> VR1.3 C1.2 <-> C3.1 <-> C3.2 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R4.1 <-> R5.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R2.2 - C2.2 <-> C6.2 <-> C7.2 <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R8.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R2.2 + C2.- <-> C6.2 <-> C7.- <-> IC1.11 <-> IC1.14 <-> IC1.16 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R8.2 C4.1 <-> R6.1 C4.2 <-> IC1.4 <-> R5.2 - C5.1 <-> IC1.2 <-> R7.2 - C5.2 <-> R8.1 <-> R9.1 - C7.1 <-> IC1.1 <-> R10.2 + C5.+ <-> IC1.2 <-> R7.2 + C5.- <-> R8.1 <-> R9.1 + C7.+ <-> IC1.1 <-> R10.2 IC1.3 <-> R6.2 <-> R7.1 R10.1 <-> R11.1 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/syrupp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/syrupp_excl_switches.txt index 79592080f..e70af1248 100644 --- a/diylc-regression-data/input/v1/netlist/syrupp_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/syrupp_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/syrupp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/syrupp_incl_switches.txt index 79592080f..e70af1248 100644 --- a/diylc-regression-data/input/v1/netlist/syrupp_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/syrupp_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/syrupp_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/syrupp_perf_excl_switches.txt index 79592080f..e70af1248 100644 --- a/diylc-regression-data/input/v1/netlist/syrupp_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/syrupp_perf_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/syrupp_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/syrupp_perf_incl_switches.txt index 79592080f..e70af1248 100644 --- a/diylc-regression-data/input/v1/netlist/syrupp_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/syrupp_perf_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> D1.2 <-> Q1.1 - C1.2 <-> D1.1 <-> R1.2 + C1.+ <-> D1.K <-> Q1.1 + C1.- <-> D1.A <-> R1.2 C2.1 <-> Q1.2 <-> Q1.3 <-> VR1.3 Q2.1 <-> Q2.2 <-> VR1.1 <-> VR1.2 Q2.3 <-> R1.1 diff --git a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt index 8cf3838ef..fc1dc5084 100644 --- a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R1.1 - C1.2 <-> C4.1 - C2.1 <-> C3.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R5.1 <-> R6.2 - C2.2 <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2 - C3.2 <-> C6.2 <-> R2.2 - C5.1 <-> C6.1 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R4.1 <-> R4.2 + C1.+ <-> Q1.3 <-> R1.1 + C1.- <-> C4.1 + C2.+ <-> C3.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.- <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2 + C5.2 <-> R5.1 <-> R6.2 + C6.1 <-> Q2.3 <-> R4.1 + C6.2 <-> R2.2 + Q3.1 <-> Q3.2 <-> R4.2 Q3.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt index 8cf3838ef..fc1dc5084 100644 --- a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt @@ -1,10 +1,12 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> Q1.3 <-> R1.1 - C1.2 <-> C4.1 - C2.1 <-> C3.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R5.1 <-> R6.2 - C2.2 <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2 - C3.2 <-> C6.2 <-> R2.2 - C5.1 <-> C6.1 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R4.1 <-> R4.2 + C1.+ <-> Q1.3 <-> R1.1 + C1.- <-> C4.1 + C2.+ <-> C3.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 + C2.- <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2 + C5.2 <-> R5.1 <-> R6.2 + C6.1 <-> Q2.3 <-> R4.1 + C6.2 <-> R2.2 + Q3.1 <-> Q3.2 <-> R4.2 Q3.3 <-> R3.2 diff --git a/diylc-regression-data/input/v1/netlist/template_ic_excl_switches.txt b/diylc-regression-data/input/v1/netlist/template_ic_excl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/template_ic_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/template_ic_excl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/template_ic_incl_switches.txt b/diylc-regression-data/input/v1/netlist/template_ic_incl_switches.txt index ae92beb0d..592b81051 100644 --- a/diylc-regression-data/input/v1/netlist/template_ic_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/template_ic_incl_switches.txt @@ -1 +1 @@ -java.lang.NullPointerException: null \ No newline at end of file +java.lang.NullPointerException: Cannot invoke "java.util.List.iterator()" because "netlists" is null \ No newline at end of file diff --git a/diylc-regression-data/input/v1/netlist/the_brick_excl_switches.txt b/diylc-regression-data/input/v1/netlist/the_brick_excl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/v1/netlist/the_brick_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/the_brick_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/the_brick_incl_switches.txt b/diylc-regression-data/input/v1/netlist/the_brick_incl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/v1/netlist/the_brick_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/the_brick_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/the_brick_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/the_brick_perf_excl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/v1/netlist/the_brick_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/the_brick_perf_excl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/the_brick_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/the_brick_perf_incl_switches.txt index 3ddea6e27..428355af1 100644 --- a/diylc-regression-data/input/v1/netlist/the_brick_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/the_brick_perf_incl_switches.txt @@ -1,13 +1,13 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> C2.1 - C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R2.2 <-> R5.2 + C1.2 <-> C4.- <-> C5.- <-> D1.A <-> R2.2 <-> R5.2 C2.2 <-> Q1.2 <-> Q1.3 <-> R1.1 C3.1 <-> Q2.3 <-> R3.2 C3.2 <-> R1.2 <-> R2.1 - C4.1 <-> R4.2 - C5.1 <-> Q1.1 <-> Q2.1 <-> Q2.2 + C4.+ <-> R4.2 + C5.+ <-> Q1.1 <-> Q2.1 <-> Q2.2 C6.1 <-> R3.1 <-> R4.1 - C6.2 <-> D1.2 <-> D2.1 - D2.2 <-> R5.1 + C6.2 <-> D1.K <-> D2.A + D2.K <-> R5.1 diff --git a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt index 7a53fe06c..3cd947c7f 100644 --- a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 - C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2 + C2.- <-> C3.2 <-> Q2.3 <-> R3.2 + C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 C4.1 <-> R1.2 - C5.1 <-> Q2.1 <-> Q2.2 + C5.+ <-> Q2.1 <-> Q2.2 Q1.1 <-> Q1.2 <-> R3.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt index 7a53fe06c..3cd947c7f 100644 --- a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 <-> R2.2 - C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 - C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2 + C2.- <-> C3.2 <-> Q2.3 <-> R3.2 + C3.1 <-> C4.2 <-> Q1.3 <-> R4.2 C4.1 <-> R1.2 - C5.1 <-> Q2.1 <-> Q2.2 + C5.+ <-> Q2.1 <-> Q2.2 Q1.1 <-> Q1.2 <-> R3.1 R2.1 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/ts808_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ts808_pcb_excl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/v1/netlist/ts808_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ts808_pcb_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/ts808_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ts808_pcb_incl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/v1/netlist/ts808_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ts808_pcb_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/ts808_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ts808_perf_excl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/v1/netlist/ts808_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ts808_perf_excl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/ts808_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ts808_perf_incl_switches.txt index 2a1a59c57..52aa5ab9a 100644 --- a/diylc-regression-data/input/v1/netlist/ts808_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/ts808_perf_incl_switches.txt @@ -1,22 +1,22 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C10.1 <-> R17.2 - C10.2 <-> R18.1 - C2.1 <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 - C2.2 <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 + C10.+ <-> R17.2 + C10.- <-> R18.1 + C2.+ <-> R10.1 <-> R15.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> R8.1 + C2.- <-> C6.2 <-> IC1.4 <-> R1.2 <-> R12.2 <-> R16.2 <-> R18.2 <-> R4.2 <-> R6.2 C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1 <-> R7.2 C3.2 <-> IC1.3 - C4.1 <-> D1.2 <-> D3.1 <-> IC1.1 <-> R11.1 - C4.2 <-> C5.2 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R9.1 + C4.1 <-> D1.K <-> D3.A <-> IC1.1 <-> R11.1 + C4.2 <-> C5.2 <-> D1.A <-> D2.K <-> IC1.2 <-> R9.1 C5.1 <-> R8.2 C6.1 <-> IC1.8 <-> R10.2 <-> R11.2 C7.2 <-> R12.1 C8.1 <-> IC1.6 <-> R13.2 C8.2 <-> R14.1 C9.2 <-> Q2.2 <-> Q2.3 <-> R15.2 - D2.1 <-> D3.2 + D2.A <-> D3.K IC1.5 <-> R3.1 IC1.7 <-> R13.1 Q1.3 <-> R2.2 <-> R5.2 diff --git a/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_excl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_incl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tube_sound_od_pcb_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_excl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_excl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_incl_switches.txt index c4f9f2438..dbb8ba832 100644 --- a/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/tube_sound_od_perf_incl_switches.txt @@ -1,9 +1,9 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> Q2.3 <-> R2.1 C1.2 <-> R1.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 - C2.2 <-> R1.2 <-> R4.2 <-> VR1.3 + C2.+ <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R4.1 + C2.- <-> R1.2 <-> R4.2 <-> VR1.3 C3.1 <-> R3.1 R2.2 <-> VR1.2 R3.2 <-> VR1.1 diff --git a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt index 738352e5a..89d73c25b 100644 --- a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2 - C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1 - C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2 - C3.2 <-> C4.1 <-> D1.1 <-> D2.2 - C5.1 <-> R5.2 <-> R6.2 - Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1 - R1.1 <-> R2.1 <-> R5.1 + C1.1 <-> R2.2 + C1.2 <-> Q1.3 <-> R7.1 + C2.+ <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2 + C2.- <-> C5.- <-> D1.K <-> D2.A <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2 + C3.+ <-> Q2.1 <-> R4.1 <-> R6.1 + C3.- <-> C4.1 <-> D1.A <-> D2.K + C4.2 <-> R11.2 + C5.+ <-> R5.2 <-> R6.2 + Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 + R1.1 <-> R2.1 + R7.2 <-> R8.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt index 738352e5a..89d73c25b 100644 --- a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt @@ -1,10 +1,14 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2 - C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1 - C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2 - C3.2 <-> C4.1 <-> D1.1 <-> D2.2 - C5.1 <-> R5.2 <-> R6.2 - Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1 - R1.1 <-> R2.1 <-> R5.1 + C1.1 <-> R2.2 + C1.2 <-> Q1.3 <-> R7.1 + C2.+ <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2 + C2.- <-> C5.- <-> D1.K <-> D2.A <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2 + C3.+ <-> Q2.1 <-> R4.1 <-> R6.1 + C3.- <-> C4.1 <-> D1.A <-> D2.K + C4.2 <-> R11.2 + C5.+ <-> R5.2 <-> R6.2 + Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 + R1.1 <-> R2.1 + R7.2 <-> R8.1 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt index d9436bbfd..e650cfc7f 100644 --- a/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.6 - C1.2 <-> C2.1 <-> D1.1 <-> D1.2 <-> D2.2 - C2.2 <-> DP.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 - D2.1 <-> DP.2 <-> IC1.1 <-> IC1.5 + C1.+ <-> IC1.2 + C1.- <-> D1.A <-> D2.K + C2.+ <-> D1.K + C2.- <-> DP.A <-> IC1.3 <-> IC1.8 + D2.A <-> DP.K <-> IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt index d9436bbfd..e650cfc7f 100644 --- a/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt @@ -1,7 +1,8 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> IC1.2 <-> IC1.6 - C1.2 <-> C2.1 <-> D1.1 <-> D1.2 <-> D2.2 - C2.2 <-> DP.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 - D2.1 <-> DP.2 <-> IC1.1 <-> IC1.5 + C1.+ <-> IC1.2 + C1.- <-> D1.A <-> D2.K + C2.+ <-> D1.K + C2.- <-> DP.A <-> IC1.3 <-> IC1.8 + D2.A <-> DP.K <-> IC1.1 <-> IC1.5 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_excl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_incl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_pcb_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_excl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_excl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_incl_switches.txt index 104db2e6e..38d635af2 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_od_perf_incl_switches.txt @@ -1,16 +1,16 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 C2.1 <-> C3.1 <-> IC1.2 <-> R3.1 C2.2 <-> IC1.1 <-> R3.2 <-> R6.1 - C4.1 <-> C5.2 <-> D1.1 <-> D2.2 <-> R4.2 <-> R5.1 <-> R7.1 - C4.2 <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 - C5.1 <-> D1.2 <-> D2.1 <-> R6.2 <-> R8.1 + C4.+ <-> C5.2 <-> D1.A <-> D2.K <-> R4.2 <-> R5.1 <-> R7.1 + C4.- <-> IC1.4 <-> R1.2 <-> R10.1 <-> R5.2 + C5.1 <-> D1.K <-> D2.A <-> R6.2 <-> R8.1 C6.1 <-> IC1.6 <-> R11.1 <-> R9.1 - C6.2 <-> C7.1 <-> IC1.7 <-> R9.2 - C7.2 <-> R10.2 - C8.1 <-> R11.2 + C6.2 <-> C7.+ <-> IC1.7 <-> R9.2 + C7.- <-> R10.2 + C8.+ <-> R11.2 IC1.3 <-> R2.2 <-> R4.1 IC1.5 <-> R7.2 IC1.8 <-> R8.2 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_excl_switches.txt index 1662343d5..8212392d0 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 + C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1 + C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 C2.1 <-> R5.1 C2.2 <-> R4.1 C3.1 <-> C4.1 <-> IC1.1 <-> R6.1 <-> R7.1 C3.2 <-> IC1.2 <-> R7.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2 - C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1 + C5.2 <-> D1.A <-> D2.K <-> R6.2 <-> R9.2 + C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1 C6.2 <-> IC1.7 <-> R10.2 - C7.2 <-> R11.2 - C8.1 <-> R12.2 + C7.- <-> R11.2 + C8.+ <-> R12.2 IC1.3 <-> R3.2 <-> R4.2 IC1.5 <-> R1.1 IC1.8 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_incl_switches.txt index 1662343d5..8212392d0 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_lab_pcb_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1 - C1.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 + C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1 + C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2 C2.1 <-> R5.1 C2.2 <-> R4.1 C3.1 <-> C4.1 <-> IC1.1 <-> R6.1 <-> R7.1 C3.2 <-> IC1.2 <-> R7.2 C4.2 <-> R8.1 - C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2 - C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1 + C5.2 <-> D1.A <-> D2.K <-> R6.2 <-> R9.2 + C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1 C6.2 <-> IC1.7 <-> R10.2 - C7.2 <-> R11.2 - C8.1 <-> R12.2 + C7.- <-> R11.2 + C8.+ <-> R12.2 IC1.3 <-> R3.2 <-> R4.2 IC1.5 <-> R1.1 IC1.8 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_excl_switches.txt index 2a56ccbda..7eee4df14 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R1.2 <-> R3.1 C1.2 <-> C2.1 <-> IC1.2 <-> R1.1 C3.1 <-> R2.1 - C4.1 <-> D1.1 <-> Q2.3 <-> R5.2 <-> R6.1 <-> R7.1 - C4.2 <-> C7.2 <-> IC1.4 <-> R6.2 + C4.+ <-> D1.A <-> Q2.3 <-> R5.2 <-> R6.1 <-> R7.1 + C4.- <-> C7.2 <-> IC1.4 <-> R6.2 C5.1 <-> IC1.6 <-> R8.2 - C5.2 <-> C6.1 <-> IC1.7 <-> R8.1 - C6.2 <-> R9.1 + C5.2 <-> C6.+ <-> IC1.7 <-> R8.1 + C6.- <-> R9.1 C7.1 <-> R10.2 - D1.2 <-> Q1.1 - D2.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - D2.2 <-> Q2.1 <-> Q2.2 + D1.K <-> Q1.1 + D2.A <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 + D2.K <-> Q2.1 <-> Q2.2 IC1.3 <-> R2.2 <-> R5.1 IC1.5 <-> R7.2 IC1.8 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_incl_switches.txt index 2a56ccbda..7eee4df14 100644 --- a/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/voodoo_modded_perf_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> IC1.1 <-> R1.2 <-> R3.1 C1.2 <-> C2.1 <-> IC1.2 <-> R1.1 C3.1 <-> R2.1 - C4.1 <-> D1.1 <-> Q2.3 <-> R5.2 <-> R6.1 <-> R7.1 - C4.2 <-> C7.2 <-> IC1.4 <-> R6.2 + C4.+ <-> D1.A <-> Q2.3 <-> R5.2 <-> R6.1 <-> R7.1 + C4.- <-> C7.2 <-> IC1.4 <-> R6.2 C5.1 <-> IC1.6 <-> R8.2 - C5.2 <-> C6.1 <-> IC1.7 <-> R8.1 - C6.2 <-> R9.1 + C5.2 <-> C6.+ <-> IC1.7 <-> R8.1 + C6.- <-> R9.1 C7.1 <-> R10.2 - D1.2 <-> Q1.1 - D2.1 <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 - D2.2 <-> Q2.1 <-> Q2.2 + D1.K <-> Q1.1 + D2.A <-> Q1.2 <-> Q1.3 <-> R3.2 <-> R4.1 + D2.K <-> Q2.1 <-> Q2.2 IC1.3 <-> R2.2 <-> R5.1 IC1.5 <-> R7.2 IC1.8 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_excl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_incl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_pcb_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_excl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_incl_switches.txt index db4d37657..606ffa798 100644 --- a/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_distortion_booster_perf_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.2 C1.2 <-> Q1.3 <-> R5.1 - C2.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C2.- <-> D1.A <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.2 C3.1 <-> R4.2 - D1.2 <-> R2.2 <-> R3.1 + D1.K <-> R2.2 <-> R3.1 Q2.1 <-> R5.2 <-> R6.1 Q2.2 <-> Q2.3 <-> R2.1 R3.2 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt index 8b0f00bc6..55f53412d 100644 --- a/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.2 <-> R6.1 C1.2 <-> R4.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R4.2 <-> R5.2 <-> R6.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R4.2 <-> R5.2 <-> R6.2 C3.1 <-> R3.2 - C3.2 <-> R1.1 <-> R2.1 + R1.1 <-> R2.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt index 8b0f00bc6..55f53412d 100644 --- a/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt @@ -1,10 +1,10 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> Q1.3 <-> R1.2 <-> R6.1 C1.2 <-> R4.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> R4.2 <-> R5.2 <-> R6.2 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> R4.2 <-> R5.2 <-> R6.2 C3.1 <-> R3.2 - C3.2 <-> R1.1 <-> R2.1 + R1.1 <-> R2.1 R2.2 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/vulcan_lite_excl_switches.txt b/diylc-regression-data/input/v1/netlist/vulcan_lite_excl_switches.txt index b3204cab9..67cfced3e 100644 --- a/diylc-regression-data/input/v1/netlist/vulcan_lite_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vulcan_lite_excl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> C6.2 <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> C6.- <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 C3.1 <-> R4.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.1 <-> Q2.2 <-> R10.1 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.1 <-> Q2.2 <-> R10.1 C7.1 <-> R9.2 C7.2 <-> R11.2 - D1.1 <-> Q1.3 <-> R3.2 - D2.1 <-> Q2.3 <-> R8.1 + D1.A <-> Q1.3 <-> R3.2 + D2.A <-> Q2.3 <-> R8.1 R11.1 <-> R12.1 R3.1 <-> R4.1 <-> R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/vulcan_lite_incl_switches.txt b/diylc-regression-data/input/v1/netlist/vulcan_lite_incl_switches.txt index b3204cab9..67cfced3e 100644 --- a/diylc-regression-data/input/v1/netlist/vulcan_lite_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/vulcan_lite_incl_switches.txt @@ -1,17 +1,17 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 - C1.2 <-> D1.2 <-> R2.1 - C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1 - C2.2 <-> C6.2 <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 + C1.2 <-> D1.K <-> R2.1 + C2.+ <-> Q1.1 <-> Q1.2 <-> R5.1 + C2.- <-> C6.- <-> R1.2 <-> R10.2 <-> R12.2 <-> R2.2 <-> R5.2 <-> R7.2 C3.1 <-> R4.2 C4.2 <-> C5.1 <-> R6.1 - C5.2 <-> D2.2 <-> R6.2 <-> R7.1 - C6.1 <-> Q2.1 <-> Q2.2 <-> R10.1 + C5.2 <-> D2.K <-> R6.2 <-> R7.1 + C6.+ <-> Q2.1 <-> Q2.2 <-> R10.1 C7.1 <-> R9.2 C7.2 <-> R11.2 - D1.1 <-> Q1.3 <-> R3.2 - D2.1 <-> Q2.3 <-> R8.1 + D1.A <-> Q1.3 <-> R3.2 + D2.A <-> Q2.3 <-> R8.1 R11.1 <-> R12.1 R3.1 <-> R4.1 <-> R8.2 <-> R9.1 diff --git a/diylc-regression-data/input/v1/netlist/wah2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/wah2_excl_switches.txt index 35188c62c..edcebc477 100644 --- a/diylc-regression-data/input/v1/netlist/wah2_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/wah2_excl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.2 <-> R1.1 <-> R5.1 <-> VR1.3 + .1 <-> C2.- <-> R1.1 <-> R5.1 <-> VR1.3 .10 <-> R7.1 - .2 <-> C6.1 <-> D1.2 <-> R3.1 <-> R4.2 <-> R7.2 + .2 <-> C6.+ <-> D1.K <-> R3.1 <-> R4.2 <-> R7.2 .3 <-> .4 .5 <-> C1.2 .6 <-> C4.2 .7 <-> .8 - .9 <-> C6.2 <-> D1.1 + .9 <-> C6.- <-> D1.A C1.1 <-> R2.1 <-> R4.1 <-> R6.1 - C2.1 <-> R5.2 <-> R6.2 <-> VR4.2 + C2.+ <-> R5.2 <-> R6.2 <-> VR4.2 C3.1 <-> Q1.2 <-> Q1.3 <-> VR2.3 C3.2 <-> VR3.3 C4.1 <-> Q2.3 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/wah2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/wah2_incl_switches.txt index 35188c62c..edcebc477 100644 --- a/diylc-regression-data/input/v1/netlist/wah2_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/wah2_incl_switches.txt @@ -1,15 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - .1 <-> C2.2 <-> R1.1 <-> R5.1 <-> VR1.3 + .1 <-> C2.- <-> R1.1 <-> R5.1 <-> VR1.3 .10 <-> R7.1 - .2 <-> C6.1 <-> D1.2 <-> R3.1 <-> R4.2 <-> R7.2 + .2 <-> C6.+ <-> D1.K <-> R3.1 <-> R4.2 <-> R7.2 .3 <-> .4 .5 <-> C1.2 .6 <-> C4.2 .7 <-> .8 - .9 <-> C6.2 <-> D1.1 + .9 <-> C6.- <-> D1.A C1.1 <-> R2.1 <-> R4.1 <-> R6.1 - C2.1 <-> R5.2 <-> R6.2 <-> VR4.2 + C2.+ <-> R5.2 <-> R6.2 <-> VR4.2 C3.1 <-> Q1.2 <-> Q1.3 <-> VR2.3 C3.2 <-> VR3.3 C4.1 <-> Q2.3 <-> R2.2 diff --git a/diylc-regression-data/input/v1/netlist/walco_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/walco_pcb_excl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/v1/netlist/walco_pcb_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/walco_pcb_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/walco_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/walco_pcb_incl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/v1/netlist/walco_pcb_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/walco_pcb_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/walco_perf_excl_switches.txt b/diylc-regression-data/input/v1/netlist/walco_perf_excl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/v1/netlist/walco_perf_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/walco_perf_excl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/walco_perf_incl_switches.txt b/diylc-regression-data/input/v1/netlist/walco_perf_incl_switches.txt index 6798a15b1..836f96d58 100644 --- a/diylc-regression-data/input/v1/netlist/walco_perf_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/walco_perf_incl_switches.txt @@ -1,18 +1,18 @@ -Switch setup: [Default] +Switch setup: [ ALL ] C1.1 <-> R1.1 C1.2 <-> R2.1 - C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1 - C2.2 <-> C3.2 <-> D2.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 - C3.1 <-> D1.2 <-> Q2.3 - C4.1 <-> Q1.1 <-> R4.1 - C4.2 <-> Q3.3 <-> R8.2 - C5.1 <-> R7.2 <-> R8.1 - C5.2 <-> R9.1 - C6.1 <-> R10.1 <-> R11.2 - C6.2 <-> D1.1 <-> D2.2 <-> R12.1 - C7.1 <-> R12.2 - C7.2 <-> R13.2 + C2.+ <-> Q1.2 <-> Q1.3 <-> R3.1 + C2.- <-> C3.- <-> D2.A <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q4.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R5.2 <-> R6.2 + C3.+ <-> D1.K <-> Q2.3 + C4.+ <-> Q1.1 <-> R4.1 + C4.- <-> Q3.3 <-> R8.2 + C5.+ <-> R7.2 <-> R8.1 + C5.- <-> R9.1 + C6.+ <-> R10.1 <-> R11.2 + C6.- <-> D1.A <-> D2.K <-> R12.1 + C7.+ <-> R12.2 + C7.- <-> R13.2 Q3.1 <-> Q3.2 <-> R6.1 Q4.3 <-> R10.2 <-> R9.2 R11.1 <-> R4.2 <-> R7.1 diff --git a/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt b/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt index 23a32d261..1f4faf6c8 100644 --- a/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt @@ -1,11 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 - C1.2 <-> C6.1 <-> Q2.3 <-> R3.1 <-> Wool.1 - C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Wool.2 <-> Wool.3 - C3.2 <-> EQ.1 <-> R5.2 - C4.2 <-> EQ.3 <-> R6.2 - C5.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R6.1 + C1.1 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> Output.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> Wool.1 <-> Wool.2 + C3.1 <-> C5.- <-> R4.1 + C3.2 <-> EQ.3 <-> R5.2 + C4.2 <-> EQ.1 <-> R6.2 + C5.+ <-> R5.1 <-> R6.1 + C6.+ <-> Wool.3 + C6.- <-> Pinch.1 <-> Pinch.2 <-> Q2.1 <-> Q2.2 <-> R1.2 EQ.2 <-> Output.2 - Pinch.1 <-> R2.1 + Pinch.3 <-> R2.1 + Q2.3 <-> R3.1 + R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt b/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt index 23a32d261..1f4faf6c8 100644 --- a/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt @@ -1,11 +1,15 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.2 <-> C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 - C1.2 <-> C6.1 <-> Q2.3 <-> R3.1 <-> Wool.1 - C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Wool.2 <-> Wool.3 - C3.2 <-> EQ.1 <-> R5.2 - C4.2 <-> EQ.3 <-> R6.2 - C5.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R6.1 + C1.1 <-> C2.2 <-> Q1.3 <-> R2.2 + C2.1 <-> C4.1 <-> Output.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> Wool.1 <-> Wool.2 + C3.1 <-> C5.- <-> R4.1 + C3.2 <-> EQ.3 <-> R5.2 + C4.2 <-> EQ.1 <-> R6.2 + C5.+ <-> R5.1 <-> R6.1 + C6.+ <-> Wool.3 + C6.- <-> Pinch.1 <-> Pinch.2 <-> Q2.1 <-> Q2.2 <-> R1.2 EQ.2 <-> Output.2 - Pinch.1 <-> R2.1 + Pinch.3 <-> R2.1 + Q2.3 <-> R3.1 + R3.2 <-> R4.2 diff --git a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt index 100ccd6b9..554d2d4e3 100644 --- a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R2.1 <-> R3.1 C1.2 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.2 C2.2 <-> Q1.1 <-> R3.2 R1.2 <-> R4.2 + R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt index 100ccd6b9..554d2d4e3 100644 --- a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt @@ -1,7 +1,7 @@ -Switch setup: [Default] +Switch setup: [ ALL ] - C1.1 <-> C2.1 <-> R2.1 <-> R3.1 C1.2 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.2 C2.2 <-> Q1.1 <-> R3.2 R1.2 <-> R4.2 + R2.1 <-> R3.1 diff --git a/diylc-regression-data/input/v1/png/12v_supply.png b/diylc-regression-data/input/v1/png/12v_supply.png index a54703bda..c7e57c53a 100644 Binary files a/diylc-regression-data/input/v1/png/12v_supply.png and b/diylc-regression-data/input/v1/png/12v_supply.png differ diff --git a/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png b/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png index 89e22bd5a..4724a4b2c 100644 Binary files a/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png and b/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/1976_distortion+_perf.png b/diylc-regression-data/input/v1/png/1976_distortion+_perf.png index b4a76a458..ae0b76fce 100644 Binary files a/diylc-regression-data/input/v1/png/1976_distortion+_perf.png and b/diylc-regression-data/input/v1/png/1976_distortion+_perf.png differ diff --git a/diylc-regression-data/input/v1/png/1977_od_250.png b/diylc-regression-data/input/v1/png/1977_od_250.png index caf96229c..e99d6b097 100644 Binary files a/diylc-regression-data/input/v1/png/1977_od_250.png and b/diylc-regression-data/input/v1/png/1977_od_250.png differ diff --git a/diylc-regression-data/input/v1/png/30w_amp.png b/diylc-regression-data/input/v1/png/30w_amp.png index 2565f4a4b..943b52140 100644 Binary files a/diylc-regression-data/input/v1/png/30w_amp.png and b/diylc-regression-data/input/v1/png/30w_amp.png differ diff --git a/diylc-regression-data/input/v1/png/3_legged_dog.png b/diylc-regression-data/input/v1/png/3_legged_dog.png index f85c141bc..fbb4f55a0 100644 Binary files a/diylc-regression-data/input/v1/png/3_legged_dog.png and b/diylc-regression-data/input/v1/png/3_legged_dog.png differ diff --git a/diylc-regression-data/input/v1/png/3_wire_big_muff_tone_stack.png b/diylc-regression-data/input/v1/png/3_wire_big_muff_tone_stack.png index b6c592589..4fc2ef52c 100644 Binary files a/diylc-regression-data/input/v1/png/3_wire_big_muff_tone_stack.png and b/diylc-regression-data/input/v1/png/3_wire_big_muff_tone_stack.png differ diff --git a/diylc-regression-data/input/v1/png/3_wire_fender_tone_stack.png b/diylc-regression-data/input/v1/png/3_wire_fender_tone_stack.png index 1d0dd5db3..8690d3a45 100644 Binary files a/diylc-regression-data/input/v1/png/3_wire_fender_tone_stack.png and b/diylc-regression-data/input/v1/png/3_wire_fender_tone_stack.png differ diff --git a/diylc-regression-data/input/v1/png/3_wire_marshall_tone_stack.png b/diylc-regression-data/input/v1/png/3_wire_marshall_tone_stack.png index 4a3aeaad7..794e50bb6 100644 Binary files a/diylc-regression-data/input/v1/png/3_wire_marshall_tone_stack.png and b/diylc-regression-data/input/v1/png/3_wire_marshall_tone_stack.png differ diff --git a/diylc-regression-data/input/v1/png/3_wire_vox_tone_stack.png b/diylc-regression-data/input/v1/png/3_wire_vox_tone_stack.png index 056e8a285..1328d87d4 100644 Binary files a/diylc-regression-data/input/v1/png/3_wire_vox_tone_stack.png and b/diylc-regression-data/input/v1/png/3_wire_vox_tone_stack.png differ diff --git a/diylc-regression-data/input/v1/png/5_knob_fuzz.png b/diylc-regression-data/input/v1/png/5_knob_fuzz.png index 805294b67..7b2915df5 100644 Binary files a/diylc-regression-data/input/v1/png/5_knob_fuzz.png and b/diylc-regression-data/input/v1/png/5_knob_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/9V_supply_regulated.png b/diylc-regression-data/input/v1/png/9V_supply_regulated.png index 1fa045bd2..d71723cfc 100644 Binary files a/diylc-regression-data/input/v1/png/9V_supply_regulated.png and b/diylc-regression-data/input/v1/png/9V_supply_regulated.png differ diff --git a/diylc-regression-data/input/v1/png/9v_di_box.png b/diylc-regression-data/input/v1/png/9v_di_box.png index a34e186e2..d2a3bbcff 100644 Binary files a/diylc-regression-data/input/v1/png/9v_di_box.png and b/diylc-regression-data/input/v1/png/9v_di_box.png differ diff --git a/diylc-regression-data/input/v1/png/alembic_stratoblaster_pcb.png b/diylc-regression-data/input/v1/png/alembic_stratoblaster_pcb.png index 3ac49e17a..3087818a1 100644 Binary files a/diylc-regression-data/input/v1/png/alembic_stratoblaster_pcb.png and b/diylc-regression-data/input/v1/png/alembic_stratoblaster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/alembic_stratoblaster_perf.png b/diylc-regression-data/input/v1/png/alembic_stratoblaster_perf.png index ef4b04b24..f77bb3370 100644 Binary files a/diylc-regression-data/input/v1/png/alembic_stratoblaster_perf.png and b/diylc-regression-data/input/v1/png/alembic_stratoblaster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/amz_minibooster.png b/diylc-regression-data/input/v1/png/amz_minibooster.png index abd42d1d5..1f389a3c0 100644 Binary files a/diylc-regression-data/input/v1/png/amz_minibooster.png and b/diylc-regression-data/input/v1/png/amz_minibooster.png differ diff --git a/diylc-regression-data/input/v1/png/amz_minibooster_pcb.png b/diylc-regression-data/input/v1/png/amz_minibooster_pcb.png index 7473273e1..2ee343c2d 100644 Binary files a/diylc-regression-data/input/v1/png/amz_minibooster_pcb.png and b/diylc-regression-data/input/v1/png/amz_minibooster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/amz_minibooster_pcb2.png b/diylc-regression-data/input/v1/png/amz_minibooster_pcb2.png index 51c1ce599..39ec4f1a2 100644 Binary files a/diylc-regression-data/input/v1/png/amz_minibooster_pcb2.png and b/diylc-regression-data/input/v1/png/amz_minibooster_pcb2.png differ diff --git a/diylc-regression-data/input/v1/png/amz_minibooster_perf.png b/diylc-regression-data/input/v1/png/amz_minibooster_perf.png index 38257ebfa..459bbfaa4 100644 Binary files a/diylc-regression-data/input/v1/png/amz_minibooster_perf.png and b/diylc-regression-data/input/v1/png/amz_minibooster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/amz_mosfet_boost.png b/diylc-regression-data/input/v1/png/amz_mosfet_boost.png index 973676ff0..cf1a83e75 100644 Binary files a/diylc-regression-data/input/v1/png/amz_mosfet_boost.png and b/diylc-regression-data/input/v1/png/amz_mosfet_boost.png differ diff --git a/diylc-regression-data/input/v1/png/amz_mosfet_boost_with_bias.png b/diylc-regression-data/input/v1/png/amz_mosfet_boost_with_bias.png index fca1b0b6e..dbfa71547 100644 Binary files a/diylc-regression-data/input/v1/png/amz_mosfet_boost_with_bias.png and b/diylc-regression-data/input/v1/png/amz_mosfet_boost_with_bias.png differ diff --git a/diylc-regression-data/input/v1/png/amz_muffer_pcb.png b/diylc-regression-data/input/v1/png/amz_muffer_pcb.png index 8ec6f1570..35a01ddd1 100644 Binary files a/diylc-regression-data/input/v1/png/amz_muffer_pcb.png and b/diylc-regression-data/input/v1/png/amz_muffer_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/amz_muffer_perf.png b/diylc-regression-data/input/v1/png/amz_muffer_perf.png index 96b19da4e..7bf3a4310 100644 Binary files a/diylc-regression-data/input/v1/png/amz_muffer_perf.png and b/diylc-regression-data/input/v1/png/amz_muffer_perf.png differ diff --git a/diylc-regression-data/input/v1/png/antiquity_fuzz.png b/diylc-regression-data/input/v1/png/antiquity_fuzz.png index eaa30445f..72dd51f3d 100644 Binary files a/diylc-regression-data/input/v1/png/antiquity_fuzz.png and b/diylc-regression-data/input/v1/png/antiquity_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/atari_punk_console.png b/diylc-regression-data/input/v1/png/atari_punk_console.png index a0d24a74e..f0763d4eb 100644 Binary files a/diylc-regression-data/input/v1/png/atari_punk_console.png and b/diylc-regression-data/input/v1/png/atari_punk_console.png differ diff --git a/diylc-regression-data/input/v1/png/atari_punk_console_556.png b/diylc-regression-data/input/v1/png/atari_punk_console_556.png index 9a6aacaff..c42206c6f 100644 Binary files a/diylc-regression-data/input/v1/png/atari_punk_console_556.png and b/diylc-regression-data/input/v1/png/atari_punk_console_556.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_comp.png b/diylc-regression-data/input/v1/png/aussie_comp.png index 2320e5836..17f1b5cd5 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_comp.png and b/diylc-regression-data/input/v1/png/aussie_comp.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_mart_pcb.png b/diylc-regression-data/input/v1/png/aussie_mart_pcb.png index f43e25f56..e31d91d71 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_mart_pcb.png and b/diylc-regression-data/input/v1/png/aussie_mart_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_mart_perf.png b/diylc-regression-data/input/v1/png/aussie_mart_perf.png index 95a33eeb9..25c5faa9a 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_mart_perf.png and b/diylc-regression-data/input/v1/png/aussie_mart_perf.png differ diff --git a/diylc-regression-data/input/v1/png/austin_gold.png b/diylc-regression-data/input/v1/png/austin_gold.png index 97c7fe032..768e6f29f 100644 Binary files a/diylc-regression-data/input/v1/png/austin_gold.png and b/diylc-regression-data/input/v1/png/austin_gold.png differ diff --git a/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png b/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png index ee8fdcad0..c66527a5e 100644 Binary files a/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png and b/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png differ diff --git a/diylc-regression-data/input/v1/png/b_blender.png b/diylc-regression-data/input/v1/png/b_blender.png index 948030424..943cd13c6 100644 Binary files a/diylc-regression-data/input/v1/png/b_blender.png and b/diylc-regression-data/input/v1/png/b_blender.png differ diff --git a/diylc-regression-data/input/v1/png/bazz_fuss_pcb.png b/diylc-regression-data/input/v1/png/bazz_fuss_pcb.png index 354efbaf2..3cafd98a6 100644 Binary files a/diylc-regression-data/input/v1/png/bazz_fuss_pcb.png and b/diylc-regression-data/input/v1/png/bazz_fuss_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/bazz_fuss_perf.png b/diylc-regression-data/input/v1/png/bazz_fuss_perf.png index f0e4c94a1..ed007e37d 100644 Binary files a/diylc-regression-data/input/v1/png/bazz_fuss_perf.png and b/diylc-regression-data/input/v1/png/bazz_fuss_perf.png differ diff --git a/diylc-regression-data/input/v1/png/bazz_fuzz_v1.png b/diylc-regression-data/input/v1/png/bazz_fuzz_v1.png index 1d7a32775..d2c6f8358 100644 Binary files a/diylc-regression-data/input/v1/png/bazz_fuzz_v1.png and b/diylc-regression-data/input/v1/png/bazz_fuzz_v1.png differ diff --git a/diylc-regression-data/input/v1/png/bi-polar_boost.png b/diylc-regression-data/input/v1/png/bi-polar_boost.png index 012d66e49..8492445f5 100644 Binary files a/diylc-regression-data/input/v1/png/bi-polar_boost.png and b/diylc-regression-data/input/v1/png/bi-polar_boost.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_1977.png b/diylc-regression-data/input/v1/png/big_muff_1977.png index 43c367b22..c331a7993 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_1977.png and b/diylc-regression-data/input/v1/png/big_muff_1977.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png b/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png index 7a272dfaa..a03285f70 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png and b/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_classic.png b/diylc-regression-data/input/v1/png/big_muff_classic.png index 2b444aa0a..4aeb54c7a 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_classic.png and b/diylc-regression-data/input/v1/png/big_muff_classic.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_tri_pcb.png b/diylc-regression-data/input/v1/png/big_muff_tri_pcb.png index f49f7659d..27e0bb926 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_tri_pcb.png and b/diylc-regression-data/input/v1/png/big_muff_tri_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_tri_perf.png b/diylc-regression-data/input/v1/png/big_muff_tri_perf.png index 47e7b913e..98e33a96e 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_tri_perf.png and b/diylc-regression-data/input/v1/png/big_muff_tri_perf.png differ diff --git a/diylc-regression-data/input/v1/png/bixonix_expandora.png b/diylc-regression-data/input/v1/png/bixonix_expandora.png index be4e7191c..7846fac26 100644 Binary files a/diylc-regression-data/input/v1/png/bixonix_expandora.png and b/diylc-regression-data/input/v1/png/bixonix_expandora.png differ diff --git a/diylc-regression-data/input/v1/png/blackfire_vero.png b/diylc-regression-data/input/v1/png/blackfire_vero.png index 5ae03acd2..0060b98e3 100644 Binary files a/diylc-regression-data/input/v1/png/blackfire_vero.png and b/diylc-regression-data/input/v1/png/blackfire_vero.png differ diff --git a/diylc-regression-data/input/v1/png/blue_clipper_pcb.png b/diylc-regression-data/input/v1/png/blue_clipper_pcb.png index 21da6d384..ab44eb696 100644 Binary files a/diylc-regression-data/input/v1/png/blue_clipper_pcb.png and b/diylc-regression-data/input/v1/png/blue_clipper_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/blue_clipper_perf.png b/diylc-regression-data/input/v1/png/blue_clipper_perf.png index 65e0e4fea..2c9a4d6ff 100644 Binary files a/diylc-regression-data/input/v1/png/blue_clipper_perf.png and b/diylc-regression-data/input/v1/png/blue_clipper_perf.png differ diff --git a/diylc-regression-data/input/v1/png/blues_breaker.png b/diylc-regression-data/input/v1/png/blues_breaker.png index 0f40f67b3..6a1c6af63 100644 Binary files a/diylc-regression-data/input/v1/png/blues_breaker.png and b/diylc-regression-data/input/v1/png/blues_breaker.png differ diff --git a/diylc-regression-data/input/v1/png/bonerender.png b/diylc-regression-data/input/v1/png/bonerender.png index 7e2f084ea..3dd650092 100644 Binary files a/diylc-regression-data/input/v1/png/bonerender.png and b/diylc-regression-data/input/v1/png/bonerender.png differ diff --git a/diylc-regression-data/input/v1/png/bonerender_pcb.png b/diylc-regression-data/input/v1/png/bonerender_pcb.png index 1eb116d3a..19724de00 100644 Binary files a/diylc-regression-data/input/v1/png/bonerender_pcb.png and b/diylc-regression-data/input/v1/png/bonerender_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png index 52b14ddf7..960974ae8 100644 Binary files a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png and b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png differ diff --git a/diylc-regression-data/input/v1/png/boutique_fuzz_face.png b/diylc-regression-data/input/v1/png/boutique_fuzz_face.png index 5361ccdac..e8effa0aa 100644 Binary files a/diylc-regression-data/input/v1/png/boutique_fuzz_face.png and b/diylc-regression-data/input/v1/png/boutique_fuzz_face.png differ diff --git a/diylc-regression-data/input/v1/png/boutique_fuzz_face_2.png b/diylc-regression-data/input/v1/png/boutique_fuzz_face_2.png index 6265ecef4..e7cce4252 100644 Binary files a/diylc-regression-data/input/v1/png/boutique_fuzz_face_2.png and b/diylc-regression-data/input/v1/png/boutique_fuzz_face_2.png differ diff --git a/diylc-regression-data/input/v1/png/boutique_fuzz_face_perf.png b/diylc-regression-data/input/v1/png/boutique_fuzz_face_perf.png index 9ad0fdd46..a6f9a93e3 100644 Binary files a/diylc-regression-data/input/v1/png/boutique_fuzz_face_perf.png and b/diylc-regression-data/input/v1/png/boutique_fuzz_face_perf.png differ diff --git a/diylc-regression-data/input/v1/png/buff_n_blend.png b/diylc-regression-data/input/v1/png/buff_n_blend.png index 98e7e4f9d..ffd261548 100644 Binary files a/diylc-regression-data/input/v1/png/buff_n_blend.png and b/diylc-regression-data/input/v1/png/buff_n_blend.png differ diff --git a/diylc-regression-data/input/v1/png/bug_pcb_template.png b/diylc-regression-data/input/v1/png/bug_pcb_template.png index ccd77c200..31f1a83b7 100644 Binary files a/diylc-regression-data/input/v1/png/bug_pcb_template.png and b/diylc-regression-data/input/v1/png/bug_pcb_template.png differ diff --git a/diylc-regression-data/input/v1/png/chaos.png b/diylc-regression-data/input/v1/png/chaos.png index e56001252..0996591ea 100644 Binary files a/diylc-regression-data/input/v1/png/chaos.png and b/diylc-regression-data/input/v1/png/chaos.png differ diff --git a/diylc-regression-data/input/v1/png/colorsound_il_wah.png b/diylc-regression-data/input/v1/png/colorsound_il_wah.png index 53c788e20..02786a4d9 100644 Binary files a/diylc-regression-data/input/v1/png/colorsound_il_wah.png and b/diylc-regression-data/input/v1/png/colorsound_il_wah.png differ diff --git a/diylc-regression-data/input/v1/png/colorsound_one_knob_fuzz.png b/diylc-regression-data/input/v1/png/colorsound_one_knob_fuzz.png index 681db1823..38a0bf145 100644 Binary files a/diylc-regression-data/input/v1/png/colorsound_one_knob_fuzz.png and b/diylc-regression-data/input/v1/png/colorsound_one_knob_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/cream_pie.png b/diylc-regression-data/input/v1/png/cream_pie.png index 6b375c9ef..bbb23033f 100644 Binary files a/diylc-regression-data/input/v1/png/cream_pie.png and b/diylc-regression-data/input/v1/png/cream_pie.png differ diff --git a/diylc-regression-data/input/v1/png/dallas_arbiter_fuzz_face_bc108.png b/diylc-regression-data/input/v1/png/dallas_arbiter_fuzz_face_bc108.png index f12a6c7f6..6be66e5e1 100644 Binary files a/diylc-regression-data/input/v1/png/dallas_arbiter_fuzz_face_bc108.png and b/diylc-regression-data/input/v1/png/dallas_arbiter_fuzz_face_bc108.png differ diff --git a/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png b/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png index 6536e3321..4342eb950 100644 Binary files a/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png and b/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/dallas_rangemaster_perf.png b/diylc-regression-data/input/v1/png/dallas_rangemaster_perf.png index 1f18c51a0..f73df045f 100644 Binary files a/diylc-regression-data/input/v1/png/dallas_rangemaster_perf.png and b/diylc-regression-data/input/v1/png/dallas_rangemaster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/diaz_texas_square_face_pcb.png b/diylc-regression-data/input/v1/png/diaz_texas_square_face_pcb.png index 77f07626e..d84b64e9e 100644 Binary files a/diylc-regression-data/input/v1/png/diaz_texas_square_face_pcb.png and b/diylc-regression-data/input/v1/png/diaz_texas_square_face_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/diaz_texas_square_face_perf.png b/diylc-regression-data/input/v1/png/diaz_texas_square_face_perf.png index 6aeff1c8c..bd23cfc89 100644 Binary files a/diylc-regression-data/input/v1/png/diaz_texas_square_face_perf.png and b/diylc-regression-data/input/v1/png/diaz_texas_square_face_perf.png differ diff --git a/diylc-regression-data/input/v1/png/diode_comp_opamp.png b/diylc-regression-data/input/v1/png/diode_comp_opamp.png index 4f964e461..fd318c640 100644 Binary files a/diylc-regression-data/input/v1/png/diode_comp_opamp.png and b/diylc-regression-data/input/v1/png/diode_comp_opamp.png differ diff --git a/diylc-regression-data/input/v1/png/discrete_fet_guitar_preamp.png b/diylc-regression-data/input/v1/png/discrete_fet_guitar_preamp.png index 9af8006d7..67a264311 100644 Binary files a/diylc-regression-data/input/v1/png/discrete_fet_guitar_preamp.png and b/diylc-regression-data/input/v1/png/discrete_fet_guitar_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/dist+.png b/diylc-regression-data/input/v1/png/dist+.png index 24da38932..71abba21d 100644 Binary files a/diylc-regression-data/input/v1/png/dist+.png and b/diylc-regression-data/input/v1/png/dist+.png differ diff --git a/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png b/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png index b06984090..bf9797787 100644 Binary files a/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png and b/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png b/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png index 53ebe7e3e..ec02852d5 100644 Binary files a/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png and b/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png differ diff --git a/diylc-regression-data/input/v1/png/dod_overdrive_250.png b/diylc-regression-data/input/v1/png/dod_overdrive_250.png index 482805186..d5d7a3698 100644 Binary files a/diylc-regression-data/input/v1/png/dod_overdrive_250.png and b/diylc-regression-data/input/v1/png/dod_overdrive_250.png differ diff --git a/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png b/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png index e0a48044a..2ade2befa 100644 Binary files a/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png and b/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png differ diff --git a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png index b0a3726a3..5a3017470 100644 Binary files a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png and b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png differ diff --git a/diylc-regression-data/input/v1/png/duende_jfet_booster_pcb.png b/diylc-regression-data/input/v1/png/duende_jfet_booster_pcb.png index 964eb8488..e1c16f312 100644 Binary files a/diylc-regression-data/input/v1/png/duende_jfet_booster_pcb.png and b/diylc-regression-data/input/v1/png/duende_jfet_booster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/duende_jfet_booster_perf.png b/diylc-regression-data/input/v1/png/duende_jfet_booster_perf.png index 0adcfaeee..1526175c6 100644 Binary files a/diylc-regression-data/input/v1/png/duende_jfet_booster_perf.png and b/diylc-regression-data/input/v1/png/duende_jfet_booster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/dyna_comp_pcb.png b/diylc-regression-data/input/v1/png/dyna_comp_pcb.png index 2f47adbe8..da9fa9a81 100644 Binary files a/diylc-regression-data/input/v1/png/dyna_comp_pcb.png and b/diylc-regression-data/input/v1/png/dyna_comp_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/dyna_comp_perf.png b/diylc-regression-data/input/v1/png/dyna_comp_perf.png index 3271d096e..0663d7872 100644 Binary files a/diylc-regression-data/input/v1/png/dyna_comp_perf.png and b/diylc-regression-data/input/v1/png/dyna_comp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/dynamic_overhype.png b/diylc-regression-data/input/v1/png/dynamic_overhype.png index 3fe58d48b..5ad49af3a 100644 Binary files a/diylc-regression-data/input/v1/png/dynamic_overhype.png and b/diylc-regression-data/input/v1/png/dynamic_overhype.png differ diff --git a/diylc-regression-data/input/v1/png/ea_tremelo_pcb.png b/diylc-regression-data/input/v1/png/ea_tremelo_pcb.png index e9e76331e..2d79fc896 100644 Binary files a/diylc-regression-data/input/v1/png/ea_tremelo_pcb.png and b/diylc-regression-data/input/v1/png/ea_tremelo_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ea_tremelo_perf.png b/diylc-regression-data/input/v1/png/ea_tremelo_perf.png index 4f7f9296e..6452ad2ea 100644 Binary files a/diylc-regression-data/input/v1/png/ea_tremelo_perf.png and b/diylc-regression-data/input/v1/png/ea_tremelo_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ea_tremolo_rog.png b/diylc-regression-data/input/v1/png/ea_tremolo_rog.png index 0d3c04f9e..be81e7990 100644 Binary files a/diylc-regression-data/input/v1/png/ea_tremolo_rog.png and b/diylc-regression-data/input/v1/png/ea_tremolo_rog.png differ diff --git a/diylc-regression-data/input/v1/png/easy_drive_perf.png b/diylc-regression-data/input/v1/png/easy_drive_perf.png index 26db05187..747e827ad 100644 Binary files a/diylc-regression-data/input/v1/png/easy_drive_perf.png and b/diylc-regression-data/input/v1/png/easy_drive_perf.png differ diff --git a/diylc-regression-data/input/v1/png/easy_face_vero.png b/diylc-regression-data/input/v1/png/easy_face_vero.png index 5edce7438..46609b192 100644 Binary files a/diylc-regression-data/input/v1/png/easy_face_vero.png and b/diylc-regression-data/input/v1/png/easy_face_vero.png differ diff --git a/diylc-regression-data/input/v1/png/easyvibe.png b/diylc-regression-data/input/v1/png/easyvibe.png index 9e16e28c4..9987ac5e8 100644 Binary files a/diylc-regression-data/input/v1/png/easyvibe.png and b/diylc-regression-data/input/v1/png/easyvibe.png differ diff --git a/diylc-regression-data/input/v1/png/eh_big_muff_triangle_pcb.png b/diylc-regression-data/input/v1/png/eh_big_muff_triangle_pcb.png index 3efb7ff9b..59ddc47a0 100644 Binary files a/diylc-regression-data/input/v1/png/eh_big_muff_triangle_pcb.png and b/diylc-regression-data/input/v1/png/eh_big_muff_triangle_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/eh_big_muff_triangle_perf.png b/diylc-regression-data/input/v1/png/eh_big_muff_triangle_perf.png index 93375eff2..0b5ac6b78 100644 Binary files a/diylc-regression-data/input/v1/png/eh_big_muff_triangle_perf.png and b/diylc-regression-data/input/v1/png/eh_big_muff_triangle_perf.png differ diff --git a/diylc-regression-data/input/v1/png/eh_hogfoot.png b/diylc-regression-data/input/v1/png/eh_hogfoot.png index 3386f3eda..d3e918f77 100644 Binary files a/diylc-regression-data/input/v1/png/eh_hogfoot.png and b/diylc-regression-data/input/v1/png/eh_hogfoot.png differ diff --git a/diylc-regression-data/input/v1/png/eh_lpb.png b/diylc-regression-data/input/v1/png/eh_lpb.png index 4958ee643..d84732822 100644 Binary files a/diylc-regression-data/input/v1/png/eh_lpb.png and b/diylc-regression-data/input/v1/png/eh_lpb.png differ diff --git a/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png b/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png index 9222b77ce..a4689ccb1 100644 Binary files a/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png and b/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png differ diff --git a/diylc-regression-data/input/v1/png/ehx_linear_power_booster.png b/diylc-regression-data/input/v1/png/ehx_linear_power_booster.png index 07e0422ad..0f5e1b869 100644 Binary files a/diylc-regression-data/input/v1/png/ehx_linear_power_booster.png and b/diylc-regression-data/input/v1/png/ehx_linear_power_booster.png differ diff --git a/diylc-regression-data/input/v1/png/electra_distortion.png b/diylc-regression-data/input/v1/png/electra_distortion.png index 34f38e705..d736c076b 100644 Binary files a/diylc-regression-data/input/v1/png/electra_distortion.png and b/diylc-regression-data/input/v1/png/electra_distortion.png differ diff --git a/diylc-regression-data/input/v1/png/electronic_dazer.png b/diylc-regression-data/input/v1/png/electronic_dazer.png index 886b3c571..cedbb4a92 100644 Binary files a/diylc-regression-data/input/v1/png/electronic_dazer.png and b/diylc-regression-data/input/v1/png/electronic_dazer.png differ diff --git a/diylc-regression-data/input/v1/png/fat_boostered.png b/diylc-regression-data/input/v1/png/fat_boostered.png index a501c6102..d012c0264 100644 Binary files a/diylc-regression-data/input/v1/png/fat_boostered.png and b/diylc-regression-data/input/v1/png/fat_boostered.png differ diff --git a/diylc-regression-data/input/v1/png/fat_boostered_perf.png b/diylc-regression-data/input/v1/png/fat_boostered_perf.png index edba9c89a..f6c5f2fc5 100644 Binary files a/diylc-regression-data/input/v1/png/fat_boostered_perf.png and b/diylc-regression-data/input/v1/png/fat_boostered_perf.png differ diff --git a/diylc-regression-data/input/v1/png/fet_booster_od.png b/diylc-regression-data/input/v1/png/fet_booster_od.png index bd1edd54b..e1b32cbad 100644 Binary files a/diylc-regression-data/input/v1/png/fet_booster_od.png and b/diylc-regression-data/input/v1/png/fet_booster_od.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_drive.png b/diylc-regression-data/input/v1/png/fetzer_drive.png index cbb9ba254..fefc0f11f 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_drive.png and b/diylc-regression-data/input/v1/png/fetzer_drive.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_ruby.png b/diylc-regression-data/input/v1/png/fetzer_ruby.png index ed619e347..f10073cb0 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_ruby.png and b/diylc-regression-data/input/v1/png/fetzer_ruby.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve.png b/diylc-regression-data/input/v1/png/fetzer_valve.png index 85a402fdd..e1a9a4872 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve.png and b/diylc-regression-data/input/v1/png/fetzer_valve.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe.png b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe.png index f86c711a6..7f80f9ad1 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe.png and b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png index 7567204f1..512d6a2bd 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png and b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png index 8c4cb4044..aae02a5b1 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png and b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_pcb.png b/diylc-regression-data/input/v1/png/fetzer_valve_pcb.png index 99383b203..6f5c11e4b 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_pcb.png and b/diylc-regression-data/input/v1/png/fetzer_valve_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_perf.png b/diylc-regression-data/input/v1/png/fetzer_valve_perf.png index 72adf00cc..595afe4e6 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_perf.png and b/diylc-regression-data/input/v1/png/fetzer_valve_perf.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_revisited.png b/diylc-regression-data/input/v1/png/fetzer_valve_revisited.png index 492389507..3376586c5 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_revisited.png and b/diylc-regression-data/input/v1/png/fetzer_valve_revisited.png differ diff --git a/diylc-regression-data/input/v1/png/firefly_preamp.png b/diylc-regression-data/input/v1/png/firefly_preamp.png index 742f67ac0..2b2412fc7 100644 Binary files a/diylc-regression-data/input/v1/png/firefly_preamp.png and b/diylc-regression-data/input/v1/png/firefly_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/firefly_preamp_mods.png b/diylc-regression-data/input/v1/png/firefly_preamp_mods.png index 776c73588..5c116e20a 100644 Binary files a/diylc-regression-data/input/v1/png/firefly_preamp_mods.png and b/diylc-regression-data/input/v1/png/firefly_preamp_mods.png differ diff --git a/diylc-regression-data/input/v1/png/flashing leds.png b/diylc-regression-data/input/v1/png/flashing leds.png index daa5024e7..71ede37fb 100644 Binary files a/diylc-regression-data/input/v1/png/flashing leds.png and b/diylc-regression-data/input/v1/png/flashing leds.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_comp_pcb.png b/diylc-regression-data/input/v1/png/flatline_comp_pcb.png index 07770758b..a3de29613 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_comp_pcb.png and b/diylc-regression-data/input/v1/png/flatline_comp_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_comp_perf.png b/diylc-regression-data/input/v1/png/flatline_comp_perf.png index b4203c553..7f3543979 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_comp_perf.png and b/diylc-regression-data/input/v1/png/flatline_comp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png index 8c8e4d94a..b6989f19c 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png and b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png index b8a765b1b..3be79a982 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png and b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png differ diff --git a/diylc-regression-data/input/v1/png/flexi_clip.png b/diylc-regression-data/input/v1/png/flexi_clip.png index 73f294b75..475b660d2 100644 Binary files a/diylc-regression-data/input/v1/png/flexi_clip.png and b/diylc-regression-data/input/v1/png/flexi_clip.png differ diff --git a/diylc-regression-data/input/v1/png/folk_fuzz.png b/diylc-regression-data/input/v1/png/folk_fuzz.png index e20c990b2..674771ed0 100644 Binary files a/diylc-regression-data/input/v1/png/folk_fuzz.png and b/diylc-regression-data/input/v1/png/folk_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/folk_fuzz_3_5.png b/diylc-regression-data/input/v1/png/folk_fuzz_3_5.png index 8353fa8a8..739333025 100644 Binary files a/diylc-regression-data/input/v1/png/folk_fuzz_3_5.png and b/diylc-regression-data/input/v1/png/folk_fuzz_3_5.png differ diff --git a/diylc-regression-data/input/v1/png/fuzzrite.png b/diylc-regression-data/input/v1/png/fuzzrite.png index 7b7424635..cdefa33a4 100644 Binary files a/diylc-regression-data/input/v1/png/fuzzrite.png and b/diylc-regression-data/input/v1/png/fuzzrite.png differ diff --git a/diylc-regression-data/input/v1/png/g5at_preamp_master.png b/diylc-regression-data/input/v1/png/g5at_preamp_master.png index 3ef353da8..94328e5c6 100644 Binary files a/diylc-regression-data/input/v1/png/g5at_preamp_master.png and b/diylc-regression-data/input/v1/png/g5at_preamp_master.png differ diff --git a/diylc-regression-data/input/v1/png/ga5t_preamp.png b/diylc-regression-data/input/v1/png/ga5t_preamp.png index d1885b1ef..2450ffdf1 100644 Binary files a/diylc-regression-data/input/v1/png/ga5t_preamp.png and b/diylc-regression-data/input/v1/png/ga5t_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/gainy_ruby.png b/diylc-regression-data/input/v1/png/gainy_ruby.png index cc555dac7..09dd306da 100644 Binary files a/diylc-regression-data/input/v1/png/gainy_ruby.png and b/diylc-regression-data/input/v1/png/gainy_ruby.png differ diff --git a/diylc-regression-data/input/v1/png/goldtone.png b/diylc-regression-data/input/v1/png/goldtone.png index 8fd45f3e9..b3374f4f7 100644 Binary files a/diylc-regression-data/input/v1/png/goldtone.png and b/diylc-regression-data/input/v1/png/goldtone.png differ diff --git a/diylc-regression-data/input/v1/png/guitar_buffer.png b/diylc-regression-data/input/v1/png/guitar_buffer.png index 10d9f3b29..c7175bdee 100644 Binary files a/diylc-regression-data/input/v1/png/guitar_buffer.png and b/diylc-regression-data/input/v1/png/guitar_buffer.png differ diff --git a/diylc-regression-data/input/v1/png/gus_overdrive.png b/diylc-regression-data/input/v1/png/gus_overdrive.png index ff3f0a68e..0daeddca8 100644 Binary files a/diylc-regression-data/input/v1/png/gus_overdrive.png and b/diylc-regression-data/input/v1/png/gus_overdrive.png differ diff --git a/diylc-regression-data/input/v1/png/hao_rust_driver.png b/diylc-regression-data/input/v1/png/hao_rust_driver.png index bf21956f3..a7f66a3cc 100644 Binary files a/diylc-regression-data/input/v1/png/hao_rust_driver.png and b/diylc-regression-data/input/v1/png/hao_rust_driver.png differ diff --git a/diylc-regression-data/input/v1/png/harmonic_speculator_pcb.png b/diylc-regression-data/input/v1/png/harmonic_speculator_pcb.png index cca62f871..e7e701d67 100644 Binary files a/diylc-regression-data/input/v1/png/harmonic_speculator_pcb.png and b/diylc-regression-data/input/v1/png/harmonic_speculator_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/harmonic_speculator_perf.png b/diylc-regression-data/input/v1/png/harmonic_speculator_perf.png index 70f2adfbe..70c003571 100644 Binary files a/diylc-regression-data/input/v1/png/harmonic_speculator_perf.png and b/diylc-regression-data/input/v1/png/harmonic_speculator_perf.png differ diff --git a/diylc-regression-data/input/v1/png/hermida_zen_drive.png b/diylc-regression-data/input/v1/png/hermida_zen_drive.png index c7586dd87..8c9cb3b66 100644 Binary files a/diylc-regression-data/input/v1/png/hermida_zen_drive.png and b/diylc-regression-data/input/v1/png/hermida_zen_drive.png differ diff --git a/diylc-regression-data/input/v1/png/hot_harmonics.png b/diylc-regression-data/input/v1/png/hot_harmonics.png index c66c29fdb..e962a99b7 100644 Binary files a/diylc-regression-data/input/v1/png/hot_harmonics.png and b/diylc-regression-data/input/v1/png/hot_harmonics.png differ diff --git a/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png b/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png index bc1b2867c..2d0853514 100644 Binary files a/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png and b/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png differ diff --git a/diylc-regression-data/input/v1/png/ic_buffer.png b/diylc-regression-data/input/v1/png/ic_buffer.png index 415190a4f..9ca3d7bb1 100644 Binary files a/diylc-regression-data/input/v1/png/ic_buffer.png and b/diylc-regression-data/input/v1/png/ic_buffer.png differ diff --git a/diylc-regression-data/input/v1/png/j201_preamp.png b/diylc-regression-data/input/v1/png/j201_preamp.png index b73f165a4..ea4bfb7cf 100644 Binary files a/diylc-regression-data/input/v1/png/j201_preamp.png and b/diylc-regression-data/input/v1/png/j201_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/javaboost.png b/diylc-regression-data/input/v1/png/javaboost.png index 7e97b2d7c..40572e6ea 100644 Binary files a/diylc-regression-data/input/v1/png/javaboost.png and b/diylc-regression-data/input/v1/png/javaboost.png differ diff --git a/diylc-regression-data/input/v1/png/jawari.png b/diylc-regression-data/input/v1/png/jawari.png index cd866ceb3..cba11b520 100644 Binary files a/diylc-regression-data/input/v1/png/jawari.png and b/diylc-regression-data/input/v1/png/jawari.png differ diff --git a/diylc-regression-data/input/v1/png/jawari_sitar.png b/diylc-regression-data/input/v1/png/jawari_sitar.png index 44013816a..647a9072a 100644 Binary files a/diylc-regression-data/input/v1/png/jawari_sitar.png and b/diylc-regression-data/input/v1/png/jawari_sitar.png differ diff --git a/diylc-regression-data/input/v1/png/jcm800.png b/diylc-regression-data/input/v1/png/jcm800.png index 2604f4ec1..f5278208c 100644 Binary files a/diylc-regression-data/input/v1/png/jcm800.png and b/diylc-regression-data/input/v1/png/jcm800.png differ diff --git a/diylc-regression-data/input/v1/png/jd_obsidian.png b/diylc-regression-data/input/v1/png/jd_obsidian.png index 359014ab2..74a654c10 100644 Binary files a/diylc-regression-data/input/v1/png/jd_obsidian.png and b/diylc-regression-data/input/v1/png/jd_obsidian.png differ diff --git a/diylc-regression-data/input/v1/png/jdha_pcb.png b/diylc-regression-data/input/v1/png/jdha_pcb.png index 1419d2b7f..e93a7fad3 100644 Binary files a/diylc-regression-data/input/v1/png/jdha_pcb.png and b/diylc-regression-data/input/v1/png/jdha_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/jdha_perf.png b/diylc-regression-data/input/v1/png/jdha_perf.png index 7a6ca1505..a8ae360c1 100644 Binary files a/diylc-regression-data/input/v1/png/jdha_perf.png and b/diylc-regression-data/input/v1/png/jdha_perf.png differ diff --git a/diylc-regression-data/input/v1/png/jdha_vero.png b/diylc-regression-data/input/v1/png/jdha_vero.png index 67103ef14..ce99805ae 100644 Binary files a/diylc-regression-data/input/v1/png/jdha_vero.png and b/diylc-regression-data/input/v1/png/jdha_vero.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png b/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png index 7a271299e..9f9bcb988 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png and b/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_perf.png b/diylc-regression-data/input/v1/png/jfet_matcher_perf.png index 63841526f..fe0ad4b6f 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_perf.png and b/diylc-regression-data/input/v1/png/jfet_matcher_perf.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_vero.png b/diylc-regression-data/input/v1/png/jfet_matcher_vero.png index 5a80a4242..cccd00269 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_vero.png and b/diylc-regression-data/input/v1/png/jfet_matcher_vero.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_vulcan.png b/diylc-regression-data/input/v1/png/jfet_vulcan.png index 34d2bf567..a8247347f 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_vulcan.png and b/diylc-regression-data/input/v1/png/jfet_vulcan.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_vulcan_pcb.png b/diylc-regression-data/input/v1/png/jfet_vulcan_pcb.png index c73d61cb0..77a2c07a2 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_vulcan_pcb.png and b/diylc-regression-data/input/v1/png/jfet_vulcan_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/joe's_easydrive.png b/diylc-regression-data/input/v1/png/joe's_easydrive.png index 3f9e40af3..543f34184 100644 Binary files a/diylc-regression-data/input/v1/png/joe's_easydrive.png and b/diylc-regression-data/input/v1/png/joe's_easydrive.png differ diff --git a/diylc-regression-data/input/v1/png/joes_simple_overdrive.png b/diylc-regression-data/input/v1/png/joes_simple_overdrive.png index 8fead8178..b86e0f63f 100644 Binary files a/diylc-regression-data/input/v1/png/joes_simple_overdrive.png and b/diylc-regression-data/input/v1/png/joes_simple_overdrive.png differ diff --git a/diylc-regression-data/input/v1/png/joes_simple_sim.png b/diylc-regression-data/input/v1/png/joes_simple_sim.png index f3ac7b61a..7cef27d31 100644 Binary files a/diylc-regression-data/input/v1/png/joes_simple_sim.png and b/diylc-regression-data/input/v1/png/joes_simple_sim.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone.png b/diylc-regression-data/input/v1/png/jordan_bosstone.png index d001fc3ea..eb87a720e 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone.png and b/diylc-regression-data/input/v1/png/jordan_bosstone.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone_modified.png b/diylc-regression-data/input/v1/png/jordan_bosstone_modified.png index 8235e9a8b..cca0b5399 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone_modified.png and b/diylc-regression-data/input/v1/png/jordan_bosstone_modified.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone_pcb.png b/diylc-regression-data/input/v1/png/jordan_bosstone_pcb.png index 403c78d7f..ef6f07e37 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone_pcb.png and b/diylc-regression-data/input/v1/png/jordan_bosstone_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone_pcb2.png b/diylc-regression-data/input/v1/png/jordan_bosstone_pcb2.png index ca32d4245..af2e08276 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone_pcb2.png and b/diylc-regression-data/input/v1/png/jordan_bosstone_pcb2.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone_perf.png b/diylc-regression-data/input/v1/png/jordan_bosstone_perf.png index 6ffe2f79f..cc368332c 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone_perf.png and b/diylc-regression-data/input/v1/png/jordan_bosstone_perf.png differ diff --git a/diylc-regression-data/input/v1/png/jordan_bosstone_perf2.png b/diylc-regression-data/input/v1/png/jordan_bosstone_perf2.png index 49692325b..e55ab36e9 100644 Binary files a/diylc-regression-data/input/v1/png/jordan_bosstone_perf2.png and b/diylc-regression-data/input/v1/png/jordan_bosstone_perf2.png differ diff --git a/diylc-regression-data/input/v1/png/klon_centaur.png b/diylc-regression-data/input/v1/png/klon_centaur.png index 3757b632e..6b028a033 100644 Binary files a/diylc-regression-data/input/v1/png/klon_centaur.png and b/diylc-regression-data/input/v1/png/klon_centaur.png differ diff --git a/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png b/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png index 099e20542..43db47fb9 100644 Binary files a/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png and b/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png differ diff --git a/diylc-regression-data/input/v1/png/la_light.png b/diylc-regression-data/input/v1/png/la_light.png index 94bb760e4..723bc2b06 100644 Binary files a/diylc-regression-data/input/v1/png/la_light.png and b/diylc-regression-data/input/v1/png/la_light.png differ diff --git a/diylc-regression-data/input/v1/png/liquid_sunshine.png b/diylc-regression-data/input/v1/png/liquid_sunshine.png index 24313300e..2c5b19610 100644 Binary files a/diylc-regression-data/input/v1/png/liquid_sunshine.png and b/diylc-regression-data/input/v1/png/liquid_sunshine.png differ diff --git a/diylc-regression-data/input/v1/png/little_gem.png b/diylc-regression-data/input/v1/png/little_gem.png index 153915501..cea1b3cf3 100644 Binary files a/diylc-regression-data/input/v1/png/little_gem.png and b/diylc-regression-data/input/v1/png/little_gem.png differ diff --git a/diylc-regression-data/input/v1/png/little_gem_mk2.png b/diylc-regression-data/input/v1/png/little_gem_mk2.png index d3e1aa5d3..96e29ff9d 100644 Binary files a/diylc-regression-data/input/v1/png/little_gem_mk2.png and b/diylc-regression-data/input/v1/png/little_gem_mk2.png differ diff --git a/diylc-regression-data/input/v1/png/lm741_dist.png b/diylc-regression-data/input/v1/png/lm741_dist.png index e0bc59425..6c9743343 100644 Binary files a/diylc-regression-data/input/v1/png/lm741_dist.png and b/diylc-regression-data/input/v1/png/lm741_dist.png differ diff --git a/diylc-regression-data/input/v1/png/low_ride_bass.png b/diylc-regression-data/input/v1/png/low_ride_bass.png index f3a36887f..6d48ad37e 100644 Binary files a/diylc-regression-data/input/v1/png/low_ride_bass.png and b/diylc-regression-data/input/v1/png/low_ride_bass.png differ diff --git a/diylc-regression-data/input/v1/png/lpb_booster.png b/diylc-regression-data/input/v1/png/lpb_booster.png index 94e047495..3bb1aeca4 100644 Binary files a/diylc-regression-data/input/v1/png/lpb_booster.png and b/diylc-regression-data/input/v1/png/lpb_booster.png differ diff --git a/diylc-regression-data/input/v1/png/lxh2_cab_sim.png b/diylc-regression-data/input/v1/png/lxh2_cab_sim.png index 19258b515..6963c068c 100644 Binary files a/diylc-regression-data/input/v1/png/lxh2_cab_sim.png and b/diylc-regression-data/input/v1/png/lxh2_cab_sim.png differ diff --git a/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png b/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png index 1f78f70be..5a10ceb04 100644 Binary files a/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png and b/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png differ diff --git a/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png b/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png index 24d272faa..45341046f 100644 Binary files a/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png and b/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png differ diff --git a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png index fa89d4cec..163bad3c1 100644 Binary files a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png and b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png differ diff --git a/diylc-regression-data/input/v1/png/micro_booster.png b/diylc-regression-data/input/v1/png/micro_booster.png index e8f7f9084..cd75670b0 100644 Binary files a/diylc-regression-data/input/v1/png/micro_booster.png and b/diylc-regression-data/input/v1/png/micro_booster.png differ diff --git a/diylc-regression-data/input/v1/png/millenium2_bypass.png b/diylc-regression-data/input/v1/png/millenium2_bypass.png index 54ae921a0..41c9cd872 100644 Binary files a/diylc-regression-data/input/v1/png/millenium2_bypass.png and b/diylc-regression-data/input/v1/png/millenium2_bypass.png differ diff --git a/diylc-regression-data/input/v1/png/millenium_bypass.png b/diylc-regression-data/input/v1/png/millenium_bypass.png index f0c6e949e..163d5e2ac 100644 Binary files a/diylc-regression-data/input/v1/png/millenium_bypass.png and b/diylc-regression-data/input/v1/png/millenium_bypass.png differ diff --git a/diylc-regression-data/input/v1/png/millenium_bypass_2.png b/diylc-regression-data/input/v1/png/millenium_bypass_2.png index 4cc610aa8..0d96acd4c 100644 Binary files a/diylc-regression-data/input/v1/png/millenium_bypass_2.png and b/diylc-regression-data/input/v1/png/millenium_bypass_2.png differ diff --git a/diylc-regression-data/input/v1/png/mockman.png b/diylc-regression-data/input/v1/png/mockman.png index e329cb424..59f371552 100644 Binary files a/diylc-regression-data/input/v1/png/mockman.png and b/diylc-regression-data/input/v1/png/mockman.png differ diff --git a/diylc-regression-data/input/v1/png/modified_mosfet_booster_pcb.png b/diylc-regression-data/input/v1/png/modified_mosfet_booster_pcb.png index d6a5d2428..cb927535f 100644 Binary files a/diylc-regression-data/input/v1/png/modified_mosfet_booster_pcb.png and b/diylc-regression-data/input/v1/png/modified_mosfet_booster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/modified_mosfet_booster_perf.png b/diylc-regression-data/input/v1/png/modified_mosfet_booster_perf.png index f8c72bbd3..b7e709a5c 100644 Binary files a/diylc-regression-data/input/v1/png/modified_mosfet_booster_perf.png and b/diylc-regression-data/input/v1/png/modified_mosfet_booster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/morula.png b/diylc-regression-data/input/v1/png/morula.png index ae39ddc35..7180340fe 100644 Binary files a/diylc-regression-data/input/v1/png/morula.png and b/diylc-regression-data/input/v1/png/morula.png differ diff --git a/diylc-regression-data/input/v1/png/mosrite_fuzzrite_pcb.png b/diylc-regression-data/input/v1/png/mosrite_fuzzrite_pcb.png index e85914731..dc69db026 100644 Binary files a/diylc-regression-data/input/v1/png/mosrite_fuzzrite_pcb.png and b/diylc-regression-data/input/v1/png/mosrite_fuzzrite_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/mosrite_fuzzrite_perf.png b/diylc-regression-data/input/v1/png/mosrite_fuzzrite_perf.png index 448b78846..059a215b3 100644 Binary files a/diylc-regression-data/input/v1/png/mosrite_fuzzrite_perf.png and b/diylc-regression-data/input/v1/png/mosrite_fuzzrite_perf.png differ diff --git a/diylc-regression-data/input/v1/png/mutron_micro_v.png b/diylc-regression-data/input/v1/png/mutron_micro_v.png index e884cc603..121f39991 100644 Binary files a/diylc-regression-data/input/v1/png/mutron_micro_v.png and b/diylc-regression-data/input/v1/png/mutron_micro_v.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper.png b/diylc-regression-data/input/v1/png/new_clipper.png index f5071f781..5db76ca06 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper.png and b/diylc-regression-data/input/v1/png/new_clipper.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper_pcb.png b/diylc-regression-data/input/v1/png/new_clipper_pcb.png index a95dff304..765eee6e5 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper_pcb.png and b/diylc-regression-data/input/v1/png/new_clipper_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper_perf.png b/diylc-regression-data/input/v1/png/new_clipper_perf.png index fa030d989..7ec4a0370 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper_perf.png and b/diylc-regression-data/input/v1/png/new_clipper_perf.png differ diff --git a/diylc-regression-data/input/v1/png/nvn_tone_dog_pcb.png b/diylc-regression-data/input/v1/png/nvn_tone_dog_pcb.png index c40696ee5..84c4ec66f 100644 Binary files a/diylc-regression-data/input/v1/png/nvn_tone_dog_pcb.png and b/diylc-regression-data/input/v1/png/nvn_tone_dog_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/nvn_tone_dog_perf.png b/diylc-regression-data/input/v1/png/nvn_tone_dog_perf.png index bfd1b8807..1e135815e 100644 Binary files a/diylc-regression-data/input/v1/png/nvn_tone_dog_perf.png and b/diylc-regression-data/input/v1/png/nvn_tone_dog_perf.png differ diff --git a/diylc-regression-data/input/v1/png/octobooster.png b/diylc-regression-data/input/v1/png/octobooster.png index bab201f18..a5773e7b2 100644 Binary files a/diylc-regression-data/input/v1/png/octobooster.png and b/diylc-regression-data/input/v1/png/octobooster.png differ diff --git a/diylc-regression-data/input/v1/png/octup.png b/diylc-regression-data/input/v1/png/octup.png index 8af087ef1..43c456d8d 100644 Binary files a/diylc-regression-data/input/v1/png/octup.png and b/diylc-regression-data/input/v1/png/octup.png differ diff --git a/diylc-regression-data/input/v1/png/od_250.png b/diylc-regression-data/input/v1/png/od_250.png index 882f0264a..817af6ac1 100644 Binary files a/diylc-regression-data/input/v1/png/od_250.png and b/diylc-regression-data/input/v1/png/od_250.png differ diff --git a/diylc-regression-data/input/v1/png/old_school_fuzz.png b/diylc-regression-data/input/v1/png/old_school_fuzz.png index 10bf326d3..2d3231abc 100644 Binary files a/diylc-regression-data/input/v1/png/old_school_fuzz.png and b/diylc-regression-data/input/v1/png/old_school_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/one_knob_fat_fuzz_vero.png b/diylc-regression-data/input/v1/png/one_knob_fat_fuzz_vero.png index eaff8bcea..2b875b483 100644 Binary files a/diylc-regression-data/input/v1/png/one_knob_fat_fuzz_vero.png and b/diylc-regression-data/input/v1/png/one_knob_fat_fuzz_vero.png differ diff --git a/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png b/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png index 3e22b8518..8db49478c 100644 Binary files a/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png and b/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/orange_squeezer_perf.png b/diylc-regression-data/input/v1/png/orange_squeezer_perf.png index 0ac21ac74..7b02b2c09 100644 Binary files a/diylc-regression-data/input/v1/png/orange_squeezer_perf.png and b/diylc-regression-data/input/v1/png/orange_squeezer_perf.png differ diff --git a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz.png b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz.png index 77d95befb..a9259fc88 100644 Binary files a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz.png and b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_pcb.png b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_pcb.png index 6eca1cb87..8adaa90cb 100644 Binary files a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_pcb.png and b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_perf.png b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_perf.png index 77d95befb..a9259fc88 100644 Binary files a/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_perf.png and b/diylc-regression-data/input/v1/png/orange_sunshine_fuzz_perf.png differ diff --git a/diylc-regression-data/input/v1/png/orange_treble_bass_booster.png b/diylc-regression-data/input/v1/png/orange_treble_bass_booster.png index 06028bf91..b331782a2 100644 Binary files a/diylc-regression-data/input/v1/png/orange_treble_bass_booster.png and b/diylc-regression-data/input/v1/png/orange_treble_bass_booster.png differ diff --git a/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png b/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png index c75aec9d5..236950591 100644 Binary files a/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png and b/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png differ diff --git a/diylc-regression-data/input/v1/png/para-q.png b/diylc-regression-data/input/v1/png/para-q.png index 93ff0ac7a..a5b2e29dc 100644 Binary files a/diylc-regression-data/input/v1/png/para-q.png and b/diylc-regression-data/input/v1/png/para-q.png differ diff --git a/diylc-regression-data/input/v1/png/passive_tone_stack.png b/diylc-regression-data/input/v1/png/passive_tone_stack.png index d4b43a2f6..03d787a24 100644 Binary files a/diylc-regression-data/input/v1/png/passive_tone_stack.png and b/diylc-regression-data/input/v1/png/passive_tone_stack.png differ diff --git a/diylc-regression-data/input/v1/png/peppermill.png b/diylc-regression-data/input/v1/png/peppermill.png index ee9cdfdeb..720c4948b 100644 Binary files a/diylc-regression-data/input/v1/png/peppermill.png and b/diylc-regression-data/input/v1/png/peppermill.png differ diff --git a/diylc-regression-data/input/v1/png/phuncgnosis.png b/diylc-regression-data/input/v1/png/phuncgnosis.png index 44d644a07..d01567350 100644 Binary files a/diylc-regression-data/input/v1/png/phuncgnosis.png and b/diylc-regression-data/input/v1/png/phuncgnosis.png differ diff --git a/diylc-regression-data/input/v1/png/piezo_preamp.png b/diylc-regression-data/input/v1/png/piezo_preamp.png index f177e3f5d..9fa6b41a6 100644 Binary files a/diylc-regression-data/input/v1/png/piezo_preamp.png and b/diylc-regression-data/input/v1/png/piezo_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/piezo_preamp1.png b/diylc-regression-data/input/v1/png/piezo_preamp1.png index 9e751e0d4..53a147571 100644 Binary files a/diylc-regression-data/input/v1/png/piezo_preamp1.png and b/diylc-regression-data/input/v1/png/piezo_preamp1.png differ diff --git a/diylc-regression-data/input/v1/png/pig_booster.png b/diylc-regression-data/input/v1/png/pig_booster.png index 0e5198e45..90fe2cf7d 100644 Binary files a/diylc-regression-data/input/v1/png/pig_booster.png and b/diylc-regression-data/input/v1/png/pig_booster.png differ diff --git a/diylc-regression-data/input/v1/png/polarity_protection.png b/diylc-regression-data/input/v1/png/polarity_protection.png index 702096abf..785cceae3 100644 Binary files a/diylc-regression-data/input/v1/png/polarity_protection.png and b/diylc-regression-data/input/v1/png/polarity_protection.png differ diff --git a/diylc-regression-data/input/v1/png/power_supply.png b/diylc-regression-data/input/v1/png/power_supply.png index fe5b05084..ed8de0fe1 100644 Binary files a/diylc-regression-data/input/v1/png/power_supply.png and b/diylc-regression-data/input/v1/png/power_supply.png differ diff --git a/diylc-regression-data/input/v1/png/puzzle87_comp.png b/diylc-regression-data/input/v1/png/puzzle87_comp.png index d4f51b296..102fc31de 100644 Binary files a/diylc-regression-data/input/v1/png/puzzle87_comp.png and b/diylc-regression-data/input/v1/png/puzzle87_comp.png differ diff --git a/diylc-regression-data/input/v1/png/rambler.png b/diylc-regression-data/input/v1/png/rambler.png index b7d8f4b0d..2757ccd93 100644 Binary files a/diylc-regression-data/input/v1/png/rambler.png and b/diylc-regression-data/input/v1/png/rambler.png differ diff --git a/diylc-regression-data/input/v1/png/range_pig_pcb.png b/diylc-regression-data/input/v1/png/range_pig_pcb.png index a30733e88..7b7e23b9d 100644 Binary files a/diylc-regression-data/input/v1/png/range_pig_pcb.png and b/diylc-regression-data/input/v1/png/range_pig_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/range_pig_perf.png b/diylc-regression-data/input/v1/png/range_pig_perf.png index 1ef8c28eb..e5ac9d0dd 100644 Binary files a/diylc-regression-data/input/v1/png/range_pig_perf.png and b/diylc-regression-data/input/v1/png/range_pig_perf.png differ diff --git a/diylc-regression-data/input/v1/png/rangemaster.png b/diylc-regression-data/input/v1/png/rangemaster.png index 5151bbe6c..c84f3860e 100644 Binary files a/diylc-regression-data/input/v1/png/rangemaster.png and b/diylc-regression-data/input/v1/png/rangemaster.png differ diff --git a/diylc-regression-data/input/v1/png/rangemaster_npn_modified.png b/diylc-regression-data/input/v1/png/rangemaster_npn_modified.png index 269a79a90..c5d96e4c6 100644 Binary files a/diylc-regression-data/input/v1/png/rangemaster_npn_modified.png and b/diylc-regression-data/input/v1/png/rangemaster_npn_modified.png differ diff --git a/diylc-regression-data/input/v1/png/rebote_25.png b/diylc-regression-data/input/v1/png/rebote_25.png index e6587e5a7..759e453ac 100644 Binary files a/diylc-regression-data/input/v1/png/rebote_25.png and b/diylc-regression-data/input/v1/png/rebote_25.png differ diff --git a/diylc-regression-data/input/v1/png/red_llama_pcb.png b/diylc-regression-data/input/v1/png/red_llama_pcb.png index 540c206d4..29f7db7f2 100644 Binary files a/diylc-regression-data/input/v1/png/red_llama_pcb.png and b/diylc-regression-data/input/v1/png/red_llama_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/red_llama_perf.png b/diylc-regression-data/input/v1/png/red_llama_perf.png index 2f5638821..8093c51e8 100644 Binary files a/diylc-regression-data/input/v1/png/red_llama_perf.png and b/diylc-regression-data/input/v1/png/red_llama_perf.png differ diff --git a/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png b/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png index dcad1d518..9e356fbb0 100644 Binary files a/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png and b/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png differ diff --git a/diylc-regression-data/input/v1/png/roger_mayer_octavia.png b/diylc-regression-data/input/v1/png/roger_mayer_octavia.png index a8eb039c2..cfcdd1ca7 100644 Binary files a/diylc-regression-data/input/v1/png/roger_mayer_octavia.png and b/diylc-regression-data/input/v1/png/roger_mayer_octavia.png differ diff --git a/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png b/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png index 990d46dd1..84ee474e5 100644 Binary files a/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png and b/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png differ diff --git a/diylc-regression-data/input/v1/png/ross_compressor_pcb.png b/diylc-regression-data/input/v1/png/ross_compressor_pcb.png index e4af10eb9..479596577 100644 Binary files a/diylc-regression-data/input/v1/png/ross_compressor_pcb.png and b/diylc-regression-data/input/v1/png/ross_compressor_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_compressor_perf.png b/diylc-regression-data/input/v1/png/ross_compressor_perf.png index ae45eefe3..c569deb82 100644 Binary files a/diylc-regression-data/input/v1/png/ross_compressor_perf.png and b/diylc-regression-data/input/v1/png/ross_compressor_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_pcb.png b/diylc-regression-data/input/v1/png/ross_distortion_pcb.png index 0a70f0350..522331d63 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_pcb.png and b/diylc-regression-data/input/v1/png/ross_distortion_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_perf.png b/diylc-regression-data/input/v1/png/ross_distortion_perf.png index 8deb91373..b2bbf8393 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_perf.png and b/diylc-regression-data/input/v1/png/ross_distortion_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png b/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png index 740bba8cf..3e412ef84 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png and b/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png b/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png index b91645047..3f81f1b92 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png and b/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ruby.png b/diylc-regression-data/input/v1/png/ruby.png index f6fda9190..997ceac38 100644 Binary files a/diylc-regression-data/input/v1/png/ruby.png and b/diylc-regression-data/input/v1/png/ruby.png differ diff --git a/diylc-regression-data/input/v1/png/ruby1.png b/diylc-regression-data/input/v1/png/ruby1.png index 76402855e..b58a803d7 100644 Binary files a/diylc-regression-data/input/v1/png/ruby1.png and b/diylc-regression-data/input/v1/png/ruby1.png differ diff --git a/diylc-regression-data/input/v1/png/ruby2.png b/diylc-regression-data/input/v1/png/ruby2.png index 712d8d299..e4cc13667 100644 Binary files a/diylc-regression-data/input/v1/png/ruby2.png and b/diylc-regression-data/input/v1/png/ruby2.png differ diff --git a/diylc-regression-data/input/v1/png/ruby3.png b/diylc-regression-data/input/v1/png/ruby3.png index 8ef5ce7e4..09174a48e 100644 Binary files a/diylc-regression-data/input/v1/png/ruby3.png and b/diylc-regression-data/input/v1/png/ruby3.png differ diff --git a/diylc-regression-data/input/v1/png/ruby_amp.png b/diylc-regression-data/input/v1/png/ruby_amp.png index 514da8d80..9af7097c2 100644 Binary files a/diylc-regression-data/input/v1/png/ruby_amp.png and b/diylc-regression-data/input/v1/png/ruby_amp.png differ diff --git a/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png b/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png index a8f30bb67..9567e11a7 100644 Binary files a/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png and b/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png b/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png index 09c02cc9c..b94a67fc0 100644 Binary files a/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png and b/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png b/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png index 5dd955724..139945fcf 100644 Binary files a/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png and b/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png differ diff --git a/diylc-regression-data/input/v1/png/screaming_bird.png b/diylc-regression-data/input/v1/png/screaming_bird.png index 17edbd14f..fd9708bcd 100644 Binary files a/diylc-regression-data/input/v1/png/screaming_bird.png and b/diylc-regression-data/input/v1/png/screaming_bird.png differ diff --git a/diylc-regression-data/input/v1/png/shaka_hv.png b/diylc-regression-data/input/v1/png/shaka_hv.png index 24ec72675..c72ecb70b 100644 Binary files a/diylc-regression-data/input/v1/png/shaka_hv.png and b/diylc-regression-data/input/v1/png/shaka_hv.png differ diff --git a/diylc-regression-data/input/v1/png/shin-ei_fy-2_fuzzmaster_with_scoop_mod.png b/diylc-regression-data/input/v1/png/shin-ei_fy-2_fuzzmaster_with_scoop_mod.png index 47ca3c157..88ed6f00e 100644 Binary files a/diylc-regression-data/input/v1/png/shin-ei_fy-2_fuzzmaster_with_scoop_mod.png and b/diylc-regression-data/input/v1/png/shin-ei_fy-2_fuzzmaster_with_scoop_mod.png differ diff --git a/diylc-regression-data/input/v1/png/signal_gen.png b/diylc-regression-data/input/v1/png/signal_gen.png index 0018cbdd9..164037768 100644 Binary files a/diylc-regression-data/input/v1/png/signal_gen.png and b/diylc-regression-data/input/v1/png/signal_gen.png differ diff --git a/diylc-regression-data/input/v1/png/signal_tracer_pcb.png b/diylc-regression-data/input/v1/png/signal_tracer_pcb.png index 1fd73a4d0..bf544aa36 100644 Binary files a/diylc-regression-data/input/v1/png/signal_tracer_pcb.png and b/diylc-regression-data/input/v1/png/signal_tracer_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/signal_tracer_vero.png b/diylc-regression-data/input/v1/png/signal_tracer_vero.png index bd3fd8373..6a22971f1 100644 Binary files a/diylc-regression-data/input/v1/png/signal_tracer_vero.png and b/diylc-regression-data/input/v1/png/signal_tracer_vero.png differ diff --git a/diylc-regression-data/input/v1/png/silicon_70s_fuzz.png b/diylc-regression-data/input/v1/png/silicon_70s_fuzz.png index 26ad53e7a..e4977b95a 100644 Binary files a/diylc-regression-data/input/v1/png/silicon_70s_fuzz.png and b/diylc-regression-data/input/v1/png/silicon_70s_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/silicon_70s_fuzz_pcb.png b/diylc-regression-data/input/v1/png/silicon_70s_fuzz_pcb.png index bf1e0ed3a..ec430629d 100644 Binary files a/diylc-regression-data/input/v1/png/silicon_70s_fuzz_pcb.png and b/diylc-regression-data/input/v1/png/silicon_70s_fuzz_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/siliface2.png b/diylc-regression-data/input/v1/png/siliface2.png index b4f0b167c..da009bf3f 100644 Binary files a/diylc-regression-data/input/v1/png/siliface2.png and b/diylc-regression-data/input/v1/png/siliface2.png differ diff --git a/diylc-regression-data/input/v1/png/simple_3_band_eq.png b/diylc-regression-data/input/v1/png/simple_3_band_eq.png index 8c07ee3c5..51dd3bd00 100644 Binary files a/diylc-regression-data/input/v1/png/simple_3_band_eq.png and b/diylc-regression-data/input/v1/png/simple_3_band_eq.png differ diff --git a/diylc-regression-data/input/v1/png/slacktrem.png b/diylc-regression-data/input/v1/png/slacktrem.png index 89a22dd3d..d927a65c6 100644 Binary files a/diylc-regression-data/input/v1/png/slacktrem.png and b/diylc-regression-data/input/v1/png/slacktrem.png differ diff --git a/diylc-regression-data/input/v1/png/smooth_drive.png b/diylc-regression-data/input/v1/png/smooth_drive.png index 5088cee25..44272a698 100644 Binary files a/diylc-regression-data/input/v1/png/smooth_drive.png and b/diylc-regression-data/input/v1/png/smooth_drive.png differ diff --git a/diylc-regression-data/input/v1/png/snakebite_boost_pcb.png b/diylc-regression-data/input/v1/png/snakebite_boost_pcb.png index 2034fc97e..45f54bb0e 100644 Binary files a/diylc-regression-data/input/v1/png/snakebite_boost_pcb.png and b/diylc-regression-data/input/v1/png/snakebite_boost_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/snakebite_boost_perf.png b/diylc-regression-data/input/v1/png/snakebite_boost_perf.png index 7d2ff8712..529e5b1b3 100644 Binary files a/diylc-regression-data/input/v1/png/snakebite_boost_perf.png and b/diylc-regression-data/input/v1/png/snakebite_boost_perf.png differ diff --git a/diylc-regression-data/input/v1/png/so_simple_comp_v1_pcb.png b/diylc-regression-data/input/v1/png/so_simple_comp_v1_pcb.png index 7e51d4266..4f16ea3c1 100644 Binary files a/diylc-regression-data/input/v1/png/so_simple_comp_v1_pcb.png and b/diylc-regression-data/input/v1/png/so_simple_comp_v1_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/so_simple_comp_v1_perf.png b/diylc-regression-data/input/v1/png/so_simple_comp_v1_perf.png index db1adb7c3..8ffd66b98 100644 Binary files a/diylc-regression-data/input/v1/png/so_simple_comp_v1_perf.png and b/diylc-regression-data/input/v1/png/so_simple_comp_v1_perf.png differ diff --git a/diylc-regression-data/input/v1/png/so_simple_comp_v2_pcb.png b/diylc-regression-data/input/v1/png/so_simple_comp_v2_pcb.png index 5c8815509..031a0c31d 100644 Binary files a/diylc-regression-data/input/v1/png/so_simple_comp_v2_pcb.png and b/diylc-regression-data/input/v1/png/so_simple_comp_v2_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/so_simple_comp_v2_perf.png b/diylc-regression-data/input/v1/png/so_simple_comp_v2_perf.png index d0f81d0dc..df5793d88 100644 Binary files a/diylc-regression-data/input/v1/png/so_simple_comp_v2_perf.png and b/diylc-regression-data/input/v1/png/so_simple_comp_v2_perf.png differ diff --git a/diylc-regression-data/input/v1/png/soapdodger.png b/diylc-regression-data/input/v1/png/soapdodger.png index 6b5408fce..3bbfbaf91 100644 Binary files a/diylc-regression-data/input/v1/png/soapdodger.png and b/diylc-regression-data/input/v1/png/soapdodger.png differ diff --git a/diylc-regression-data/input/v1/png/soapdodger2.png b/diylc-regression-data/input/v1/png/soapdodger2.png index 35f98e432..0b5802092 100644 Binary files a/diylc-regression-data/input/v1/png/soapdodger2.png and b/diylc-regression-data/input/v1/png/soapdodger2.png differ diff --git a/diylc-regression-data/input/v1/png/solar_garden_lamp.png b/diylc-regression-data/input/v1/png/solar_garden_lamp.png index b047571a8..b3fd45a46 100644 Binary files a/diylc-regression-data/input/v1/png/solar_garden_lamp.png and b/diylc-regression-data/input/v1/png/solar_garden_lamp.png differ diff --git a/diylc-regression-data/input/v1/png/sonic_disto.png b/diylc-regression-data/input/v1/png/sonic_disto.png index 5aaeccaad..29bbd5b2e 100644 Binary files a/diylc-regression-data/input/v1/png/sonic_disto.png and b/diylc-regression-data/input/v1/png/sonic_disto.png differ diff --git a/diylc-regression-data/input/v1/png/soul_preacher_pcb.png b/diylc-regression-data/input/v1/png/soul_preacher_pcb.png index 388ede440..3f393a2b4 100644 Binary files a/diylc-regression-data/input/v1/png/soul_preacher_pcb.png and b/diylc-regression-data/input/v1/png/soul_preacher_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/soul_preacher_perf.png b/diylc-regression-data/input/v1/png/soul_preacher_perf.png index 0f212d789..e8cde130b 100644 Binary files a/diylc-regression-data/input/v1/png/soul_preacher_perf.png and b/diylc-regression-data/input/v1/png/soul_preacher_perf.png differ diff --git a/diylc-regression-data/input/v1/png/sparkle_boost.png b/diylc-regression-data/input/v1/png/sparkle_boost.png index 61e482841..ed5c8d5fd 100644 Binary files a/diylc-regression-data/input/v1/png/sparkle_boost.png and b/diylc-regression-data/input/v1/png/sparkle_boost.png differ diff --git a/diylc-regression-data/input/v1/png/sparkle_boost_j201.png b/diylc-regression-data/input/v1/png/sparkle_boost_j201.png index 250309cb9..7508e785b 100644 Binary files a/diylc-regression-data/input/v1/png/sparkle_boost_j201.png and b/diylc-regression-data/input/v1/png/sparkle_boost_j201.png differ diff --git a/diylc-regression-data/input/v1/png/sparkle_boost_j201_pcb.png b/diylc-regression-data/input/v1/png/sparkle_boost_j201_pcb.png index 250309cb9..7508e785b 100644 Binary files a/diylc-regression-data/input/v1/png/sparkle_boost_j201_pcb.png and b/diylc-regression-data/input/v1/png/sparkle_boost_j201_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/sparkle_boost_pcb.png b/diylc-regression-data/input/v1/png/sparkle_boost_pcb.png index b7b7eb216..44f5d1ce7 100644 Binary files a/diylc-regression-data/input/v1/png/sparkle_boost_pcb.png and b/diylc-regression-data/input/v1/png/sparkle_boost_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/sparkle_boost_perf.png b/diylc-regression-data/input/v1/png/sparkle_boost_perf.png index 52e64a806..54121cfe9 100644 Binary files a/diylc-regression-data/input/v1/png/sparkle_boost_perf.png and b/diylc-regression-data/input/v1/png/sparkle_boost_perf.png differ diff --git a/diylc-regression-data/input/v1/png/stratoblaster_pcb.png b/diylc-regression-data/input/v1/png/stratoblaster_pcb.png index 4d8f47a64..9022314e3 100644 Binary files a/diylc-regression-data/input/v1/png/stratoblaster_pcb.png and b/diylc-regression-data/input/v1/png/stratoblaster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/stratoblaster_perf.png b/diylc-regression-data/input/v1/png/stratoblaster_perf.png index a6fb228b9..af02c0af0 100644 Binary files a/diylc-regression-data/input/v1/png/stratoblaster_perf.png and b/diylc-regression-data/input/v1/png/stratoblaster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/super_hard_on.png b/diylc-regression-data/input/v1/png/super_hard_on.png index 555971558..87529afe9 100644 Binary files a/diylc-regression-data/input/v1/png/super_hard_on.png and b/diylc-regression-data/input/v1/png/super_hard_on.png differ diff --git a/diylc-regression-data/input/v1/png/sw_tripod.png b/diylc-regression-data/input/v1/png/sw_tripod.png index 5207e571f..b649e6a41 100644 Binary files a/diylc-regression-data/input/v1/png/sw_tripod.png and b/diylc-regression-data/input/v1/png/sw_tripod.png differ diff --git a/diylc-regression-data/input/v1/png/syrupp.png b/diylc-regression-data/input/v1/png/syrupp.png index 461419b7c..bafefffce 100644 Binary files a/diylc-regression-data/input/v1/png/syrupp.png and b/diylc-regression-data/input/v1/png/syrupp.png differ diff --git a/diylc-regression-data/input/v1/png/syrupp_perf.png b/diylc-regression-data/input/v1/png/syrupp_perf.png index 2bc0ccd8e..a389dd8ae 100644 Binary files a/diylc-regression-data/input/v1/png/syrupp_perf.png and b/diylc-regression-data/input/v1/png/syrupp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/tb_mk2_pro.png b/diylc-regression-data/input/v1/png/tb_mk2_pro.png index 725d1e469..2d37f67fb 100644 Binary files a/diylc-regression-data/input/v1/png/tb_mk2_pro.png and b/diylc-regression-data/input/v1/png/tb_mk2_pro.png differ diff --git a/diylc-regression-data/input/v1/png/template_ic.png b/diylc-regression-data/input/v1/png/template_ic.png index 925660fe5..8e59bd819 100644 Binary files a/diylc-regression-data/input/v1/png/template_ic.png and b/diylc-regression-data/input/v1/png/template_ic.png differ diff --git a/diylc-regression-data/input/v1/png/the_brick.png b/diylc-regression-data/input/v1/png/the_brick.png index faef7d960..6bfc0da1a 100644 Binary files a/diylc-regression-data/input/v1/png/the_brick.png and b/diylc-regression-data/input/v1/png/the_brick.png differ diff --git a/diylc-regression-data/input/v1/png/the_brick_perf.png b/diylc-regression-data/input/v1/png/the_brick_perf.png index 16a94dfb9..54929bcf8 100644 Binary files a/diylc-regression-data/input/v1/png/the_brick_perf.png and b/diylc-regression-data/input/v1/png/the_brick_perf.png differ diff --git a/diylc-regression-data/input/v1/png/tonebender_mk2_reissue.png b/diylc-regression-data/input/v1/png/tonebender_mk2_reissue.png index 1784ae42c..6b14b2a9b 100644 Binary files a/diylc-regression-data/input/v1/png/tonebender_mk2_reissue.png and b/diylc-regression-data/input/v1/png/tonebender_mk2_reissue.png differ diff --git a/diylc-regression-data/input/v1/png/ts808_pcb.png b/diylc-regression-data/input/v1/png/ts808_pcb.png index f0654abac..08047f823 100644 Binary files a/diylc-regression-data/input/v1/png/ts808_pcb.png and b/diylc-regression-data/input/v1/png/ts808_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ts808_perf.png b/diylc-regression-data/input/v1/png/ts808_perf.png index 5e9e8b92c..38900cfd3 100644 Binary files a/diylc-regression-data/input/v1/png/ts808_perf.png and b/diylc-regression-data/input/v1/png/ts808_perf.png differ diff --git a/diylc-regression-data/input/v1/png/tube_sound_od_pcb.png b/diylc-regression-data/input/v1/png/tube_sound_od_pcb.png index 95fb49984..bf9e9b34e 100644 Binary files a/diylc-regression-data/input/v1/png/tube_sound_od_pcb.png and b/diylc-regression-data/input/v1/png/tube_sound_od_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/tube_sound_od_perf.png b/diylc-regression-data/input/v1/png/tube_sound_od_perf.png index 8a03493bc..cf2b75570 100644 Binary files a/diylc-regression-data/input/v1/png/tube_sound_od_perf.png and b/diylc-regression-data/input/v1/png/tube_sound_od_perf.png differ diff --git a/diylc-regression-data/input/v1/png/univox_squarewave_fuzz.png b/diylc-regression-data/input/v1/png/univox_squarewave_fuzz.png index 64abb8ee0..72d13df86 100644 Binary files a/diylc-regression-data/input/v1/png/univox_squarewave_fuzz.png and b/diylc-regression-data/input/v1/png/univox_squarewave_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/voltage_doubler.png b/diylc-regression-data/input/v1/png/voltage_doubler.png index 8651bd040..a509d8056 100644 Binary files a/diylc-regression-data/input/v1/png/voltage_doubler.png and b/diylc-regression-data/input/v1/png/voltage_doubler.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png b/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png index a111a2528..6de1cfef2 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png and b/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png b/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png index 4c7dbab56..3236765d0 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png and b/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png b/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png index e0ee5462d..8763580cb 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png and b/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_modded_perf.png b/diylc-regression-data/input/v1/png/voodoo_modded_perf.png index d977f2410..f0b9299bf 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_modded_perf.png and b/diylc-regression-data/input/v1/png/voodoo_modded_perf.png differ diff --git a/diylc-regression-data/input/v1/png/vox_distortion_booster_pcb.png b/diylc-regression-data/input/v1/png/vox_distortion_booster_pcb.png index 3b7b5757c..f358d2bb9 100644 Binary files a/diylc-regression-data/input/v1/png/vox_distortion_booster_pcb.png and b/diylc-regression-data/input/v1/png/vox_distortion_booster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/vox_distortion_booster_perf.png b/diylc-regression-data/input/v1/png/vox_distortion_booster_perf.png index a44ad70e0..96eb98004 100644 Binary files a/diylc-regression-data/input/v1/png/vox_distortion_booster_perf.png and b/diylc-regression-data/input/v1/png/vox_distortion_booster_perf.png differ diff --git a/diylc-regression-data/input/v1/png/vox_treble_booster.png b/diylc-regression-data/input/v1/png/vox_treble_booster.png index 70fd8e128..970dc0abf 100644 Binary files a/diylc-regression-data/input/v1/png/vox_treble_booster.png and b/diylc-regression-data/input/v1/png/vox_treble_booster.png differ diff --git a/diylc-regression-data/input/v1/png/vulcan_lite.png b/diylc-regression-data/input/v1/png/vulcan_lite.png index e9dbc6994..d17c8c623 100644 Binary files a/diylc-regression-data/input/v1/png/vulcan_lite.png and b/diylc-regression-data/input/v1/png/vulcan_lite.png differ diff --git a/diylc-regression-data/input/v1/png/wah2.png b/diylc-regression-data/input/v1/png/wah2.png index 9d7fd20c0..9ba85d3b5 100644 Binary files a/diylc-regression-data/input/v1/png/wah2.png and b/diylc-regression-data/input/v1/png/wah2.png differ diff --git a/diylc-regression-data/input/v1/png/walco_pcb.png b/diylc-regression-data/input/v1/png/walco_pcb.png index 9030616f5..011d61b19 100644 Binary files a/diylc-regression-data/input/v1/png/walco_pcb.png and b/diylc-regression-data/input/v1/png/walco_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/walco_perf.png b/diylc-regression-data/input/v1/png/walco_perf.png index 18864fb87..6edb00855 100644 Binary files a/diylc-regression-data/input/v1/png/walco_perf.png and b/diylc-regression-data/input/v1/png/walco_perf.png differ diff --git a/diylc-regression-data/input/v1/png/wooly_mastodon.png b/diylc-regression-data/input/v1/png/wooly_mastodon.png index bfb0f4bcf..6d1888f0d 100644 Binary files a/diylc-regression-data/input/v1/png/wooly_mastodon.png and b/diylc-regression-data/input/v1/png/wooly_mastodon.png differ diff --git a/diylc-regression-data/input/v1/png/yuns_rocket_boost.png b/diylc-regression-data/input/v1/png/yuns_rocket_boost.png index d6ba9d5d7..45615ed44 100644 Binary files a/diylc-regression-data/input/v1/png/yuns_rocket_boost.png and b/diylc-regression-data/input/v1/png/yuns_rocket_boost.png differ