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 b8ebd004..04465bd7 100644 --- a/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/211_excl_switches.txt @@ -2,7 +2,7 @@ Switch setup: [ ALL ] 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 + 2K2.- <-> 2K2.- <-> C6.- <-> C7.- <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> Q1.1 <-> Q2.1 <-> R5.2 <-> VR1.3 <-> VR2.3 C1.+ <-> J1.Sleeve C1.- <-> R1.1 C2.+ <-> J2.Sleeve @@ -11,15 +11,15 @@ Switch setup: [ ALL ] C3.- <-> VR2.1 C4.+ <-> LM324.1 <-> R1.2 C4.- <-> VR1.1 - C5.+ <-> LM324.8 <-> R3.2 + C5.+ <-> LM324.14 <-> 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.13 <-> R3.1 <-> R3.1 <-> R4.1 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/211_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt index b8ebd004..04465bd7 100644 --- a/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt @@ -2,7 +2,7 @@ Switch setup: [ ALL ] 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 + 2K2.- <-> 2K2.- <-> C6.- <-> C7.- <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> Q1.1 <-> Q2.1 <-> R5.2 <-> VR1.3 <-> VR2.3 C1.+ <-> J1.Sleeve C1.- <-> R1.1 C2.+ <-> J2.Sleeve @@ -11,15 +11,15 @@ Switch setup: [ ALL ] C3.- <-> VR2.1 C4.+ <-> LM324.1 <-> R1.2 C4.- <-> VR1.1 - C5.+ <-> LM324.8 <-> R3.2 + C5.+ <-> LM324.14 <-> 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.13 <-> R3.1 <-> R3.1 <-> R4.1 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/419_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt index a46a2f3c..a62f1180 100644 --- a/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt @@ -1,4 +1,4 @@ Switch setup: [ ALL ] - +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.1 <-> 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 + +12V.+ <-> +12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.16 <-> Arduino Nano.17 <-> Arduino Nano.18 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> 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.1 <-> 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 a46a2f3c..a62f1180 100644 --- a/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt @@ -1,4 +1,4 @@ Switch setup: [ ALL ] - +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.1 <-> 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 + +12V.+ <-> +12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.16 <-> Arduino Nano.17 <-> Arduino Nano.18 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> 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.1 <-> 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/diy-fever/netlist/IIc+_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt index f386d6f5..fa41613b 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,23 +1,23 @@ Switch setup: [ ALL ] 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 + 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.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.12 <-> 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 + C11.1 <-> IC3.16 C11.2 <-> C14.1 <-> C8.2 <-> R18.1 <-> R25.2 C12.1 <-> R11.1 <-> V2.3 C12.2 <-> R21.2 C13.2 <-> R17.2 <-> V3.6 - C14.2 <-> C23.1 <-> IC2.9 <-> R18.2 <-> R33.1 <-> V3.2 + C14.2 <-> C23.1 <-> IC2.16 <-> R18.2 <-> R33.1 <-> V3.2 C15.1 <-> C9.1 <-> R19.1 - C15.2 <-> C22.1 <-> IC2.13 <-> R19.2 <-> R29.1 + C15.2 <-> C22.1 <-> IC2.12 <-> R19.2 <-> R29.1 C16.1 <-> C21.1 <-> R27.1 <-> V2.1 C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - C18.+ <-> IC1.4 <-> Q2.1 - C18.- <-> C29.- <-> IC1.3 <-> Q2.2 <-> SW1.2 + C18.+ <-> IC1.3 <-> Q2.1 + C18.- <-> C29.- <-> IC1.4 <-> Q2.2 <-> SW1.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 @@ -40,11 +40,11 @@ Switch setup: [ ALL ] C8.1 <-> R10.1 <-> V1.8 D2.A <-> D3.K D4.A <-> D5.K - D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.16 <-> IC3.16 <-> IC4.16 <-> SW1.1 + D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.9 <-> IC3.9 <-> IC4.9 <-> SW1.1 D9.A <-> R37.2 - IC3.13 <-> R36.2 - IC4.11 <-> VR6.2 <-> VR6.3 - IC4.9 <-> VR7.2 <-> VR7.3 + IC3.12 <-> R36.2 + IC4.14 <-> VR6.2 <-> VR6.3 + IC4.16 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 R22.2 <-> R34.2 <-> VR6.1 <-> VR7.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 c47a853d..a3b43ba5 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,23 +1,23 @@ Switch setup: [ SW1.ON1 ] 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 + 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.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.12 <-> 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 + C11.1 <-> IC3.16 C11.2 <-> C14.1 <-> C8.2 <-> R18.1 <-> R25.2 C12.1 <-> R11.1 <-> V2.3 C12.2 <-> R21.2 C13.2 <-> R17.2 <-> V3.6 - C14.2 <-> C23.1 <-> IC2.9 <-> R18.2 <-> R33.1 <-> V3.2 + C14.2 <-> C23.1 <-> IC2.16 <-> R18.2 <-> R33.1 <-> V3.2 C15.1 <-> C9.1 <-> R19.1 - C15.2 <-> C22.1 <-> IC2.13 <-> R19.2 <-> R29.1 + C15.2 <-> C22.1 <-> IC2.12 <-> R19.2 <-> R29.1 C16.1 <-> C21.1 <-> R27.1 <-> V2.1 C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - 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 + C18.+ <-> IC1.3 <-> Q2.1 + C18.- <-> C29.- <-> D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC1.4 <-> IC2.9 <-> IC3.9 <-> IC4.9 <-> Q2.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 @@ -41,9 +41,9 @@ Switch setup: [ SW1.ON1 ] D2.A <-> D3.K D4.A <-> D5.K D9.A <-> R37.2 - IC3.13 <-> R36.2 - IC4.11 <-> VR6.2 <-> VR6.3 - IC4.9 <-> VR7.2 <-> VR7.3 + IC3.12 <-> R36.2 + IC4.14 <-> VR6.2 <-> VR6.3 + IC4.16 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 R22.2 <-> R34.2 <-> VR6.1 <-> VR7.1 @@ -53,23 +53,23 @@ Switch setup: [ SW1.ON1 ] Switch setup: [ SW1.ON2 ] 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 + 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.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC4.1 <-> IC4.12 <-> 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 + C11.1 <-> IC3.16 C11.2 <-> C14.1 <-> C8.2 <-> R18.1 <-> R25.2 C12.1 <-> R11.1 <-> V2.3 C12.2 <-> R21.2 C13.2 <-> R17.2 <-> V3.6 - C14.2 <-> C23.1 <-> IC2.9 <-> R18.2 <-> R33.1 <-> V3.2 + C14.2 <-> C23.1 <-> IC2.16 <-> R18.2 <-> R33.1 <-> V3.2 C15.1 <-> C9.1 <-> R19.1 - C15.2 <-> C22.1 <-> IC2.13 <-> R19.2 <-> R29.1 + C15.2 <-> C22.1 <-> IC2.12 <-> R19.2 <-> R29.1 C16.1 <-> C21.1 <-> R27.1 <-> V2.1 C16.2 <-> R32.2 <-> V2.2 <-> VR1.2 C17.1 <-> R13.2 <-> V3.3 C17.2 <-> R34.1 - C18.+ <-> IC1.4 <-> Q2.1 - C18.- <-> C29.- <-> IC1.3 <-> Q2.2 + C18.+ <-> IC1.3 <-> Q2.1 + C18.- <-> C29.- <-> IC1.4 <-> Q2.2 C19.2 <-> R21.1 <-> R28.2 <-> V2.7 C2.+ <-> C6.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.1 C20.1 <-> C27.1 <-> R26.2 <-> V1.1 @@ -92,11 +92,11 @@ Switch setup: [ SW1.ON2 ] C8.1 <-> R10.1 <-> V1.8 D2.A <-> D3.K D4.A <-> D5.K - D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.16 <-> IC3.16 <-> IC4.16 + D6.A <-> D7.A <-> D8.A <-> D9.K <-> IC2.9 <-> IC3.9 <-> IC4.9 D9.A <-> R37.2 - IC3.13 <-> R36.2 - IC4.11 <-> VR6.2 <-> VR6.3 - IC4.9 <-> VR7.2 <-> VR7.3 + IC3.12 <-> R36.2 + IC4.14 <-> VR6.2 <-> VR6.3 + IC4.16 <-> VR7.2 <-> VR7.3 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 R22.2 <-> R34.2 <-> VR6.1 <-> VR7.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 b46defc3..13ac7338 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 @@ -2,15 +2,15 @@ Switch setup: [ ALL ] C1.1 <-> Q1.2 <-> R2.1 C1.2 <-> VR2.3 - C2.+ <-> IC1.8 <-> R3.1 + C2.+ <-> IC1.5 <-> R3.1 C2.- <-> R4.2 <-> SW1.2 - C3.1 <-> IC1.6 + C3.1 <-> IC1.7 C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.Center <-> R1.1 <-> R2.2 <-> VR2.1 - C4.+ <-> IC1.7 <-> J3.Sleeve <-> Q1.1 + C4.+ <-> IC1.6 <-> J3.Sleeve <-> Q1.1 C5.1 <-> R3.2 IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 - IC1.5 <-> VR1.2 + IC1.8 <-> VR1.2 J1.Tip <-> R4.1 <-> R5.1 <-> SW1.1 J2.Tip <-> Q1.3 <-> R1.2 R5.2 <-> SW1.3 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 e9760751..887d0209 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,47 +1,47 @@ -Switch setup: [ SW1.OFF ] - - C1.1 <-> Q1.2 <-> R2.1 - C1.2 <-> VR2.3 - C2.+ <-> IC1.8 <-> R3.1 - C2.- <-> R4.2 - C3.1 <-> IC1.6 - C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.Center <-> R1.1 <-> R2.2 <-> VR2.1 - C4.+ <-> IC1.7 <-> J3.Sleeve <-> Q1.1 - C5.1 <-> R3.2 - 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 ] C1.1 <-> Q1.2 <-> R2.1 C1.2 <-> VR2.3 - C2.+ <-> IC1.8 <-> R3.1 + C2.+ <-> IC1.5 <-> R3.1 C2.- <-> J1.Tip <-> R4.1 <-> R4.2 <-> R5.1 - C3.1 <-> IC1.6 + C3.1 <-> IC1.7 C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.Center <-> R1.1 <-> R2.2 <-> VR2.1 - C4.+ <-> IC1.7 <-> J3.Sleeve <-> Q1.1 + C4.+ <-> IC1.6 <-> J3.Sleeve <-> Q1.1 C5.1 <-> R3.2 IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 - IC1.5 <-> VR1.2 + IC1.8 <-> VR1.2 + J2.Tip <-> Q1.3 <-> R1.2 + +Switch setup: [ SW1.OFF ] + + C1.1 <-> Q1.2 <-> R2.1 + C1.2 <-> VR2.3 + C2.+ <-> IC1.5 <-> R3.1 + C2.- <-> R4.2 + C3.1 <-> IC1.7 + C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.Center <-> R1.1 <-> R2.2 <-> VR2.1 + C4.+ <-> IC1.6 <-> J3.Sleeve <-> Q1.1 + C5.1 <-> R3.2 + IC1.1 <-> VR1.3 + IC1.2 <-> VR2.2 + IC1.8 <-> VR1.2 + J1.Tip <-> R4.1 <-> R5.1 J2.Tip <-> Q1.3 <-> R1.2 Switch setup: [ SW1.ON2 ] C1.1 <-> Q1.2 <-> R2.1 C1.2 <-> VR2.3 - C2.+ <-> IC1.8 <-> R3.1 + C2.+ <-> IC1.5 <-> R3.1 C2.- <-> R4.2 <-> R5.2 - C3.1 <-> IC1.6 + C3.1 <-> IC1.7 C3.2 <-> C4.- <-> C5.2 <-> IC1.3 <-> IC1.4 <-> J1.Sleeve <-> J2.Sleeve <-> J3.Center <-> R1.1 <-> R2.2 <-> VR2.1 - C4.+ <-> IC1.7 <-> J3.Sleeve <-> Q1.1 + C4.+ <-> IC1.6 <-> J3.Sleeve <-> Q1.1 C5.1 <-> R3.2 IC1.1 <-> VR1.3 IC1.2 <-> VR2.2 - IC1.5 <-> VR1.2 + IC1.8 <-> VR1.2 J1.Tip <-> R4.1 <-> R5.1 J2.Tip <-> Q1.3 <-> R1.2 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 ebfe1484..6c46ffb7 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,33 +1,33 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> IC1.8 <-> IC2.9 <-> IC3.2 <-> R3.2 <-> VR1.3 + C1.2 <-> D14.A <-> D7.K <-> IC1.1 <-> IC2.16 <-> IC3.1 <-> R1.2 <-> VR1.1 <-> VR4.2 <-> VR4.3 + C2.1 <-> IC3.7 <-> R2.2 C2.2 <-> VR2.3 C3.1 <-> R3.1 <-> VR3.2 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 + C4.2 <-> IC3.5 <-> R6.1 C5.1 <-> IC3.3 <-> R4.2 C5.2 <-> R8.2 C6.1 <-> VR3.3 - C7.+ <-> D16.K <-> IC3.5 <-> R9.2 - D1.A <-> IC1.15 <-> IC1.16 + C7.+ <-> D16.K <-> IC3.8 <-> R9.2 + D1.A <-> IC1.10 <-> IC1.9 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 + D12.A <-> D13.K <-> IC2.14 <-> IC2.15 D13.A <-> D14.K <-> IC2.1 <-> IC2.2 D15.K <-> Q1.1 - D2.K <-> D3.A <-> IC1.13 <-> IC1.14 + D2.K <-> D3.A <-> IC1.11 <-> IC1.12 D3.K <-> D4.A <-> IC1.4 <-> IC1.5 - D4.K <-> D5.A <-> IC1.11 <-> IC1.12 + D4.K <-> D5.A <-> IC1.13 <-> IC1.14 D5.K <-> D6.A <-> IC1.2 <-> IC1.3 - D6.K <-> D7.A <-> IC1.10 <-> IC1.9 - D8.A <-> D9.K <-> IC2.14 <-> IC2.15 + D6.K <-> D7.A <-> IC1.15 <-> IC1.16 + D8.A <-> D9.K <-> IC2.10 <-> IC2.11 D8.K <-> IC2.7 <-> IC2.8 - IC3.7 <-> R2.1 <-> R5.1 + IC3.6 <-> R2.1 <-> R5.1 Q1.2 <-> Q1.3 R1.1 <-> VR1.2 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 ebfe1484..6c46ffb7 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,33 +1,33 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> IC1.8 <-> IC2.9 <-> IC3.2 <-> R3.2 <-> VR1.3 + C1.2 <-> D14.A <-> D7.K <-> IC1.1 <-> IC2.16 <-> IC3.1 <-> R1.2 <-> VR1.1 <-> VR4.2 <-> VR4.3 + C2.1 <-> IC3.7 <-> R2.2 C2.2 <-> VR2.3 C3.1 <-> R3.1 <-> VR3.2 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 + C4.2 <-> IC3.5 <-> R6.1 C5.1 <-> IC3.3 <-> R4.2 C5.2 <-> R8.2 C6.1 <-> VR3.3 - C7.+ <-> D16.K <-> IC3.5 <-> R9.2 - D1.A <-> IC1.15 <-> IC1.16 + C7.+ <-> D16.K <-> IC3.8 <-> R9.2 + D1.A <-> IC1.10 <-> IC1.9 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 + D12.A <-> D13.K <-> IC2.14 <-> IC2.15 D13.A <-> D14.K <-> IC2.1 <-> IC2.2 D15.K <-> Q1.1 - D2.K <-> D3.A <-> IC1.13 <-> IC1.14 + D2.K <-> D3.A <-> IC1.11 <-> IC1.12 D3.K <-> D4.A <-> IC1.4 <-> IC1.5 - D4.K <-> D5.A <-> IC1.11 <-> IC1.12 + D4.K <-> D5.A <-> IC1.13 <-> IC1.14 D5.K <-> D6.A <-> IC1.2 <-> IC1.3 - D6.K <-> D7.A <-> IC1.10 <-> IC1.9 - D8.A <-> D9.K <-> IC2.14 <-> IC2.15 + D6.K <-> D7.A <-> IC1.15 <-> IC1.16 + D8.A <-> D9.K <-> IC2.10 <-> IC2.11 D8.K <-> IC2.7 <-> IC2.8 - IC3.7 <-> R2.1 <-> R5.1 + IC3.6 <-> R2.1 <-> R5.1 Q1.2 <-> Q1.3 R1.1 <-> VR1.2 R6.2 <-> VR4.1 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 eb3be42b..a8028923 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,7 +1,7 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.3 <-> IC1.4 <-> IC1.40 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.3 <-> IC2.4 <-> IC2.40 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC3.4 <-> IC3.8 <-> IC4.8 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.31 <-> IC1.41 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.31 <-> IC2.41 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.16 <-> IC4.16 <-> IC4.6 IC1.1 <-> IC2.1 IC1.12 <-> IC2.12 IC1.13 <-> IC2.13 @@ -12,9 +12,9 @@ Switch setup: [ ALL ] 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 + IC1.46 <-> IC2.46 <-> IC3.5 <-> IC4.5 + IC1.47 <-> IC2.47 + IC1.48 <-> IC2.48 IC3.1 <-> IC4.1 IC3.2 <-> IC4.2 IC3.3 <-> IC4.3 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 eb3be42b..a8028923 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,7 +1,7 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.3 <-> IC1.4 <-> IC1.40 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.3 <-> IC2.4 <-> IC2.40 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC3.4 <-> IC3.8 <-> IC4.8 + C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.31 <-> IC1.41 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.31 <-> IC2.41 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.16 <-> IC4.16 <-> IC4.6 IC1.1 <-> IC2.1 IC1.12 <-> IC2.12 IC1.13 <-> IC2.13 @@ -12,9 +12,9 @@ Switch setup: [ ALL ] 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 + IC1.46 <-> IC2.46 <-> IC3.5 <-> IC4.5 + IC1.47 <-> IC2.47 + IC1.48 <-> IC2.48 IC3.1 <-> IC4.1 IC3.2 <-> IC4.2 IC3.3 <-> IC4.3 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 34213a8b..b210d4a8 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 @@ -3,21 +3,21 @@ Switch setup: [ ALL ] 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 + C10.- <-> C9.+ <-> IC2.5 C12.+ <-> D6.K C12.- <-> C14.- <-> C2.2 <-> IC2.4 <-> R4.2 - C14.+ <-> D5.A <-> IC2.7 + C14.+ <-> D5.A <-> IC2.6 C2.1 <-> IC2.2 <-> R5.1 - C3.+ <-> D1.A <-> IC1.7 - C4.+ <-> C5.- <-> C6.+ <-> IC1.8 + C3.+ <-> D1.A <-> IC1.6 + C4.+ <-> C5.- <-> C6.+ <-> IC1.5 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.1 <-> IC1.8 IC1.3 <-> R2.1 <-> R3.1 - IC2.1 <-> IC2.5 + IC2.1 <-> IC2.8 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 34213a8b..b210d4a8 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 @@ -3,21 +3,21 @@ Switch setup: [ ALL ] 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 + C10.- <-> C9.+ <-> IC2.5 C12.+ <-> D6.K C12.- <-> C14.- <-> C2.2 <-> IC2.4 <-> R4.2 - C14.+ <-> D5.A <-> IC2.7 + C14.+ <-> D5.A <-> IC2.6 C2.1 <-> IC2.2 <-> R5.1 - C3.+ <-> D1.A <-> IC1.7 - C4.+ <-> C5.- <-> C6.+ <-> IC1.8 + C3.+ <-> D1.A <-> IC1.6 + C4.+ <-> C5.- <-> C6.+ <-> IC1.5 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.1 <-> IC1.8 IC1.3 <-> R2.1 <-> R3.1 - IC2.1 <-> IC2.5 + IC2.1 <-> IC2.8 IC2.3 <-> R4.1 <-> R6.1 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 d415ed0c..22db37d8 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,20 +1,20 @@ Switch setup: [ ALL ] 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 + C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.20 <-> IC10.19 <-> IC10.20 <-> IC11.20 <-> IC2.20 <-> IC3.20 <-> IC4.32 <-> IC5.20 <-> IC6.13 <-> IC6.16 <-> IC6.6 <-> IC7.20 <-> IC9.20 + 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.22 <-> 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 + IC1.2 <-> IC10.18 <-> IC11.18 <-> IC2.2 <-> IC3.11 <-> IC4.13 <-> IC4.27 <-> IC5.2 <-> IC7.12 <-> IC9.18 + IC1.3 <-> IC10.17 <-> IC11.17 <-> IC2.3 <-> IC3.12 <-> IC4.14 <-> IC4.26 <-> IC5.3 <-> IC7.13 <-> IC9.17 + IC1.4 <-> IC10.16 <-> IC11.16 <-> IC2.4 <-> IC3.13 <-> IC4.15 <-> IC4.23 <-> IC5.4 <-> IC7.14 <-> IC9.16 + IC1.5 <-> IC10.15 <-> IC11.15 <-> IC2.5 <-> IC3.14 <-> IC4.17 <-> IC5.5 <-> IC7.15 <-> IC9.15 + IC1.6 <-> IC10.14 <-> IC11.14 <-> IC2.6 <-> IC3.15 <-> IC4.18 <-> IC5.6 <-> IC7.16 <-> IC9.14 + IC1.7 <-> IC10.13 <-> IC11.13 <-> IC2.7 <-> IC3.16 <-> IC4.19 <-> IC5.7 <-> IC7.17 <-> IC9.13 + IC1.8 <-> IC10.12 <-> IC11.12 <-> IC2.8 <-> IC3.17 <-> IC4.20 <-> IC5.8 <-> IC7.18 <-> IC9.12 + IC1.9 <-> IC10.11 <-> IC11.11 <-> IC2.9 <-> IC3.18 <-> IC4.21 <-> IC5.9 <-> IC7.11 <-> IC9.11 + IC11.19 <-> IC6.14 + IC3.19 <-> IC6.11 + IC4.24 <-> IC6.4 <-> IC6.5 + IC6.10 <-> IC7.19 + IC6.12 <-> IC9.19 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 d415ed0c..22db37d8 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,20 +1,20 @@ Switch setup: [ ALL ] 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 + C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.20 <-> IC10.19 <-> IC10.20 <-> IC11.20 <-> IC2.20 <-> IC3.20 <-> IC4.32 <-> IC5.20 <-> IC6.13 <-> IC6.16 <-> IC6.6 <-> IC7.20 <-> IC9.20 + 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.22 <-> 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 + IC1.2 <-> IC10.18 <-> IC11.18 <-> IC2.2 <-> IC3.11 <-> IC4.13 <-> IC4.27 <-> IC5.2 <-> IC7.12 <-> IC9.18 + IC1.3 <-> IC10.17 <-> IC11.17 <-> IC2.3 <-> IC3.12 <-> IC4.14 <-> IC4.26 <-> IC5.3 <-> IC7.13 <-> IC9.17 + IC1.4 <-> IC10.16 <-> IC11.16 <-> IC2.4 <-> IC3.13 <-> IC4.15 <-> IC4.23 <-> IC5.4 <-> IC7.14 <-> IC9.16 + IC1.5 <-> IC10.15 <-> IC11.15 <-> IC2.5 <-> IC3.14 <-> IC4.17 <-> IC5.5 <-> IC7.15 <-> IC9.15 + IC1.6 <-> IC10.14 <-> IC11.14 <-> IC2.6 <-> IC3.15 <-> IC4.18 <-> IC5.6 <-> IC7.16 <-> IC9.14 + IC1.7 <-> IC10.13 <-> IC11.13 <-> IC2.7 <-> IC3.16 <-> IC4.19 <-> IC5.7 <-> IC7.17 <-> IC9.13 + IC1.8 <-> IC10.12 <-> IC11.12 <-> IC2.8 <-> IC3.17 <-> IC4.20 <-> IC5.8 <-> IC7.18 <-> IC9.12 + IC1.9 <-> IC10.11 <-> IC11.11 <-> IC2.9 <-> IC3.18 <-> IC4.21 <-> IC5.9 <-> IC7.11 <-> IC9.11 + IC11.19 <-> IC6.14 + IC3.19 <-> IC6.11 + IC4.24 <-> IC6.4 <-> IC6.5 + IC6.10 <-> IC7.19 + IC6.12 <-> IC9.19 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 376b9cea..2ce3fe4c 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,7 +1,7 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.19 <-> IC11.19 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.19 + C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.20 <-> IC10.20 <-> IC11.20 <-> IC2.20 <-> IC3.20 <-> IC4.16 <-> IC5.20 <-> IC6.16 <-> IC8.20 <-> IC9.20 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 @@ -11,16 +11,16 @@ Switch setup: [ ALL ] 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 + IC10.11 <-> IC11.11 <-> IC4.9 <-> IC9.11 + IC10.12 <-> IC11.12 <-> IC4.10 <-> IC9.12 + IC10.13 <-> IC11.13 <-> IC4.1 <-> IC9.13 + IC10.14 <-> IC11.14 <-> IC4.15 <-> IC9.14 + IC10.15 <-> IC11.15 <-> IC6.9 <-> IC9.15 + IC10.16 <-> IC11.16 <-> IC6.10 <-> IC9.16 + IC10.17 <-> IC11.17 <-> IC6.1 <-> IC9.17 + IC10.18 <-> IC11.18 <-> IC6.15 <-> IC9.18 IC4.11 <-> IC6.11 IC4.14 <-> IC6.14 - IC4.4 <-> IC6.12 - IC4.5 <-> IC6.13 + IC4.4 <-> IC6.13 + IC4.5 <-> IC6.12 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 376b9cea..2ce3fe4c 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,7 +1,7 @@ Switch setup: [ ALL ] - 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 + C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.19 <-> IC11.19 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.19 + C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.20 <-> IC10.20 <-> IC11.20 <-> IC2.20 <-> IC3.20 <-> IC4.16 <-> IC5.20 <-> IC6.16 <-> IC8.20 <-> IC9.20 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 @@ -11,16 +11,16 @@ Switch setup: [ ALL ] 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 + IC10.11 <-> IC11.11 <-> IC4.9 <-> IC9.11 + IC10.12 <-> IC11.12 <-> IC4.10 <-> IC9.12 + IC10.13 <-> IC11.13 <-> IC4.1 <-> IC9.13 + IC10.14 <-> IC11.14 <-> IC4.15 <-> IC9.14 + IC10.15 <-> IC11.15 <-> IC6.9 <-> IC9.15 + IC10.16 <-> IC11.16 <-> IC6.10 <-> IC9.16 + IC10.17 <-> IC11.17 <-> IC6.1 <-> IC9.17 + IC10.18 <-> IC11.18 <-> IC6.15 <-> IC9.18 IC4.11 <-> IC6.11 IC4.14 <-> IC6.14 - IC4.4 <-> IC6.12 - IC4.5 <-> IC6.13 + IC4.4 <-> IC6.13 + IC4.5 <-> IC6.12 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 8cbab949..63b7cde4 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,20 +1,20 @@ Switch setup: [ ALL ] - 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.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.11 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.11 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.11 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.20 <-> IC6.20 <-> IC7.20 <-> IC8.20 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.12 <-> IC3.5 + IC1.13 <-> IC3.4 + IC1.14 <-> IC2.14 <-> IC3.14 <-> IC4.14 IC1.2 <-> IC5.3 <-> IC8.3 IC1.3 <-> IC5.2 <-> IC8.2 - IC1.4 <-> IC2.12 - IC1.5 <-> IC2.13 + IC1.4 <-> IC2.13 + IC1.5 <-> IC2.12 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.4 <-> IC4.13 + IC2.5 <-> IC4.12 IC2.6 <-> IC6.8 <-> IC7.8 IC2.7 <-> IC6.9 <-> IC7.9 IC3.2 <-> IC5.7 <-> IC8.7 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 8cbab949..63b7cde4 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,20 +1,20 @@ Switch setup: [ ALL ] - 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.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.11 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.11 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.11 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.20 <-> IC6.20 <-> IC7.20 <-> IC8.20 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.12 <-> IC3.5 + IC1.13 <-> IC3.4 + IC1.14 <-> IC2.14 <-> IC3.14 <-> IC4.14 IC1.2 <-> IC5.3 <-> IC8.3 IC1.3 <-> IC5.2 <-> IC8.2 - IC1.4 <-> IC2.12 - IC1.5 <-> IC2.13 + IC1.4 <-> IC2.13 + IC1.5 <-> IC2.12 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.4 <-> IC4.13 + IC2.5 <-> IC4.12 IC2.6 <-> IC6.8 <-> IC7.8 IC2.7 <-> IC6.9 <-> IC7.9 IC3.2 <-> IC5.7 <-> IC8.7 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 a51ac15b..ecc9c22b 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,31 +1,31 @@ Switch setup: [ ALL ] - 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.1 <-> C1.1 <-> D1.K <-> IC1.13 <-> IC2.12 + BC548.1 <-> C2.2 <-> D2.K <-> IC1.11 <-> IC5.12 + BC548.1 <-> C3.1 <-> D4.K <-> IC1.1 <-> IC4.12 + BC548.1 <-> C4.1 <-> D3.K <-> IC1.3 <-> IC6.10 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 + BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.5 <-> IC1.7 <-> IC1.9 <-> 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 + C10.1 <-> IC6.12 <-> IC6.3 <-> R37.1 + C10.2 <-> IC6.8 <-> IC6.9 + C5.1 <-> IC2.13 <-> IC2.14 + C5.2 <-> IC2.10 <-> 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 + C7.1 <-> IC5.13 <-> IC5.14 + C7.2 <-> IC5.10 <-> 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 + C9.1 <-> IC4.10 <-> IC4.5 <-> R14.1 + C9.2 <-> IC4.13 <-> IC4.14 Coarse 1.2 <-> NTC.1 Coarse 2.2 <-> NTC.1 Coarse 3.2 <-> NTC.1 @@ -34,13 +34,13 @@ Switch setup: [ ALL ] 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 + D1.A <-> IC1.12 + D12.A <-> IC5.8 <-> R19.2 <-> R20.1 + D2.A <-> IC1.10 D3.A <-> IC1.4 D4.A <-> IC1.2 D5.A <-> IC2.7 <-> Slope Shift 1.3 - D6.A <-> IC2.14 <-> R4.2 <-> R6.1 + D6.A <-> IC2.8 <-> R4.2 <-> R6.1 D7.A <-> IC5.7 <-> Slope Shift 2.3 Fine 1.2 <-> NTC.1 Fine 2.2 <-> NTC.1 @@ -50,38 +50,38 @@ Switch setup: [ ALL ] 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 + IC1.14 <-> 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 + IC2.9 <-> R4.1 <-> R5.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.10 <-> R10.2 <-> R11.1 + IC3.12 <-> Square/Triangle 1.2 + IC3.13 <-> IC3.14 <-> Output 1.Tip 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 + IC3.8 <-> IC3.9 <-> Square/Triangle 1.1 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 + IC4.8 <-> R15.2 <-> Square/Sawtooth 3.3 + IC4.9 <-> R15.1 <-> R27.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 + IC5.9 <-> R18.2 <-> R19.1 IC6.1 <-> R41.1 + IC6.13 <-> R38.1 <-> R39.1 + IC6.14 <-> R38.2 <-> Square/Sawtooth 4.3 IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3 - IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2 + IC6.5 <-> IC7.10 <-> 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 + IC7.8 <-> IC7.9 <-> Output 4.Tip NTC.1 <-> VR1.1 NTC.1 <-> VR4.1 PWM In 1.Tip <-> VR3.2 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 a51ac15b..ecc9c22b 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,31 +1,31 @@ Switch setup: [ ALL ] - 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.1 <-> C1.1 <-> D1.K <-> IC1.13 <-> IC2.12 + BC548.1 <-> C2.2 <-> D2.K <-> IC1.11 <-> IC5.12 + BC548.1 <-> C3.1 <-> D4.K <-> IC1.1 <-> IC4.12 + BC548.1 <-> C4.1 <-> D3.K <-> IC1.3 <-> IC6.10 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 + BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.5 <-> IC1.7 <-> IC1.9 <-> 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 + C10.1 <-> IC6.12 <-> IC6.3 <-> R37.1 + C10.2 <-> IC6.8 <-> IC6.9 + C5.1 <-> IC2.13 <-> IC2.14 + C5.2 <-> IC2.10 <-> 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 + C7.1 <-> IC5.13 <-> IC5.14 + C7.2 <-> IC5.10 <-> 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 + C9.1 <-> IC4.10 <-> IC4.5 <-> R14.1 + C9.2 <-> IC4.13 <-> IC4.14 Coarse 1.2 <-> NTC.1 Coarse 2.2 <-> NTC.1 Coarse 3.2 <-> NTC.1 @@ -34,13 +34,13 @@ Switch setup: [ ALL ] 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 + D1.A <-> IC1.12 + D12.A <-> IC5.8 <-> R19.2 <-> R20.1 + D2.A <-> IC1.10 D3.A <-> IC1.4 D4.A <-> IC1.2 D5.A <-> IC2.7 <-> Slope Shift 1.3 - D6.A <-> IC2.14 <-> R4.2 <-> R6.1 + D6.A <-> IC2.8 <-> R4.2 <-> R6.1 D7.A <-> IC5.7 <-> Slope Shift 2.3 Fine 1.2 <-> NTC.1 Fine 2.2 <-> NTC.1 @@ -50,38 +50,38 @@ Switch setup: [ ALL ] 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 + IC1.14 <-> 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 + IC2.9 <-> R4.1 <-> R5.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.10 <-> R10.2 <-> R11.1 + IC3.12 <-> Square/Triangle 1.2 + IC3.13 <-> IC3.14 <-> Output 1.Tip 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 + IC3.8 <-> IC3.9 <-> Square/Triangle 1.1 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 + IC4.8 <-> R15.2 <-> Square/Sawtooth 3.3 + IC4.9 <-> R15.1 <-> R27.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 + IC5.9 <-> R18.2 <-> R19.1 IC6.1 <-> R41.1 + IC6.13 <-> R38.1 <-> R39.1 + IC6.14 <-> R38.2 <-> Square/Sawtooth 4.3 IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3 - IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2 + IC6.5 <-> IC7.10 <-> 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 + IC7.8 <-> IC7.9 <-> Output 4.Tip NTC.1 <-> VR1.1 NTC.1 <-> VR4.1 PWM In 1.Tip <-> VR3.2 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 40608233..4cf100e3 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 @@ -4,17 +4,17 @@ Switch setup: [ ALL ] 1k.2 <-> 3PDT.5 3PDT.1 <-> C1.1 3PDT.3 <-> 3PDT.9 - 3PDT.4 <-> IC1.5 <-> IC2.5 <-> R2.1 + 3PDT.4 <-> IC1.8 <-> IC2.8 <-> R2.1 3PDT.7 <-> Volume.2 Blend.1 <-> C3.+ <-> C6.1 Blend.2 <-> C5.2 Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 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 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> 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 + C6.2 <-> IC2.5 <-> R6.1 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 e712e0dc..086b586c 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,16 +1,16 @@ Switch setup: [ 3PDT.ON1 ] 1k.1 <-> LED.A - 1k.2 <-> IC1.5 <-> IC2.5 <-> R2.1 + 1k.2 <-> IC1.8 <-> IC2.8 <-> R2.1 Blend.1 <-> C3.+ <-> C6.1 Blend.2 <-> C5.2 Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 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 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> 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 + C6.2 <-> IC2.5 <-> R6.1 C7.+ <-> Volume.3 C7.- <-> IC1.6 <-> IC1.7 C8.- <-> IC2.6 <-> IC2.7 @@ -23,12 +23,12 @@ Switch setup: [ 3PDT.ON2 ] Blend.3 <-> C8.+ C1.2 <-> IC1.3 <-> IC2.3 <-> R1.1 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 + C2.- <-> C3.- <-> C5.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> 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 + C6.2 <-> IC2.5 <-> R6.1 C7.+ <-> Volume.3 C7.- <-> IC1.6 <-> IC1.7 C8.- <-> IC2.6 <-> IC2.7 - IC1.5 <-> IC2.5 <-> R2.1 + IC1.8 <-> IC2.8 <-> R2.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 1ece2e71..4e7e521c 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 @@ -7,28 +7,28 @@ Switch setup: [ ALL ] 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.+ <-> 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 + C13.2 <-> D1.K <-> IC3.5 <-> R12.1 + C15.+ <-> IC1.7 <-> IC2.7 <-> IC3.8 <-> R13.2 <-> R20.2 C16.+ <-> IC3.1 <-> LEVEL.2 C16.- <-> R21.1 C2.1 <-> IC1.1 - C2.2 <-> IC1.5 - C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C2.2 <-> IC1.8 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.6 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 + C6.2 <-> IC2.6 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 - C7.2 <-> IC2.5 + C7.2 <-> IC2.8 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 + IC3.6 <-> R15.1 <-> R18.2 + IC3.7 <-> R17.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 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 1303b852..397ef251 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 @@ -7,28 +7,28 @@ Switch setup: [ spst1.ON1:spst2.ON1 ] 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.+ <-> 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 + C13.2 <-> D1.K <-> IC3.5 <-> R12.1 + C15.+ <-> IC1.7 <-> IC2.7 <-> IC3.8 <-> R13.2 <-> R20.2 C16.+ <-> IC3.1 <-> LEVEL.2 C16.- <-> R21.1 C2.1 <-> IC1.1 - C2.2 <-> IC1.5 - C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C2.2 <-> IC1.8 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.6 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 + C6.2 <-> IC2.6 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 - C7.2 <-> IC2.5 + C7.2 <-> IC2.8 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 + IC3.6 <-> R15.1 <-> R18.2 + IC3.7 <-> R17.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 @@ -42,28 +42,28 @@ Switch setup: [ spst1.ON1:spst2.ON2 ] 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.+ <-> 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 + C13.2 <-> D1.K <-> IC3.5 <-> R12.1 + C15.+ <-> IC1.7 <-> IC2.7 <-> IC3.8 <-> R13.2 <-> R20.2 C16.+ <-> IC3.1 <-> LEVEL.2 C16.- <-> R21.1 C2.1 <-> IC1.1 - C2.2 <-> IC1.5 - C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C2.2 <-> IC1.8 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.6 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 + C6.2 <-> IC2.6 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 - C7.2 <-> IC2.5 + C7.2 <-> IC2.8 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 + IC3.6 <-> R15.1 <-> R18.2 + IC3.7 <-> R17.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 @@ -77,28 +77,28 @@ Switch setup: [ spst1.ON2:spst2.ON1 ] 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.+ <-> 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 + C13.2 <-> D1.K <-> IC3.5 <-> R12.1 + C15.+ <-> IC1.7 <-> IC2.7 <-> IC3.8 <-> R13.2 <-> R20.2 C16.+ <-> IC3.1 <-> LEVEL.2 C16.- <-> R21.1 C2.1 <-> IC1.1 - C2.2 <-> IC1.5 - C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C2.2 <-> IC1.8 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.6 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 + C6.2 <-> IC2.6 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 - C7.2 <-> IC2.5 + C7.2 <-> IC2.8 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 + IC3.6 <-> R15.1 <-> R18.2 + IC3.7 <-> R17.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.2 @@ -112,28 +112,28 @@ Switch setup: [ spst1.ON2:spst2.ON2 ] 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.+ <-> 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 + C13.2 <-> D1.K <-> IC3.5 <-> R12.1 + C15.+ <-> IC1.7 <-> IC2.7 <-> IC3.8 <-> R13.2 <-> R20.2 C16.+ <-> IC3.1 <-> LEVEL.2 C16.- <-> R21.1 C2.1 <-> IC1.1 - C2.2 <-> IC1.5 - C3.+ <-> D1.A <-> GAIN.2 <-> IC1.7 + C2.2 <-> IC1.8 + C3.+ <-> D1.A <-> GAIN.2 <-> IC1.6 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 + C6.2 <-> IC2.6 <-> LDR.2 <-> R7.1 <-> R8.1 <-> R9.1 C7.1 <-> IC2.1 - C7.2 <-> IC2.5 + C7.2 <-> IC2.8 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 + IC3.6 <-> R15.1 <-> R18.2 + IC3.7 <-> R17.2 Q1.1 <-> Q1.2 <-> R14.2 <-> R16.2 <-> R17.1 <-> R18.1 Q1.3 <-> R16.1 R10.1 <-> TONE.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 2a8c4722..6c49c090 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 @@ -13,10 +13,10 @@ Switch setup: [ ALL ] C14.2 <-> R21.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.1 <-> IC1.6 <-> Q2.3 <-> R3.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 + C5.+ <-> C6.1 <-> D1.K <-> IC1.7 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + IC1.5 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 R10.2 <-> VR1.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 2a8c4722..6c49c090 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 @@ -13,10 +13,10 @@ Switch setup: [ ALL ] C14.2 <-> R21.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.1 <-> IC1.6 <-> Q2.3 <-> R3.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 + C5.+ <-> C6.1 <-> D1.K <-> IC1.7 <-> R10.1 <-> R16.2 <-> R20.2 <-> R4.2 + IC1.5 <-> R19.1 Q1.3 <-> R5.2 <-> R6.2 Q5.1 <-> Q5.2 R10.2 <-> VR1.2 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 f835dccb..f3faa98d 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 @@ -2,42 +2,42 @@ Switch setup: [ ALL ] Bass Switch.1 <-> C8.1 <-> R13.2 <-> R14.1 Bass Switch.2 <-> Blend.3 - Bass Switch.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Bass Switch.3 <-> C10.2 <-> C11.2 <-> IC1.8 <-> R15.1 <-> R16.2 Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.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.1 + C11.1 <-> IC1.9 <-> R16.1 <-> R17.1 + C12.1 <-> IC1.10 <-> 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.A <-> IC3.10 <-> IC3.13 <-> R24.2 - C16.1 <-> IC3.12 + C15.2 <-> D2.A <-> IC3.12 <-> IC3.9 <-> R24.2 + C16.1 <-> IC3.10 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.- <-> 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 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.10 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> 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 C4.2 <-> R6.1 <-> Range.2 C5.1 <-> IC1.1 <-> IC1.2 <-> R3.1 <-> R9.2 - C6.1 <-> IC1.10 + C6.1 <-> IC1.12 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.K <-> IC3.14 + D2.K <-> IC3.8 D3.A <-> IC3.7 - IC1.4 <-> IC2.8 <-> IC3.4 + IC1.13 <-> R11.1 <-> R7.2 <-> R9.1 + IC1.14 <-> R10.1 <-> R7.1 <-> R8.1 + IC1.4 <-> IC2.14 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 - IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 - IC1.9 <-> R11.1 <-> R7.2 <-> R9.1 - IC2.10 <-> IC2.13 <-> R20.2 IC2.11 <-> IC2.2 + IC2.12 <-> IC2.9 <-> R20.2 IC2.4 <-> IC3.1 - IC2.6 <-> IC3.8 - IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 + IC2.6 <-> IC3.14 + IC3.13 <-> IC3.3 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 R28.2 <-> Range.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 7adb6a61..689f159c 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 @@ -5,38 +5,38 @@ Switch setup: [ Bass Switch.ON1:Range.ON1 ] 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.1 + C10.2 <-> C11.2 <-> IC1.8 <-> R15.1 <-> R16.2 + C11.1 <-> IC1.9 <-> R16.1 <-> R17.1 + C12.1 <-> IC1.10 <-> 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.A <-> IC3.10 <-> IC3.13 <-> R24.2 - C16.1 <-> IC3.12 + C15.2 <-> D2.A <-> IC3.12 <-> IC3.9 <-> R24.2 + C16.1 <-> IC3.10 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.- <-> 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 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.10 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> 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 C4.2 <-> R28.2 <-> R6.1 C5.1 <-> IC1.1 <-> IC1.2 <-> R3.1 <-> R9.2 - C6.1 <-> IC1.10 + C6.1 <-> IC1.12 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.K <-> IC3.14 + D2.K <-> IC3.8 D3.A <-> IC3.7 - IC1.4 <-> IC2.8 <-> IC3.4 + IC1.13 <-> R11.1 <-> R7.2 <-> R9.1 + IC1.14 <-> R10.1 <-> R7.1 <-> R8.1 + IC1.4 <-> IC2.14 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 - IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 - IC1.9 <-> R11.1 <-> R7.2 <-> R9.1 - IC2.10 <-> IC2.13 <-> R20.2 IC2.11 <-> IC2.2 + IC2.12 <-> IC2.9 <-> R20.2 IC2.4 <-> IC3.1 - IC2.6 <-> IC3.8 - IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 + IC2.6 <-> IC3.14 + IC3.13 <-> IC3.3 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 Switch setup: [ Bass Switch.ON1:Range.ON2 ] @@ -46,119 +46,119 @@ Switch setup: [ Bass Switch.ON1:Range.ON2 ] 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.1 + C10.2 <-> C11.2 <-> IC1.8 <-> R15.1 <-> R16.2 + C11.1 <-> IC1.9 <-> R16.1 <-> R17.1 + C12.1 <-> IC1.10 <-> 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.A <-> IC3.10 <-> IC3.13 <-> R24.2 - C16.1 <-> IC3.12 + C15.2 <-> D2.A <-> IC3.12 <-> IC3.9 <-> R24.2 + C16.1 <-> IC3.10 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.- <-> 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 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.10 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> 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 C4.2 <-> R6.1 C5.1 <-> IC1.1 <-> IC1.2 <-> R3.1 <-> R9.2 - C6.1 <-> IC1.10 + C6.1 <-> IC1.12 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 - D2.K <-> IC3.14 + D2.K <-> IC3.8 D3.A <-> IC3.7 - IC1.4 <-> IC2.8 <-> IC3.4 + IC1.13 <-> R11.1 <-> R7.2 <-> R9.1 + IC1.14 <-> R10.1 <-> R7.1 <-> R8.1 + IC1.4 <-> IC2.14 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 - IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 - IC1.9 <-> R11.1 <-> R7.2 <-> R9.1 - IC2.10 <-> IC2.13 <-> R20.2 IC2.11 <-> IC2.2 + IC2.12 <-> IC2.9 <-> R20.2 IC2.4 <-> IC3.1 - IC2.6 <-> IC3.8 - IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 + IC2.6 <-> IC3.14 + IC3.13 <-> IC3.3 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 Switch setup: [ Bass Switch.ON2:Range.ON1 ] Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Blend.3 <-> C10.2 <-> C11.2 <-> IC1.8 <-> 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.1 + C11.1 <-> IC1.9 <-> R16.1 <-> R17.1 + C12.1 <-> IC1.10 <-> 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.A <-> IC3.10 <-> IC3.13 <-> R24.2 - C16.1 <-> IC3.12 + C15.2 <-> D2.A <-> IC3.12 <-> IC3.9 <-> R24.2 + C16.1 <-> IC3.10 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.- <-> 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 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.10 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> 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 C4.2 <-> R28.2 <-> R6.1 C5.1 <-> IC1.1 <-> IC1.2 <-> R3.1 <-> R9.2 - C6.1 <-> IC1.10 + C6.1 <-> IC1.12 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 C8.1 <-> R13.2 <-> R14.1 - D2.K <-> IC3.14 + D2.K <-> IC3.8 D3.A <-> IC3.7 - IC1.4 <-> IC2.8 <-> IC3.4 + IC1.13 <-> R11.1 <-> R7.2 <-> R9.1 + IC1.14 <-> R10.1 <-> R7.1 <-> R8.1 + IC1.4 <-> IC2.14 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 - IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 - IC1.9 <-> R11.1 <-> R7.2 <-> R9.1 - IC2.10 <-> IC2.13 <-> R20.2 IC2.11 <-> IC2.2 + IC2.12 <-> IC2.9 <-> R20.2 IC2.4 <-> IC3.1 - IC2.6 <-> IC3.8 - IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 + IC2.6 <-> IC3.14 + IC3.13 <-> IC3.3 <-> R19.2 <-> R22.2 IC3.5 <-> R18.2 Switch setup: [ Bass Switch.ON2:Range.ON2 ] Blend.1 <-> C5.2 <-> C6.2 <-> Q1.2 <-> Q1.3 <-> R12.1 Blend.2 <-> C17.1 - Blend.3 <-> C10.2 <-> C11.2 <-> IC1.14 <-> R15.1 <-> R16.2 + Blend.3 <-> C10.2 <-> C11.2 <-> IC1.8 <-> 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.1 + C11.1 <-> IC1.9 <-> R16.1 <-> R17.1 + C12.1 <-> IC1.10 <-> 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.A <-> IC3.10 <-> IC3.13 <-> R24.2 - C16.1 <-> IC3.12 + C15.2 <-> D2.A <-> IC3.12 <-> IC3.9 <-> R24.2 + C16.1 <-> IC3.10 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.- <-> 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 + C18.- <-> C20.+ <-> IC1.11 <-> IC2.10 <-> IC2.3 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> 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 C4.2 <-> R6.1 C5.1 <-> IC1.1 <-> IC1.2 <-> R3.1 <-> R9.2 - C6.1 <-> IC1.10 + C6.1 <-> IC1.12 C7.1 <-> R10.2 <-> R13.1 C7.2 <-> C8.2 <-> C9.1 <-> Hi Filter.2 C8.1 <-> R13.2 <-> R14.1 - D2.K <-> IC3.14 + D2.K <-> IC3.8 D3.A <-> IC3.7 - IC1.4 <-> IC2.8 <-> IC3.4 + IC1.13 <-> R11.1 <-> R7.2 <-> R9.1 + IC1.14 <-> R10.1 <-> R7.1 <-> R8.1 + IC1.4 <-> IC2.14 <-> IC3.4 IC1.7 <-> R18.1 <-> R19.1 <-> R2.1 <-> R6.2 - IC1.8 <-> R10.1 <-> R7.1 <-> R8.1 - IC1.9 <-> R11.1 <-> R7.2 <-> R9.1 - IC2.10 <-> IC2.13 <-> R20.2 IC2.11 <-> IC2.2 + IC2.12 <-> IC2.9 <-> R20.2 IC2.4 <-> IC3.1 - IC2.6 <-> IC3.8 - IC3.3 <-> IC3.9 <-> R19.2 <-> R22.2 + IC2.6 <-> IC3.14 + IC3.13 <-> IC3.3 <-> R19.2 <-> R22.2 IC3.5 <-> R18.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 904433e1..c94f2355 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 @@ -2,14 +2,14 @@ Switch setup: [ ALL ] C1.+ <-> Q1.3 C1.- <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 - C2.+ <-> IC1.7 <-> VR1.3 + C2.+ <-> IC1.6 <-> VR1.3 C2.- <-> IC1.3 <-> IC1.4 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 C3.2 <-> VR2.3 - C4.1 <-> IC1.6 - C5.+ <-> IC1.8 + C4.1 <-> IC1.7 + C5.+ <-> IC1.5 IC1.1 <-> VR3.1 <-> VR3.2 IC1.2 <-> VR2.2 - IC1.5 <-> VR3.3 + IC1.8 <-> VR3.3 R1.2 <-> R3.1 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 904433e1..c94f2355 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 @@ -2,14 +2,14 @@ Switch setup: [ ALL ] C1.+ <-> Q1.3 C1.- <-> C4.2 <-> R2.2 <-> R3.2 <-> VR2.1 - C2.+ <-> IC1.7 <-> VR1.3 + C2.+ <-> IC1.6 <-> VR1.3 C2.- <-> IC1.3 <-> IC1.4 C3.1 <-> Q1.1 <-> VR1.1 <-> VR1.2 C3.2 <-> VR2.3 - C4.1 <-> IC1.6 - C5.+ <-> IC1.8 + C4.1 <-> IC1.7 + C5.+ <-> IC1.5 IC1.1 <-> VR3.1 <-> VR3.2 IC1.2 <-> VR2.2 - IC1.5 <-> VR3.3 + IC1.8 <-> VR3.3 R1.2 <-> R3.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 3611a7b0..d73f3f9b 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 @@ -4,39 +4,39 @@ Switch setup: [ ALL ] C10.1 <-> C9.1 <-> R22.1 C10.2 <-> IC3.3 <-> R23.1 C11.1 <-> C12.1 <-> R27.2 - C11.2 <-> IC3.9 <-> R28.2 - C12.2 <-> IC3.8 <-> R28.1 <-> R31.1 + C11.2 <-> IC3.13 <-> R28.2 + C12.2 <-> IC3.14 <-> R28.1 <-> R31.1 C2.1 <-> IC1.7 <-> R5.1 C2.2 <-> R6.1 - C3.1 <-> IC1.13 <-> IC1.14 <-> R8.1 + C3.1 <-> IC1.8 <-> IC1.9 <-> R8.1 C3.2 <-> R12.1 C4.1 <-> IC2.1 <-> R14.1 C4.2 <-> R15.2 C5.1 <-> IC2.7 <-> R18.2 C5.2 <-> R19.1 - C6.1 <-> IC2.13 <-> IC2.14 <-> R21.1 + C6.1 <-> IC2.8 <-> IC2.9 <-> R21.1 C7.1 <-> C8.1 <-> R21.2 - C9.2 <-> IC2.8 <-> IC2.9 - D1.A <-> D2.K <-> IC2.12 <-> R19.2 + C9.2 <-> IC2.13 <-> IC2.14 + D1.A <-> D2.K <-> IC2.10 <-> 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.10 <-> R7.1 IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.4 - IC1.12 <-> R7.1 + IC1.12 <-> R8.2 <-> R9.1 + IC1.13 <-> R10.1 <-> R11.2 + IC1.14 <-> R11.1 IC1.2 <-> R2.1 <-> R3.1 IC1.3 <-> R1.1 - IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.5 + IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.8 IC1.6 <-> R4.2 <-> R5.2 - IC1.8 <-> R11.1 - IC1.9 <-> R10.1 <-> R11.2 - IC2.10 <-> R20.2 + IC2.12 <-> R20.2 IC2.2 <-> R12.2 <-> R13.1 <-> R14.2 IC2.5 <-> R15.1 <-> R16.2 IC2.6 <-> R17.1 <-> R18.1 IC3.1 <-> R22.2 <-> R24.1 - IC3.13 <-> R26.2 <-> R29.1 - IC3.14 <-> R29.2 <-> R30.2 IC3.2 <-> IC3.5 <-> R24.2 IC3.6 <-> IC3.7 <-> R26.1 <-> R27.1 + IC3.8 <-> R29.2 <-> R30.2 + IC3.9 <-> R26.2 <-> R29.1 IC4.1 <-> R32.1 <-> VR1.1 IC4.2 <-> R30.1 <-> R32.2 IC4.6 <-> IC4.7 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 3611a7b0..d73f3f9b 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 @@ -4,39 +4,39 @@ Switch setup: [ ALL ] C10.1 <-> C9.1 <-> R22.1 C10.2 <-> IC3.3 <-> R23.1 C11.1 <-> C12.1 <-> R27.2 - C11.2 <-> IC3.9 <-> R28.2 - C12.2 <-> IC3.8 <-> R28.1 <-> R31.1 + C11.2 <-> IC3.13 <-> R28.2 + C12.2 <-> IC3.14 <-> R28.1 <-> R31.1 C2.1 <-> IC1.7 <-> R5.1 C2.2 <-> R6.1 - C3.1 <-> IC1.13 <-> IC1.14 <-> R8.1 + C3.1 <-> IC1.8 <-> IC1.9 <-> R8.1 C3.2 <-> R12.1 C4.1 <-> IC2.1 <-> R14.1 C4.2 <-> R15.2 C5.1 <-> IC2.7 <-> R18.2 C5.2 <-> R19.1 - C6.1 <-> IC2.13 <-> IC2.14 <-> R21.1 + C6.1 <-> IC2.8 <-> IC2.9 <-> R21.1 C7.1 <-> C8.1 <-> R21.2 - C9.2 <-> IC2.8 <-> IC2.9 - D1.A <-> D2.K <-> IC2.12 <-> R19.2 + C9.2 <-> IC2.13 <-> IC2.14 + D1.A <-> D2.K <-> IC2.10 <-> 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.10 <-> R7.1 IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.4 - IC1.12 <-> R7.1 + IC1.12 <-> R8.2 <-> R9.1 + IC1.13 <-> R10.1 <-> R11.2 + IC1.14 <-> R11.1 IC1.2 <-> R2.1 <-> R3.1 IC1.3 <-> R1.1 - IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.5 + IC1.4 <-> IC2.4 <-> IC3.4 <-> IC4.8 IC1.6 <-> R4.2 <-> R5.2 - IC1.8 <-> R11.1 - IC1.9 <-> R10.1 <-> R11.2 - IC2.10 <-> R20.2 + IC2.12 <-> R20.2 IC2.2 <-> R12.2 <-> R13.1 <-> R14.2 IC2.5 <-> R15.1 <-> R16.2 IC2.6 <-> R17.1 <-> R18.1 IC3.1 <-> R22.2 <-> R24.1 - IC3.13 <-> R26.2 <-> R29.1 - IC3.14 <-> R29.2 <-> R30.2 IC3.2 <-> IC3.5 <-> R24.2 IC3.6 <-> IC3.7 <-> R26.1 <-> R27.1 + IC3.8 <-> R29.2 <-> R30.2 + IC3.9 <-> R26.2 <-> R29.1 IC4.1 <-> R32.1 <-> VR1.1 IC4.2 <-> R30.1 <-> R32.2 IC4.6 <-> IC4.7 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 b3b261f4..040d332e 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 @@ -5,24 +5,24 @@ Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> R1.2 <-> S1.3 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.1 <-> IC2.5 <-> Q2.1 <-> R15.2 C11.2 <-> R14.2 - C12.2 <-> C6.2 <-> C7.+ <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 + C12.2 <-> C6.2 <-> C7.+ <-> IC1.8 <-> IC2.8 <-> 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.+ <-> R5.1 C4.1 <-> C8.+ <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 C4.2 <-> Level.3 - C5.+ <-> IC1.8 <-> R8.2 + C5.+ <-> IC1.5 <-> R8.2 C8.- <-> D1.A <-> R10.1 - C9.+ <-> IC1.6 <-> R9.2 + C9.+ <-> IC1.7 <-> R9.2 C9.- <-> D2.A <-> R11.1 IC1.2 <-> R5.2 <-> R6.1 - IC1.7 <-> R7.2 <-> R9.1 + IC1.6 <-> 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 + IC2.6 <-> R13.2 <-> R16.1 + IC2.7 <-> Q1.2 <-> Q1.3 <-> R16.2 Level.2 <-> S1.8 R12.2 <-> Ratio.1 S1.1 <-> S1.9 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 142c9f23..4284d4ee 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 @@ -5,24 +5,24 @@ Switch setup: [ ALL ] C1.1 <-> R2.2 C1.2 <-> R1.2 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.1 <-> IC2.5 <-> Q2.1 <-> R15.2 C11.2 <-> R14.2 - C12.2 <-> C6.2 <-> C7.+ <-> IC1.5 <-> IC2.5 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> VR1.1 <-> VR1.2 + C12.2 <-> C6.2 <-> C7.+ <-> IC1.8 <-> IC2.8 <-> 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.+ <-> R5.1 C4.1 <-> C8.+ <-> IC1.1 <-> R6.2 <-> R7.1 <-> R8.1 C4.2 <-> Level.3 - C5.+ <-> IC1.8 <-> R8.2 + C5.+ <-> IC1.5 <-> R8.2 C8.- <-> D1.A <-> R10.1 - C9.+ <-> IC1.6 <-> R9.2 + C9.+ <-> IC1.7 <-> R9.2 C9.- <-> D2.A <-> R11.1 IC1.2 <-> R5.2 <-> R6.1 - IC1.7 <-> R7.2 <-> R9.1 + IC1.6 <-> 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 + IC2.6 <-> R13.2 <-> R16.1 + IC2.7 <-> Q1.2 <-> Q1.3 <-> R16.2 R12.2 <-> Ratio.1 Thres.1 <-> Thres.2 Thres.3 <-> VR1.3 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 3337f9c9..fbfec55a 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 @@ -2,14 +2,14 @@ Switch setup: [ ALL ] 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.1 <-> C3.2 <-> IC1.5 <-> R7.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 + D1.K <-> D2.A <-> IC1.7 <-> 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 + IC1.6 <-> R3.1 <-> R4.1 + IC1.8 <-> R1.2 <-> S1.1 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 cb8ada17..9086cf91 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 @@ -2,14 +2,14 @@ Switch setup: [ ALL ] 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.1 <-> C3.2 <-> IC1.5 <-> R7.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 + D1.K <-> D2.A <-> IC1.7 <-> P1.3 <-> R5.2 <-> R6.1 IC1.1 <-> IC1.2 IC1.3 <-> P1.2 - IC1.5 <-> R1.2 - IC1.7 <-> R3.1 <-> R4.1 + IC1.6 <-> R3.1 <-> R4.1 + IC1.8 <-> R1.2 P2A.3 <-> R6.2 P2B.3 <-> R7.2