BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

mavenization

Browse Source
This commit is contained in:
Branislav Stojkovic
2025-03-10 15:30:18 +01:00
parent 6e347fd7d0
commit 038e2bcbb4
1041 changed files with 297 additions and 11102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/diylc-library.iml
+6 -65
View File
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
</content>
</component>
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/lib/log4j-1.2.15.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/app-framework.jar!/" />
@@ -11,69 +17,4 @@
<src_folder value="file://$MODULE_DIR$/test" expected_position="1" />
</src_description>
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="log4j-1.2.15.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/log4j-1.2.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="app-framework.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/app-framework.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jep-2.4.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jep-2.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="poi-3.5-FINAL-20090928.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/poi-3.5-FINAL-20090928.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="diylc-core" />
<orderEntry type="module-library">
<library name="xstream-1.4.3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/xstream-1.4.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit4">
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
</component>
</module>
diylc/diylc-library/src/test/java/org/diylc/netlist/GuitarNetlistAnalyzerTests.java
+291 -291
View File
@@ -1,291 +1,291 @@
///*
// *
// * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
// *
// * This file is part of DIYLC.
// *
// * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
// * General Public License as published by the Free Software Foundation, either version 3 of the
// * License, or (at your option) any later version.
// *
// * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
// * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
// * Public License for more details.
// *
// * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
// * <http://www.gnu.org/licenses/>.
// *
// */
//package org.diylc.netlist;
//
//import static org.junit.Assert.assertEquals;
//import java.util.Arrays;
//
//import org.junit.Test;
//
//import org.diylc.components.electromechanical.OpenJack1_4;
//import org.diylc.components.guitar.HumbuckerPickup;
//import org.diylc.components.guitar.SingleCoilPickup;
//import org.diylc.components.passive.PotentiometerPanel;
//import org.diylc.components.passive.RadialCeramicDiskCapacitor;
//import org.diylc.netlist.Group;
//import org.diylc.netlist.GuitarDiagramAnalyzer;
//import org.diylc.netlist.Netlist;
//import org.diylc.netlist.Tree;
//import org.diylc.netlist.TreeException;
//
//public class GuitarNetlistAnalyzerTests {
//
// @Test
// public void testOneSinglePickup() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// SingleCoilPickup pickup = new SingleCoilPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 1);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2);
// netlist.add(tipGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.North<-))", s);
// }
//
// @Test
// public void testOneSinglePickupVolPot() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// SingleCoilPickup pickup = new SingleCoilPickup();
// pickup.setName("Pickup");
// PotentiometerPanel vol = new PotentiometerPanel();
// vol.setName("Volume");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol));
// Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0);
// Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2);
// netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Volume.1-2 + Pickup.North<-) || (Volume.2-3))", s);
// }
//
// @Test
// public void testOneSinglePickupVolTonePot() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// SingleCoilPickup pickup = new SingleCoilPickup();
// pickup.setName("Pickup");
// PotentiometerPanel vol = new PotentiometerPanel();
// vol.setName("Volume");
// PotentiometerPanel tone = new PotentiometerPanel();
// tone.setName("Tone");
// RadialCeramicDiskCapacitor cap = new RadialCeramicDiskCapacitor();
// cap.setName("Cap");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol, tone, cap));
// Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0).connect(tone, 2);
// Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
// Group sleeveGroup =
// new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2).connect(cap, 0);
// Group toneGroup = new Group().connect(tone, 1).connect(cap, 1);
// netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(toneGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("(((Volume.1-2) + ((Pickup.North<-) || (Tone.2-3 + Cap))) || (Volume.2-3))", s);
// }
//
// @Test
// public void testTwoSinglePickupsMasterVolSeparateTone() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// SingleCoilPickup pickup1 = new SingleCoilPickup();
// pickup1.setName("Pickup1");
// SingleCoilPickup pickup2 = new SingleCoilPickup();
// pickup2.setName("Pickup2");
// PotentiometerPanel vol = new PotentiometerPanel();
// vol.setName("Volume");
// PotentiometerPanel tone1 = new PotentiometerPanel();
// tone1.setName("Tone1");
// PotentiometerPanel tone2 = new PotentiometerPanel();
// tone2.setName("Tone2");
// RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
// cap1.setName("Cap1");
// RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
// cap2.setName("Cap2");
// Netlist netlist =
// new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
// Group hotGroup = new Group().connect(pickup1, 1).connect(vol, 0).connect(tone1, 2)
// .connect(pickup2, 1).connect(tone2, 2);
// Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 2).connect(pickup2, 2)
// .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
// Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
// Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
// netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
// .add(tone2Group);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals(
// "(((Volume.1-2) + ((Pickup1.North<-) || (Pickup2.North<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
// s);
// }
//
// @Test
// public void testOneSinglePickupReverse() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// SingleCoilPickup pickup = new SingleCoilPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1);
// netlist.add(tipGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.North->))", s);
// }
//
// @Test
// public void testOneHumbuckerSeries() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup = new HumbuckerPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0);
// Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 3);
// netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.North<- + Pickup.South<-))", s);
// }
//
// @Test
// public void testOneHumbuckerSeriesReverse() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup = new HumbuckerPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 3);
// Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 0);
// netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.South-> + Pickup.North->))", s);
// }
//
// @Test
// public void testOneHumbuckerParallel() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup = new HumbuckerPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 3);
// netlist.add(tipGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.North<-) || (Pickup.South<-))", s);
// }
//
// @Test
// public void testOneHumbuckerParallelOutOfPhase() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup = new HumbuckerPickup();
// pickup.setName("Pickup");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 3);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 2);
// netlist.add(tipGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup.North<-) || (Pickup.South->))", s);
// }
//
// @Test
// public void testTwoHumbuckersSeries() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup1 = new HumbuckerPickup();
// pickup1.setName("Pickup1");
// HumbuckerPickup pickup2 = new HumbuckerPickup();
// pickup2.setName("Pickup2");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0);
// Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
// Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
// Group joinGroup = new Group().connect(pickup1, 3).connect(pickup2, 0);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup2, 3);
// netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(joinGroup).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup1.North<- + Pickup1.South<- + Pickup2.North<- + Pickup2.South<-))", s);
// }
//
// @Test
// public void testTwoHumbuckersParallel() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup1 = new HumbuckerPickup();
// pickup1.setName("Pickup1");
// HumbuckerPickup pickup2 = new HumbuckerPickup();
// pickup2.setName("Pickup2");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 0);
// Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
// Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3);
// netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-))", s);
// }
//
// @Test
// public void testTwoHumbuckersParallelOutOfPhase() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup1 = new HumbuckerPickup();
// pickup1.setName("Pickup1");
// HumbuckerPickup pickup2 = new HumbuckerPickup();
// pickup2.setName("Pickup2");
// Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
// Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 3);
// Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
// Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 0);
// netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.South-> + Pickup2.North->))", s);
// }
//
// @Test
// public void testTwoHumbuckersMasterVolSeparateTone() throws TreeException {
// OpenJack1_4 jack = new OpenJack1_4();
// HumbuckerPickup pickup1 = new HumbuckerPickup();
// pickup1.setName("Pickup1");
// HumbuckerPickup pickup2 = new HumbuckerPickup();
// pickup2.setName("Pickup2");
// PotentiometerPanel vol = new PotentiometerPanel();
// vol.setName("Volume");
// PotentiometerPanel tone1 = new PotentiometerPanel();
// tone1.setName("Tone1");
// PotentiometerPanel tone2 = new PotentiometerPanel();
// tone2.setName("Tone2");
// RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
// cap1.setName("Cap1");
// RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
// cap2.setName("Cap2");
// Netlist netlist =
// new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
// Group hotGroup = new Group().connect(pickup1, 0).connect(vol, 0).connect(tone1, 2)
// .connect(pickup2, 0).connect(tone2, 2);
// Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
// Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3)
// .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
// Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
// Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
// Group coilTap1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
// Group coilTap2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
// netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
// .add(tone2Group).add(coilTap1).add(coilTap2);
// Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
// String s = tree.toString();
// assertEquals(
// "(((Volume.1-2) + ((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
// s);
// }
//}
/*
*
* DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
*
* This file is part of DIYLC.
*
* DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
* General Public License as published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with DIYLC. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
package org.diylc.netlist;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import org.junit.Test;
import org.diylc.components.electromechanical.OpenJack1_4;
import org.diylc.components.guitar.HumbuckerPickup;
import org.diylc.components.guitar.SingleCoilPickup;
import org.diylc.components.passive.PotentiometerPanel;
import org.diylc.components.passive.RadialCeramicDiskCapacitor;
import org.diylc.netlist.Group;
import org.diylc.netlist.GuitarDiagramAnalyzer;
import org.diylc.netlist.Netlist;
import org.diylc.netlist.Tree;
import org.diylc.netlist.TreeException;
public class GuitarNetlistAnalyzerTests {
@Test
public void testOneSinglePickup() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
SingleCoilPickup pickup = new SingleCoilPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 1);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2);
netlist.add(tipGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.North<-))", s);
}
@Test
public void testOneSinglePickupVolPot() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
SingleCoilPickup pickup = new SingleCoilPickup();
pickup.setName("Pickup");
PotentiometerPanel vol = new PotentiometerPanel();
vol.setName("Volume");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol));
Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0);
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2);
netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Volume.1-2 + Pickup.North<-) || (Volume.2-3))", s);
}
@Test
public void testOneSinglePickupVolTonePot() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
SingleCoilPickup pickup = new SingleCoilPickup();
pickup.setName("Pickup");
PotentiometerPanel vol = new PotentiometerPanel();
vol.setName("Volume");
PotentiometerPanel tone = new PotentiometerPanel();
tone.setName("Tone");
RadialCeramicDiskCapacitor cap = new RadialCeramicDiskCapacitor();
cap.setName("Cap");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol, tone, cap));
Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0).connect(tone, 2);
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
Group sleeveGroup =
new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2).connect(cap, 0);
Group toneGroup = new Group().connect(tone, 1).connect(cap, 1);
netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(toneGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("(((Volume.1-2) + ((Pickup.North<-) || (Tone.2-3 + Cap))) || (Volume.2-3))", s);
}
@Test
public void testTwoSinglePickupsMasterVolSeparateTone() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
SingleCoilPickup pickup1 = new SingleCoilPickup();
pickup1.setName("Pickup1");
SingleCoilPickup pickup2 = new SingleCoilPickup();
pickup2.setName("Pickup2");
PotentiometerPanel vol = new PotentiometerPanel();
vol.setName("Volume");
PotentiometerPanel tone1 = new PotentiometerPanel();
tone1.setName("Tone1");
PotentiometerPanel tone2 = new PotentiometerPanel();
tone2.setName("Tone2");
RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
cap1.setName("Cap1");
RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
cap2.setName("Cap2");
Netlist netlist =
new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
Group hotGroup = new Group().connect(pickup1, 1).connect(vol, 0).connect(tone1, 2)
.connect(pickup2, 1).connect(tone2, 2);
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 2).connect(pickup2, 2)
.connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
.add(tone2Group);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals(
"(((Volume.1-2) + ((Pickup1.North<-) || (Pickup2.North<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
s);
}
@Test
public void testOneSinglePickupReverse() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
SingleCoilPickup pickup = new SingleCoilPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1);
netlist.add(tipGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.North->))", s);
}
@Test
public void testOneHumbuckerSeries() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup = new HumbuckerPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0);
Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 3);
netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.North<- + Pickup.South<-))", s);
}
@Test
public void testOneHumbuckerSeriesReverse() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup = new HumbuckerPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 3);
Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 0);
netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.South-> + Pickup.North->))", s);
}
@Test
public void testOneHumbuckerParallel() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup = new HumbuckerPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 3);
netlist.add(tipGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.North<-) || (Pickup.South<-))", s);
}
@Test
public void testOneHumbuckerParallelOutOfPhase() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup = new HumbuckerPickup();
pickup.setName("Pickup");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 3);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 2);
netlist.add(tipGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup.North<-) || (Pickup.South->))", s);
}
@Test
public void testTwoHumbuckersSeries() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup1 = new HumbuckerPickup();
pickup1.setName("Pickup1");
HumbuckerPickup pickup2 = new HumbuckerPickup();
pickup2.setName("Pickup2");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0);
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
Group joinGroup = new Group().connect(pickup1, 3).connect(pickup2, 0);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup2, 3);
netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(joinGroup).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup1.North<- + Pickup1.South<- + Pickup2.North<- + Pickup2.South<-))", s);
}
@Test
public void testTwoHumbuckersParallel() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup1 = new HumbuckerPickup();
pickup1.setName("Pickup1");
HumbuckerPickup pickup2 = new HumbuckerPickup();
pickup2.setName("Pickup2");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 0);
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3);
netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-))", s);
}
@Test
public void testTwoHumbuckersParallelOutOfPhase() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup1 = new HumbuckerPickup();
pickup1.setName("Pickup1");
HumbuckerPickup pickup2 = new HumbuckerPickup();
pickup2.setName("Pickup2");
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 3);
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 0);
netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.South-> + Pickup2.North->))", s);
}
@Test
public void testTwoHumbuckersMasterVolSeparateTone() throws TreeException {
OpenJack1_4 jack = new OpenJack1_4();
HumbuckerPickup pickup1 = new HumbuckerPickup();
pickup1.setName("Pickup1");
HumbuckerPickup pickup2 = new HumbuckerPickup();
pickup2.setName("Pickup2");
PotentiometerPanel vol = new PotentiometerPanel();
vol.setName("Volume");
PotentiometerPanel tone1 = new PotentiometerPanel();
tone1.setName("Tone1");
PotentiometerPanel tone2 = new PotentiometerPanel();
tone2.setName("Tone2");
RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
cap1.setName("Cap1");
RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
cap2.setName("Cap2");
Netlist netlist =
new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
Group hotGroup = new Group().connect(pickup1, 0).connect(vol, 0).connect(tone1, 2)
.connect(pickup2, 0).connect(tone2, 2);
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3)
.connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
Group coilTap1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
Group coilTap2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
.add(tone2Group).add(coilTap1).add(coilTap2);
Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
String s = tree.toString();
assertEquals(
"(((Volume.1-2) + ((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
s);
}
}
diylc/diylc-library/target/classes/org/diylc/awt/ImageUtils.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/awt/ShadedPaint.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/awt/ShadedPaintContext.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/awt/StringUtils$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/awt/StringUtils.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/awt/TwoCircleTangent.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/Abstract3LegSymbol.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/AbstractLeadedComponent$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/AbstractLeadedComponent$LabelOriantation.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/AbstractLeadedComponent.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/AbstractMultiPartComponent.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/AbstractSchematicLeadedSymbol.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/RoundedPath.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/RoundedPolygon.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/autocreate/SolderPadAutoCreator.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractBoard$BoardSizingMode.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractBoard$CoordinateDisplay.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractBoard$CoordinateOrigin.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractBoard$CoordinateType.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractProtoBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/AbstractVeroBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/BlankBoard$Type.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/BlankBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/BoardModeValidator.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/Breadboard$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/Breadboard$BreadboardSize.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/Breadboard$PowerStripPosition.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/Breadboard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/EurorackStripboard$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/EurorackStripboard$Pad.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/EurorackStripboard$Segment.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/EurorackStripboard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/EyeletBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/MarshallPerfBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/PerfBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ProtoBoard$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ProtoBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ProtoBoard780$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ProtoBoard780$ProtoBoard780Type.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ProtoBoard780.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/ShapeModeValidator.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TagStrip$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TagStrip$TagStripMount.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TagStrip.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TerminalStrip$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TerminalStrip.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/TriPadBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/boards/VeroBoard.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/ChassisPanel.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/DialScale$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/DialScale$DialScaleType.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/DialScale.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/EllipticalCutout.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/PolygonalCutout$PointCount.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/PolygonalCutout.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/chassis/RectangularCutout.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/AWG.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/CopperTrace.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/CurvedTrace.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/CutLine.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Dot.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Eyelet.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/GroundFill$PointCount.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/GroundFill.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/HookupWire$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/HookupWire.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Jumper.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Line$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Line.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/PCBTerminalBlock$PCBTerminalBlockCount.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/PCBTerminalBlock$ScrewPosition.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/PCBTerminalBlock.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/SolderLug$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/SolderLug.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/SolderPad$HoleType.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/SolderPad$Type.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/SolderPad.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/TraceCut.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/Turret.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/connectivity/TwistedWire.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/BatterySnap9V$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/BatterySnap9V.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/CliffJack1_4$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/CliffJack1_4.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/CliffJack1_8$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/CliffJack1_8.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/ClosedJack1_4$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/ClosedJack1_4.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/DCPolarity.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/DIPSwitch$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/DIPSwitch$SwitchCount.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/DIPSwitch.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/FuseHolderPanel.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/IECSocket$1.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/IECSocket.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/JackType.class
BIN
View File
Binary file not shown.
diylc/diylc-library/target/classes/org/diylc/components/electromechanical/MiniRelay$1.class
BIN
View File
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More