Skip to content

Commit 5d5d7f3

Browse files
committed
Remove TSP Optimiser
Unused, and introduced incompatibly licensed libraries.
1 parent d9e985c commit 5d5d7f3

File tree

6 files changed

+3
-283
lines changed

6 files changed

+3
-283
lines changed

LICENSE

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ LibLaserCut itself is licensed under the GNU Lesser Public License (see COPYING.
22

33
However, it contains some 3rd Party files, which are listed below.
44

5-
GPL v2 (These are incompatible with the LGPL and will be replaced shortly):
6-
- GLPK (http://www.gnu.org/software/glpk/)
7-
- SCPSolver (http://scpsolver.org/), GPLed due to use of GPLK
8-
95
Eclipse Public License 1.0:
106
- JUnit (http://junit.org/), see http://junit.org/junit4/license.html
117

@@ -18,4 +14,4 @@ Mozilla Public License 2.0:
1814
- Rhino JS interpreter (https://github.com/mozilla/rhino)
1915

2016
BSD Licensed:
21-
- Purejavacomm by Kustaa "Kusti" Nyholm (https://github.com/nyholku/purejavacomm)
17+
- Purejavacomm by Kustaa "Kusti" Nyholm (https://github.com/nyholku/purejavacomm)

lib/GLPKSolverPack.jar

-2.74 MB
Binary file not shown.

lib/SCPSolver.jar

-145 KB
Binary file not shown.

nbproject/project.properties

+1-4
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,23 @@ endorsed.classpath=
4545
excludes=
4646
file.reference.commons-net-3.1.jar=lib/commons-net-3.1.jar
4747
file.reference.corn-httpclient-1.0.12.jar=lib/corn-httpclient-1.0.12.jar
48-
file.reference.GLPKSolverPack.jar=lib/GLPKSolverPack.jar
4948
file.reference.jna-4.0.0.jar=lib/jna-4.0.0.jar
5049
file.reference.js.jar=lib/js.jar
5150
file.reference.purejavacomm-0.0.22.jar=lib/purejavacomm-0.0.22.jar
52-
file.reference.SCPSolver.jar=lib/SCPSolver.jar
5351
includes=**
5452
jar.archive.disabled=${jnlp.enabled}
5553
jar.compress=false
5654
jar.index=${jnlp.enabled}
5755
javac.classpath=\
5856
${file.reference.commons-net-3.1.jar}:\
5957
${file.reference.js.jar}:\
60-
${file.reference.GLPKSolverPack.jar}:\
61-
${file.reference.SCPSolver.jar}:\
6258
${file.reference.jna-4.0.0.jar}:\
6359
${file.reference.purejavacomm-0.0.22.jar}:\
6460
${file.reference.corn-httpclient-1.0.12.jar}
6561
# Space-separated list of extra javac options
6662
javac.compilerargs=
6763
javac.deprecation=false
64+
javac.external.vm=false
6865
javac.processorpath=\
6966
${javac.classpath}
7067
javac.source=1.6

src/com/t_oster/liblasercut/vectoroptimizers/TSPOptimizer.java

-270
This file was deleted.

src/com/t_oster/liblasercut/vectoroptimizers/VectorOptimizer.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public enum OrderStrategy
3939
NEAREST,
4040
INNER_FIRST,
4141
SMALLEST_FIRST,
42-
DELETE_DUPLICATE_PATHS,
43-
TSP_OPTIMIZER
42+
DELETE_DUPLICATE_PATHS
4443
}
4544

4645
protected class Element
@@ -142,8 +141,6 @@ public static VectorOptimizer create(OrderStrategy s)
142141
return new SmallestFirstVectorOptimizer();
143142
case DELETE_DUPLICATE_PATHS:
144143
return new DeleteDuplicatePathsOptimizer();
145-
case TSP_OPTIMIZER:
146-
return new TSPOptimizer();
147144
}
148145
throw new IllegalArgumentException("Unknown Order Strategy: " + s);
149146
}

0 commit comments

Comments
 (0)