mockito fix

Resolved all 17 conflicts in favour of master, which carries the refactored
descendant of this branch's maker board work: shared appearance constants in
AbstractMakerBoard instead of per-board duplicates, POMs at 6.6.0, and the
released 6.6.0 changelog block.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EBnQGbrTNYvYEJFxFr9xW5

.github/workflows/sign-launcher.yml

@@ -1,81 +0,0 @@
-name: Sign Windows Launcher
-
-# The launch4j launcher is a prebuilt binary that changes only when it is regenerated, and
-# Inno Setup cannot sign its payload after the fact. It is therefore signed on its own here
-# and the signed copy is committed to the repository, which keeps releases down to a single
-# signing request. Run this whenever deploy/win/diylc-x64.exe is rebuilt, and once more when
-# the production certificate replaces the test certificate.
-
-on:
-  workflow_dispatch:
-    inputs:
-      signing-policy-slug:
-        description: 'SignPath signing policy'
-        type: choice
-        default: test-signing
-        options:
-          - test-signing
-          - release-signing
-
-permissions:
-  actions: read
-  contents: read
-
-env:
-  SIGNPATH_ORGANIZATION_ID: 95470a00-59e6-430c-9c81-7393ad16d4e8
-  SIGNPATH_PROJECT_SLUG: diy-layout-creator
-
-jobs:
-  launcher:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v7
-
-      - name: Upload unsigned launcher
-        id: upload-unsigned-launcher
-        uses: actions/upload-artifact@v7
-        with:
-          name: unsigned-launcher
-          path: diylc/diylc-swing/deploy/win/diylc-x64.exe
-          if-no-files-found: error
-          retention-days: 1
-
-      - name: Sign launcher
-        uses: signpath/github-action-submit-signing-request@v3
-        with:
-          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
-          organization-id: ${{ env.SIGNPATH_ORGANIZATION_ID }}
-          project-slug: ${{ env.SIGNPATH_PROJECT_SLUG }}
-          signing-policy-slug: ${{ inputs.signing-policy-slug }}
-          artifact-configuration-slug: windows-launcher
-          github-artifact-id: ${{ steps.upload-unsigned-launcher.outputs.artifact-id }}
-          wait-for-completion: true
-          output-artifact-directory: signed
-
-      - name: Confirm the signature is present
-        run: python3 diylc/diylc-swing/deploy/win/signpath/is-signed.py signed/diylc-x64.exe
-
-      - name: Upload signed launcher
-        uses: actions/upload-artifact@v7
-        with:
-          name: signed-launcher
-          path: signed/diylc-x64.exe
-          if-no-files-found: error
-
-      - name: Explain the manual step
-        env:
-          POLICY: ${{ inputs.signing-policy-slug }}
-        run: |
-          {
-            echo "## Signed with the \`$POLICY\` policy"
-            echo
-            echo "Download the **signed-launcher** artifact and commit it over"
-            echo "\`diylc/diylc-swing/deploy/win/diylc-x64.exe\`."
-            if [ "$POLICY" != "release-signing" ]; then
-              echo
-              echo "> This is a test signature. Do not commit it — a test-signed binary in a release"
-              echo "> is worse than an unsigned one, because it names a publisher Windows does not trust."
-            fi
-          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/sign-windows.yml

@@ -1,116 +0,0 @@
-name: Sign Windows Artifacts
-
-# Signs the Inno Setup installer. The launcher it embeds is signed separately and committed
-# by the Sign Windows Launcher workflow, because Inno Setup cannot sign its payload after the
-# fact and the launcher changes only when launch4j regenerates it.
-
-on:
-  workflow_dispatch:
-    inputs:
-      signing-policy-slug:
-        description: 'SignPath signing policy'
-        type: choice
-        default: test-signing
-        options:
-          - test-signing
-          - release-signing
-
-permissions:
-  actions: read
-  contents: read
-
-env:
-  SIGNPATH_ORGANIZATION_ID: 95470a00-59e6-430c-9c81-7393ad16d4e8
-  SIGNPATH_PROJECT_SLUG: diy-layout-creator
-
-jobs:
-  windows:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v7
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v6
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: maven
-
-      # Nothing downstream fails when the committed launcher is unsigned: the zip and the
-      # installed application would just silently ship an unsigned executable.
-      - name: Check the committed launcher carries a signature
-        env:
-          POLICY: ${{ inputs.signing-policy-slug }}
-        run: |
-          if python3 diylc/diylc-swing/deploy/win/signpath/is-signed.py \
-              diylc/diylc-swing/deploy/win/diylc-x64.exe; then
-            exit 0
-          fi
-          if [ "$POLICY" = "release-signing" ]; then
-            echo "::error::deploy/win/diylc-x64.exe is unsigned. Run the Sign Windows Launcher workflow with the release policy, commit the signed launcher, then re-run this workflow."
-            exit 1
-          fi
-          echo "::warning::deploy/win/diylc-x64.exe is unsigned; the zip and the installed application will ship an unsigned launcher."
-
-      - name: Resolve project version
-        working-directory: diylc
-        run: |
-          echo "DIYLC_VERSION=$(mvn -q -N help:evaluate -Dexpression=project.version -DforceStdout)" >> "$GITHUB_ENV"
-
-      - name: Build Windows zip and installer
-        working-directory: diylc
-        run: |
-          mvn -B -DskipTests -P win64-zip package
-          mvn -B -DskipTests -P win64-installer package
-
-      # The artifact configuration matches a fixed path, so the versioned installer is staged
-      # under a stable name for the round trip and renamed back afterwards.
-      - name: Stage installer for signing
-        run: |
-          mkdir -p staging
-          cp "diylc/diylc-swing/target/diylc-${DIYLC_VERSION}-win64.exe" staging/diylc-setup.exe
-
-      - name: Upload unsigned installer
-        id: upload-unsigned-installer
-        uses: actions/upload-artifact@v7
-        with:
-          name: unsigned-installer
-          path: staging/diylc-setup.exe
-          if-no-files-found: error
-          retention-days: 1
-
-      - name: Sign installer
-        uses: signpath/github-action-submit-signing-request@v3
-        with:
-          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
-          organization-id: ${{ env.SIGNPATH_ORGANIZATION_ID }}
-          project-slug: ${{ env.SIGNPATH_PROJECT_SLUG }}
-          signing-policy-slug: ${{ inputs.signing-policy-slug }}
-          artifact-configuration-slug: windows-installer
-          github-artifact-id: ${{ steps.upload-unsigned-installer.outputs.artifact-id }}
-          wait-for-completion: true
-          output-artifact-directory: signed
-
-      - name: Restore signed installer under its release name
-        run: |
-          python3 diylc/diylc-swing/deploy/win/signpath/is-signed.py signed/diylc-setup.exe
-          cp signed/diylc-setup.exe "diylc/diylc-swing/target/diylc-${DIYLC_VERSION}-win64.exe"
-
-      - name: Report signatures
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y osslsigncode
-          # chain validation fails against the self-signed test certificate by design; what
-          # matters is that a signature is present and names the expected subject
-          osslsigncode verify -in "diylc/diylc-swing/target/diylc-${DIYLC_VERSION}-win64.exe" || true
-
-      - name: Upload signed Windows artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: diylc-windows-signed
-          path: |
-            diylc/diylc-swing/target/diylc-${{ env.DIYLC_VERSION }}-win64.exe
-            diylc/diylc-swing/target/diylc-${{ env.DIYLC_VERSION }}-win64.zip
-          if-no-files-found: error

CLAUDE.md

@@ -7,7 +7,7 @@ that file before editing anything under `diylc/`.
 
 | Path | Contents |
 | --- | --- |
-| `diylc/` | The application. Maven reactor with `diylc-core`, `diylc-library`, `diylc-swing`, and the build-time `diylc-processor`. This is where nearly all work happens. |
+| `diylc/` | The application. Maven reactor with `diylc-core`, `diylc-library`, `diylc-swing`. This is where nearly all work happens. |
 | `diylc-regression-data/` | Sample `.diy` projects plus reference PNG and netlist outputs used by the regression suite, and the historical reports. |
 | `diylc-server-api/` | PHP backend for cloud and collaboration features. Runs in an isolated environment on diy-fever.com and cannot be tested locally — do not modify unless explicitly asked. |
 | `snap/` | Snap packaging metadata. |

README.md

@@ -8,9 +8,7 @@ It provides an intuitive, drag-and-drop interface for placing components, arrang
 
 ### 🚀 Quick Links
 * **[⬇️ Download the latest release](https://github.com/bancika/diy-layout-creator/releases/latest)** for all platforms.
-* **[⚡ Quick Start Guide](https://github.com/bancika/diy-layout-creator/blob/wiki/QuickStart.md)** if you are just getting into DIYLC.
 * **[📄 Read the Wiki](https://github.com/bancika/diy-layout-creator/tree/wiki)** for free user and developer documentation.
-* **[☁️ Browse Cloud Projects](https://diy-fever.com/software/diylc/cloud-project-browser/)** search and browse community projects and download .DIY files
 
 > 🍎 **Mac users:** Gatekeeper may block DIYLC since it's from an independent developer. [Read this guide](https://support.apple.com/kb/ph18657?locale=en_US) on how to easily allow DIYLC on your Mac.
 

diylc-regression-data/input/cloud/netlist/100_excl_switches.txt

@@ -1,21 +1,21 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.1
 	C1.2 <-> R1.1
-	C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1
-	C10.- <-> Q1.1 <-> Q1.2 <-> R11.2
+	C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1
+	C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2
 	C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3
-	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
+	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
 	C13.2 <-> R16.1
 	C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1
 	C14.2 <-> R21.1
-	C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2
-	C16.+ <-> Q5.3 <-> R20.1
+	C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2
+	C16.1 <-> Q5.3 <-> R20.1
 	C3.1 <-> IC1.7 <-> 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
+	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
 	IC1.8 <-> R19.1
 	Q1.3 <-> R5.2 <-> R6.2
 	Q5.1 <-> Q5.2

diylc-regression-data/input/cloud/netlist/100_incl_switches.txt

@@ -1,21 +1,21 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.1
 	C1.2 <-> R1.1
-	C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1
-	C10.- <-> Q1.1 <-> Q1.2 <-> R11.2
+	C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1
+	C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2
 	C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3
-	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
+	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
 	C13.2 <-> R16.1
 	C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1
 	C14.2 <-> R21.1
-	C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2
-	C16.+ <-> Q5.3 <-> R20.1
+	C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2
+	C16.1 <-> Q5.3 <-> R20.1
 	C3.1 <-> IC1.7 <-> 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
+	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
 	IC1.8 <-> R19.1
 	Q1.3 <-> R5.2 <-> R6.2
 	Q5.1 <-> Q5.2

diylc-regression-data/input/cloud/netlist/101_excl_switches.txt

@@ -1,21 +1,21 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.1
 	C1.2 <-> R1.1
-	C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1
-	C10.- <-> Q1.1 <-> Q1.2 <-> R11.2
+	C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1
+	C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2
 	C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3
-	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
+	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
 	C13.2 <-> R16.1
 	C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1
 	C14.2 <-> R21.1
-	C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2
-	C16.+ <-> Q5.3 <-> R20.1
+	C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2
+	C16.1 <-> Q5.3 <-> R20.1
 	C3.1 <-> IC1.7 <-> 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
+	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
 	IC1.8 <-> R19.1
 	Q1.3 <-> R5.2 <-> R6.2
 	Q5.1 <-> Q5.2

diylc-regression-data/input/cloud/netlist/101_incl_switches.txt

@@ -1,21 +1,21 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.1
 	C1.2 <-> R1.1
-	C10.+ <-> IC1.2 <-> R12.1 <-> VR1.1
-	C10.- <-> Q1.1 <-> Q1.2 <-> R11.2
+	C10.1 <-> IC1.2 <-> R12.1 <-> VR1.1
+	C10.2 <-> Q1.1 <-> Q1.2 <-> R11.2
 	C11.1 <-> IC1.3 <-> R13.1 <-> R14.1 <-> VR1.3
-	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
+	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
 	C13.2 <-> R16.1
 	C14.1 <-> C15.1 <-> Q2.1 <-> Q2.2 <-> R15.1
 	C14.2 <-> R21.1
-	C15.2 <-> D3.K <-> Q3.2 <-> Q3.3 <-> R18.2
-	C16.+ <-> Q5.3 <-> R20.1
+	C15.2 <-> D3.2 <-> Q3.2 <-> Q3.3 <-> R18.2
+	C16.1 <-> Q5.3 <-> R20.1
 	C3.1 <-> IC1.7 <-> 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
+	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
 	IC1.8 <-> R19.1
 	Q1.3 <-> R5.2 <-> R6.2
 	Q5.1 <-> Q5.2

diylc-regression-data/input/cloud/netlist/102_excl_switches.txt

@@ -1,16 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
 	C1.2 <-> R2.1
 	C2.2 <-> R11.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
+	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
 	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.+ <-> R12.1
+	C8.1 <-> R12.1
 	IC1.2 <-> R4.2
 	IC1.3 <-> R2.2 <-> R3.1
 	IC1.7 <-> R5.2 <-> R6.2

diylc-regression-data/input/cloud/netlist/102_incl_switches.txt

@@ -1,16 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
 	C1.2 <-> R2.1
 	C2.2 <-> R11.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
+	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
 	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.+ <-> R12.1
+	C8.1 <-> R12.1
 	IC1.2 <-> R4.2
 	IC1.3 <-> R2.2 <-> R3.1
 	IC1.7 <-> R5.2 <-> R6.2

diylc-regression-data/input/cloud/netlist/103_excl_switches.txt

@@ -1,16 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
 	C1.2 <-> R2.1
 	C2.2 <-> R11.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
+	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
 	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.+ <-> R12.1
+	C8.1 <-> R12.1
 	IC1.2 <-> R4.2
 	IC1.3 <-> R2.2 <-> R3.1
 	IC1.7 <-> R5.2 <-> R6.2

diylc-regression-data/input/cloud/netlist/103_incl_switches.txt

@@ -1,16 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
 	C1.2 <-> R2.1
 	C2.2 <-> R11.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
+	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
 	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.+ <-> R12.1
+	C8.1 <-> R12.1
 	IC1.2 <-> R4.2
 	IC1.3 <-> R2.2 <-> R3.1
 	IC1.7 <-> R5.2 <-> R6.2

diylc-regression-data/input/cloud/netlist/104_excl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.2 <-> Q1.3 <-> R1.2
 	C2.1 <-> R3.1

diylc-regression-data/input/cloud/netlist/104_incl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.2 <-> Q1.3 <-> R1.2
 	C2.1 <-> R3.1

diylc-regression-data/input/cloud/netlist/105_excl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.3 <-> R2.2 <-> R3.1
 	C1.2 <-> R1.1
-	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
+	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
 	C5.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.1 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.1 <-> R7.1
 	IC1.2 <-> R4.1 <-> R5.1
 

diylc-regression-data/input/cloud/netlist/105_incl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.3 <-> R2.2 <-> R3.1
 	C1.2 <-> R1.1
-	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
+	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
 	C5.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.1 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.1 <-> R7.1
 	IC1.2 <-> R4.1 <-> R5.1
 

diylc-regression-data/input/cloud/netlist/106_excl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.3 <-> R2.2 <-> R3.1
 	C1.2 <-> R1.1
-	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
+	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
 	C5.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.1 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.1 <-> R7.1
 	IC1.2 <-> R4.1 <-> R5.1
 

diylc-regression-data/input/cloud/netlist/106_incl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.3 <-> R2.2 <-> R3.1
 	C1.2 <-> R1.1
-	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
+	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
 	C5.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.1 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.1 <-> R7.1
 	IC1.2 <-> R4.1 <-> R5.1
 

diylc-regression-data/input/cloud/netlist/107_excl_switches.txt

@@ -1,7 +1,7 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R3.2 <-> R5.1
+	C1.2 <-> Q1.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: [ ALL ]
 	C2.1 <-> R5.2 <-> R6.1
 	C3.2 <-> R8.1
 	C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2
-	C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2
-	C5.2 <-> D1.K <-> D2.A
+	C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2
+	C5.2 <-> D1.2 <-> D2.1
 	C6.2 <-> R12.2
 	C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1
-	C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
-	C8.2 <-> D3.K <-> D4.A
+	C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
+	C8.2 <-> D3.2 <-> D4.1
 	C9.2 <-> R17.1
-	Q1.1 <-> Q1.2 <-> R4.1
+	Q1.1 <-> R4.1
 	Q2.1 <-> Q2.2 <-> R11.1
 	Q3.1 <-> Q3.2 <-> R16.1
 	Q4.1 <-> Q4.2 <-> R22.1

diylc-regression-data/input/cloud/netlist/107_incl_switches.txt

@@ -1,7 +1,7 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R3.2 <-> R5.1
+	C1.2 <-> Q1.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: [ ALL ]
 	C2.1 <-> R5.2 <-> R6.1
 	C3.2 <-> R8.1
 	C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2
-	C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2
-	C5.2 <-> D1.K <-> D2.A
+	C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2
+	C5.2 <-> D1.2 <-> D2.1
 	C6.2 <-> R12.2
 	C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1
-	C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
-	C8.2 <-> D3.K <-> D4.A
+	C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
+	C8.2 <-> D3.2 <-> D4.1
 	C9.2 <-> R17.1
-	Q1.1 <-> Q1.2 <-> R4.1
+	Q1.1 <-> R4.1
 	Q2.1 <-> Q2.2 <-> R11.1
 	Q3.1 <-> Q3.2 <-> R16.1
 	Q4.1 <-> Q4.2 <-> R22.1

diylc-regression-data/input/cloud/netlist/108_excl_switches.txt

@@ -1,7 +1,7 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R3.2 <-> R5.1
+	C1.2 <-> Q1.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: [ ALL ]
 	C2.1 <-> R5.2 <-> R6.1
 	C3.2 <-> R8.1
 	C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2
-	C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2
-	C5.2 <-> D1.K <-> D2.A
+	C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2
+	C5.2 <-> D1.2 <-> D2.1
 	C6.2 <-> R12.2
 	C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1
-	C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
-	C8.2 <-> D3.K <-> D4.A
+	C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
+	C8.2 <-> D3.2 <-> D4.1
 	C9.2 <-> R17.1
-	Q1.1 <-> Q1.2 <-> R4.1
+	Q1.1 <-> R4.1
 	Q2.1 <-> Q2.2 <-> R11.1
 	Q3.1 <-> Q3.2 <-> R16.1
 	Q4.1 <-> Q4.2 <-> R22.1

diylc-regression-data/input/cloud/netlist/108_incl_switches.txt

@@ -1,7 +1,7 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R3.2 <-> R5.1
+	C1.2 <-> Q1.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: [ ALL ]
 	C2.1 <-> R5.2 <-> R6.1
 	C3.2 <-> R8.1
 	C4.1 <-> C5.1 <-> C6.1 <-> R10.1 <-> R9.2
-	C4.2 <-> D1.A <-> D2.K <-> Q2.3 <-> R10.2 <-> R8.2
-	C5.2 <-> D1.K <-> D2.A
+	C4.2 <-> D1.1 <-> D2.2 <-> Q2.3 <-> R10.2 <-> R8.2
+	C5.2 <-> D1.2 <-> D2.1
 	C6.2 <-> R12.2
 	C7.1 <-> C8.1 <-> C9.1 <-> R13.1 <-> R15.1 <-> R18.1
-	C7.2 <-> D3.A <-> D4.K <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
-	C8.2 <-> D3.K <-> D4.A
+	C7.2 <-> D3.1 <-> D4.2 <-> Q3.3 <-> R12.1 <-> R14.1 <-> R15.2
+	C8.2 <-> D3.2 <-> D4.1
 	C9.2 <-> R17.1
-	Q1.1 <-> Q1.2 <-> R4.1
+	Q1.1 <-> R4.1
 	Q2.1 <-> Q2.2 <-> R11.1
 	Q3.1 <-> Q3.2 <-> R16.1
 	Q4.1 <-> Q4.2 <-> R22.1

diylc-regression-data/input/cloud/netlist/109_excl_switches.txt

@@ -1,12 +1,11 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/109_incl_switches.txt

@@ -1,12 +1,11 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/110_excl_switches.txt

@@ -1,12 +1,11 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/110_incl_switches.txt

@@ -1,12 +1,11 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/111_excl_switches.txt

@@ -1,20 +1,20 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C5.1 <-> R3.1 <-> R4.1
-	C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2
+	C6.1 <-> D2.1 <-> D3.2 <-> 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.K <-> D6.A <-> IC1.7 <-> R6.1
-	C9.+ <-> R6.2
-	D4.K <-> D5.A
-	D6.K <-> D7.A
+	C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1
+	C9.1 <-> R6.2
+	D4.2 <-> D5.1
+	D6.2 <-> D7.1
 

diylc-regression-data/input/cloud/netlist/111_incl_switches.txt

@@ -1,20 +1,20 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C5.1 <-> R3.1 <-> R4.1
-	C6.1 <-> D2.A <-> D3.K <-> IC1.3 <-> R4.2
+	C6.1 <-> D2.1 <-> D3.2 <-> 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.K <-> D6.A <-> IC1.7 <-> R6.1
-	C9.+ <-> R6.2
-	D4.K <-> D5.A
-	D6.K <-> D7.A
+	C8.2 <-> D5.2 <-> D6.1 <-> IC1.7 <-> R6.1
+	C9.1 <-> R6.2
+	D4.2 <-> D5.1
+	D6.2 <-> D7.1
 

diylc-regression-data/input/cloud/netlist/112_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7
 	C5.2 <-> IC1.8

diylc-regression-data/input/cloud/netlist/112_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7
 	C5.2 <-> IC1.8

diylc-regression-data/input/cloud/netlist/113_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7
 	C5.2 <-> IC1.8

diylc-regression-data/input/cloud/netlist/113_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7
 	C5.2 <-> IC1.8

diylc-regression-data/input/cloud/netlist/114_excl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.2
 	C1.2 <-> IC1.3 <-> Q1.1
-	C2.+ <-> IC1.1
-	C2.- <-> R2.2
+	C2.1 <-> IC1.1
+	C2.2 <-> R2.2
 	C3.1 <-> IC1.8
-	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
+	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
 	IC1.5 <-> R2.1
 

diylc-regression-data/input/cloud/netlist/114_incl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.2
 	C1.2 <-> IC1.3 <-> Q1.1
-	C2.+ <-> IC1.1
-	C2.- <-> R2.2
+	C2.1 <-> IC1.1
+	C2.2 <-> R2.2
 	C3.1 <-> IC1.8
-	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
+	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
 	IC1.5 <-> R2.1
 

diylc-regression-data/input/cloud/netlist/115_excl_switches.txt

@@ -1,10 +1,10 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.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
+	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
 	C5.1 <-> Q1.1 <-> R4.1
 	R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3
 

diylc-regression-data/input/cloud/netlist/115_incl_switches.txt

@@ -1,10 +1,10 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R6.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
+	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
 	C5.1 <-> Q1.1 <-> R4.1
 	R2.1 <-> R4.2 <-> VR1.2 <-> VR1.3
 

diylc-regression-data/input/cloud/netlist/116_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.2 <-> C2.2 <-> R1.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
+	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
 	Q2.1 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/116_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.2 <-> C2.2 <-> R1.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
+	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
 	Q2.1 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/117_excl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> C6.1
 	C1.2 <-> R1.1
 	C3.1 <-> IC1.2 <-> R5.1
 	C3.2 <-> R6.1
-	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
+	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
 	IC1.3 <-> R1.2 <-> R2.2
 	IC1.6 <-> R4.1
 	R2.1 <-> R3.1 <-> R4.2

diylc-regression-data/input/cloud/netlist/117_incl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> C6.1
 	C1.2 <-> R1.1
 	C3.1 <-> IC1.2 <-> R5.1
 	C3.2 <-> R6.1
-	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
+	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
 	IC1.3 <-> R1.2 <-> R2.2
 	IC1.6 <-> R4.1
 	R2.1 <-> R3.1 <-> R4.2

diylc-regression-data/input/cloud/netlist/118_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/118_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/119_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/119_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/120_excl_switches.txt

@@ -1,17 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.2 <-> R1.2 <-> R2.2
-	C1.2 <-> C3.- <-> C4.- <-> C7.2 <-> D1.A <-> Gain.1 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.1
+	C1.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> D1.1 <-> Gain.3 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.3
 	C2.1 <-> R3.1
 	C2.2 <-> R2.1
-	C3.+ <-> D1.K <-> R4.2 <-> R5.2
-	C4.+ <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1
+	C3.1 <-> D1.2 <-> R4.2 <-> R5.2
+	C4.1 <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1
 	C5.1 <-> IC1.1 <-> R1.1
-	C5.2 <-> Gain.3
+	C5.2 <-> Gain.1
 	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
 

diylc-regression-data/input/cloud/netlist/120_incl_switches.txt

@@ -1,17 +1,16 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> IC1.2 <-> R1.2 <-> R2.2
-	C1.2 <-> C3.- <-> C4.- <-> C7.2 <-> D1.A <-> Gain.1 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.1
+	C1.2 <-> C3.2 <-> C4.2 <-> C7.2 <-> D1.1 <-> Gain.3 <-> IC1.4 <-> R3.2 <-> R6.2 <-> Volume.3
 	C2.1 <-> R3.1
 	C2.2 <-> R2.1
-	C3.+ <-> D1.K <-> R4.2 <-> R5.2
-	C4.+ <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1
+	C3.1 <-> D1.2 <-> R4.2 <-> R5.2
+	C4.1 <-> IC1.3 <-> IC1.8 <-> R5.1 <-> R6.1
 	C5.1 <-> IC1.1 <-> R1.1
-	C5.2 <-> Gain.3
+	C5.2 <-> Gain.1
 	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
 

diylc-regression-data/input/cloud/netlist/121_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/121_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/122_excl_switches.txt

@@ -1,17 +1,17 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1
-	C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2
+	C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> 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.A <-> D2.K <-> R6.2 <-> R9.2
-	C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1
+	C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2
+	C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1
 	C6.2 <-> IC1.7 <-> R10.2
-	C7.- <-> R11.2
-	C8.+ <-> R12.2
+	C7.2 <-> R11.2
+	C8.1 <-> R12.2
 	IC1.3 <-> R3.2 <-> R4.2
 	IC1.5 <-> R1.1
 	IC1.8 <-> R9.1

diylc-regression-data/input/cloud/netlist/122_incl_switches.txt

@@ -1,17 +1,17 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> C5.1 <-> D1.K <-> D2.A <-> R1.2 <-> R2.1 <-> R3.1
-	C1.- <-> IC1.4 <-> R11.1 <-> R2.2 <-> R5.2
+	C1.1 <-> C5.1 <-> D1.2 <-> D2.1 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> 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.A <-> D2.K <-> R6.2 <-> R9.2
-	C6.1 <-> C7.+ <-> IC1.6 <-> R10.1 <-> R12.1
+	C5.2 <-> D1.1 <-> D2.2 <-> R6.2 <-> R9.2
+	C6.1 <-> C7.1 <-> IC1.6 <-> R10.1 <-> R12.1
 	C6.2 <-> IC1.7 <-> R10.2
-	C7.- <-> R11.2
-	C8.+ <-> R12.2
+	C7.2 <-> R11.2
+	C8.1 <-> R12.2
 	IC1.3 <-> R3.2 <-> R4.2
 	IC1.5 <-> R1.1
 	IC1.8 <-> R9.1

diylc-regression-data/input/cloud/netlist/123_excl_switches.txt

@@ -1,14 +1,10 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/123_incl_switches.txt

@@ -1,14 +1,10 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/124_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/124_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/125_excl_switches.txt

@@ -1,9 +1,8 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.2 <-> R2.2 <-> R3.2 <-> R4.2
 

diylc-regression-data/input/cloud/netlist/125_incl_switches.txt

@@ -1,9 +1,8 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.2 <-> R2.2 <-> R3.2 <-> R4.2
 

diylc-regression-data/input/cloud/netlist/126_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/126_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/127_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/127_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/128_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/128_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/129_excl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.1 <-> R3.1
 	C1.2 <-> R1.1 <-> R2.2

diylc-regression-data/input/cloud/netlist/129_incl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R2.1 <-> R3.1
 	C1.2 <-> R1.1 <-> R2.2

diylc-regression-data/input/cloud/netlist/130_excl_switches.txt

@@ -1,14 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/130_incl_switches.txt

@@ -1,14 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 

diylc-regression-data/input/cloud/netlist/131_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> IC1.7 <-> Q1.1
-	C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2
+	C1.1 <-> IC1.7 <-> Q1.1
+	C1.2 <-> 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.+ <-> IC1.8 <-> R3.1
+	C5.1 <-> IC1.8 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/131_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> IC1.7 <-> Q1.1
-	C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2
+	C1.1 <-> IC1.7 <-> Q1.1
+	C1.2 <-> 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.+ <-> IC1.8 <-> R3.1
+	C5.1 <-> IC1.8 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/132_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> IC1.7 <-> Q1.1
-	C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2
+	C1.1 <-> IC1.7 <-> Q1.1
+	C1.2 <-> 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.+ <-> IC1.8 <-> R3.1
+	C5.1 <-> IC1.8 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/132_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	C1.+ <-> IC1.7 <-> Q1.1
-	C1.- <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.2 <-> R2.2
+	C1.1 <-> IC1.7 <-> Q1.1
+	C1.2 <-> 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.+ <-> IC1.8 <-> R3.1
+	C5.1 <-> IC1.8 <-> R3.1
 

diylc-regression-data/input/cloud/netlist/133_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/133_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/134_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/134_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/135_excl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.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
+	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
 

diylc-regression-data/input/cloud/netlist/135_incl_switches.txt

@@ -1,9 +1,9 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.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
+	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
 

diylc-regression-data/input/cloud/netlist/136_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/136_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/137_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/137_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/138_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/138_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/139_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/139_incl_switches.txt

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

diylc-regression-data/input/cloud/netlist/140_excl_switches.txt

@@ -1,8 +1,8 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2
 	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> D1.A <-> D2.K
-	D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2
+	C2.2 <-> D1.1 <-> D2.2
+	D1.2 <-> D2.1 <-> Q1.1 <-> R1.2
 

diylc-regression-data/input/cloud/netlist/140_incl_switches.txt

@@ -1,8 +1,8 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.2
 	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> D1.A <-> D2.K
-	D1.K <-> D2.A <-> Q1.1 <-> Q1.2 <-> R1.2
+	C2.2 <-> D1.1 <-> D2.2
+	D1.2 <-> D2.1 <-> Q1.1 <-> R1.2
 

diylc-regression-data/input/cloud/netlist/141_excl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.1 <-> R6.1
 

diylc-regression-data/input/cloud/netlist/141_incl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.1 <-> R6.1
 

diylc-regression-data/input/cloud/netlist/142_excl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.1 <-> R6.1
 

diylc-regression-data/input/cloud/netlist/142_incl_switches.txt

@@ -1,12 +1,12 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
-	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
+	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
 	R1.1 <-> R6.1
 

diylc-regression-data/input/cloud/netlist/143_excl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> IC1.3 <-> R1.2 <-> R2.2
-	C2.+ <-> R5.2
-	C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2
-	C3.+ <-> IC1.7 <-> R4.1
-	C3.- <-> R6.1
+	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
 	C4.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.2 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.2 <-> R7.1
 	IC1.2 <-> R4.2 <-> R5.1
 	IC1.6 <-> R1.1
 

diylc-regression-data/input/cloud/netlist/143_incl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> IC1.3 <-> R1.2 <-> R2.2
-	C2.+ <-> R5.2
-	C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2
-	C3.+ <-> IC1.7 <-> R4.1
-	C3.- <-> R6.1
+	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
 	C4.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.2 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.2 <-> R7.1
 	IC1.2 <-> R4.2 <-> R5.1
 	IC1.6 <-> R1.1
 

diylc-regression-data/input/cloud/netlist/144_excl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> IC1.3 <-> R1.2 <-> R2.2
-	C2.+ <-> R5.2
-	C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2
-	C3.+ <-> IC1.7 <-> R4.1
-	C3.- <-> R6.1
+	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
 	C4.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.2 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.2 <-> R7.1
 	IC1.2 <-> R4.2 <-> R5.1
 	IC1.6 <-> R1.1
 

diylc-regression-data/input/cloud/netlist/144_incl_switches.txt

@@ -1,13 +1,13 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> IC1.3 <-> R1.2 <-> R2.2
-	C2.+ <-> R5.2
-	C2.- <-> C4.2 <-> D1.K <-> D2.A <-> IC1.4 <-> R2.1 <-> R3.2
-	C3.+ <-> IC1.7 <-> R4.1
-	C3.- <-> R6.1
+	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
 	C4.1 <-> R7.2
-	D1.A <-> D2.K <-> R6.2 <-> R7.1
+	D1.1 <-> D2.2 <-> R6.2 <-> R7.1
 	IC1.2 <-> R4.2 <-> R5.1
 	IC1.6 <-> R1.1
 

diylc-regression-data/input/cloud/netlist/145_excl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> Q1.3 <-> R2.1

diylc-regression-data/input/cloud/netlist/145_incl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> Q1.3 <-> R2.1

diylc-regression-data/input/cloud/netlist/146_excl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> Q1.3 <-> R2.1

diylc-regression-data/input/cloud/netlist/146_incl_switches.txt

@@ -1,4 +1,4 @@
-Switch setup: [ ALL ]
+Switch setup: [Default]
 
 	C1.1 <-> R3.1
 	C1.2 <-> Q1.3 <-> R2.1

diylc-regression-data/input/cloud/netlist/147_excl_switches.txt

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

diylc-regression-data/input/cloud/netlist/147_incl_switches.txt

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