Remove TSP Optimiser

Unused, and introduced incompatibly licensed libraries.

LICENSE

@@ -2,10 +2,6 @@ LibLaserCut itself is licensed under the GNU Lesser Public License (see COPYING.
 
 However, it contains some 3rd Party files, which are listed below.
 
-GPL v2 (These are incompatible with the LGPL and will be replaced shortly):
-- GLPK (http://www.gnu.org/software/glpk/)
-- SCPSolver (http://scpsolver.org/), GPLed due to use of GPLK
-
 Eclipse Public License 1.0:
 - JUnit (http://junit.org/), see http://junit.org/junit4/license.html
 
@@ -18,4 +14,4 @@ Mozilla Public License 2.0:
 - Rhino JS interpreter (https://github.com/mozilla/rhino)
 
 BSD Licensed:
-- Purejavacomm by Kustaa "Kusti" Nyholm (https://github.com/nyholku/purejavacomm)
+- Purejavacomm by Kustaa "Kusti" Nyholm (https://github.com/nyholku/purejavacomm)

nbproject/project.properties

@@ -45,26 +45,23 @@ endorsed.classpath=
 excludes=
 file.reference.commons-net-3.1.jar=lib/commons-net-3.1.jar
 file.reference.corn-httpclient-1.0.12.jar=lib/corn-httpclient-1.0.12.jar
-file.reference.GLPKSolverPack.jar=lib/GLPKSolverPack.jar
 file.reference.jna-4.0.0.jar=lib/jna-4.0.0.jar
 file.reference.js.jar=lib/js.jar
 file.reference.purejavacomm-0.0.22.jar=lib/purejavacomm-0.0.22.jar
-file.reference.SCPSolver.jar=lib/SCPSolver.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.commons-net-3.1.jar}:\
     ${file.reference.js.jar}:\
-    ${file.reference.GLPKSolverPack.jar}:\
-    ${file.reference.SCPSolver.jar}:\
     ${file.reference.jna-4.0.0.jar}:\
     ${file.reference.purejavacomm-0.0.22.jar}:\
     ${file.reference.corn-httpclient-1.0.12.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.external.vm=false
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.6

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

@@ -39,8 +39,7 @@ public enum OrderStrategy
     NEAREST,
     INNER_FIRST,
     SMALLEST_FIRST,
-    DELETE_DUPLICATE_PATHS,
-    TSP_OPTIMIZER
+    DELETE_DUPLICATE_PATHS
   }
 
   protected class Element
@@ -142,8 +141,6 @@ public static VectorOptimizer create(OrderStrategy s)
         return new SmallestFirstVectorOptimizer();
       case DELETE_DUPLICATE_PATHS:
         return new DeleteDuplicatePathsOptimizer();
-      case TSP_OPTIMIZER:
-        return new TSPOptimizer();
     }
     throw new IllegalArgumentException("Unknown Order Strategy: " + s);
   }