From fa1fc8808531faa3e04e890a3d4539262519b95f Mon Sep 17 00:00:00 2001 From: Patrik Dufresne Date: Wed, 20 Feb 2019 10:46:38 -0500 Subject: [PATCH] Move project around --- .../src/main/assembly/linux-package.xml | 19 ++++++++++++ .../nsis/plugin/nsisFirewall-src/License.txt | 18 ++++++++++++ .../nsis/plugin/nsisFirewall-src/ReadMe.txt | 18 ++++++++++++ .../main/nsis/plugin/nsisFirewall-src/exdll.h | 17 +++++++++++ .../plugin/nsisFirewall-src/nsisFirewall.cpp | 17 +++++++++++ .../src/main/root/logback.xml | 19 ++++++++++++ formatter.xml | 22 +++++++------- {ilp/ilp-cbc => ilp-cbc}/.gitignore | 0 {ilp/ilp-cbc => ilp-cbc}/pom.xml | 2 +- .../patrikdufresne/ilp/cbc/CbcConstraint.java | 0 .../ilp/cbc/CbcLinearProblem.java | 0 .../com/patrikdufresne/ilp/cbc/CbcSolver.java | 0 .../ilp/cbc/CbcSolverFactory.java | 0 .../ilp/cbc/CbcSolverOption.java | 0 .../patrikdufresne/ilp/cbc/CbcVariable.java | 0 .../patrikdufresne/ilp/cbc/CostStrategy.java | 0 .../com/patrikdufresne/ilp/cbc/GMICuts.java | 0 .../patrikdufresne/ilp/cbc/LatwomirCuts.java | 0 .../patrikdufresne/ilp/cbc/Preprocess.java | 0 .../com/patrikdufresne/ilp/cbc/Presolve.java | 0 .../patrikdufresne/ilp/cbc/ProbingCuts.java | 0 .../ilp/cbc/ReduceAndSplitCuts.java | 0 .../test/java/com/patrikdufresne/Main.java | 0 .../com/patrikdufresne/ilp/cbc/AllTests.java | 0 .../ilp/cbc/CbcConstraintTest.java | 0 .../ilp/cbc/CbcLinearProblemTest.java | 0 .../patrikdufresne/ilp/cbc/CbcSolverTest.java | 0 .../ilp/cbc/CbcVariableTest.java | 0 {ilp/ilp-core => ilp-core}/.gitignore | 0 {ilp/ilp-core => ilp-core}/pom.xml | 2 +- .../ilp/AbstractLinearProblem.java | 0 .../patrikdufresne/ilp/ConcreteLinear.java | 0 .../com/patrikdufresne/ilp/ConcreteTerm.java | 0 .../com/patrikdufresne/ilp/Constraint.java | 0 .../ilp/IBranchingTechniqueLast.java | 0 .../IBranchingTechniqueLastAlwaysDown.java | 0 .../ilp/IFeasibilityPumpHeuristic.java | 0 .../java/com/patrikdufresne/ilp/ILPError.java | 0 .../com/patrikdufresne/ilp/ILPException.java | 0 .../com/patrikdufresne/ilp/ILPLogger.java | 0 .../com/patrikdufresne/ilp/ILPPolicy.java | 0 .../ilp/IPersistentLinearProblem.java | 0 .../patrikdufresne/ilp/IPreProcessorPass.java | 0 .../patrikdufresne/ilp/ImmutableLinear.java | 0 .../java/com/patrikdufresne/ilp/Linear.java | 0 .../com/patrikdufresne/ilp/LinearProblem.java | 0 .../java/com/patrikdufresne/ilp/Solver.java | 0 .../com/patrikdufresne/ilp/SolverFactory.java | 0 .../com/patrikdufresne/ilp/SolverOption.java | 0 .../java/com/patrikdufresne/ilp/Status.java | 0 .../java/com/patrikdufresne/ilp/Term.java | 0 .../java/com/patrikdufresne/ilp/VarType.java | 0 .../java/com/patrikdufresne/ilp/Variable.java | 0 .../com/patrikdufresne/ilp/util/Bound.java | 0 .../ilp/util/BoundSnapshot.java | 0 .../ilp/util/ConstraintSnapshot.java | 0 .../patrikdufresne/ilp/util/Constraints.java | 0 .../com/patrikdufresne/ilp/util/Linears.java | 0 .../ilp/util/ValueSnapshot.java | 0 .../patrikdufresne/ilp/util/Variables.java | 0 .../patrikdufresne/ilp/ConstraintTest.java | 0 .../patrikdufresne/ilp/LinearProblemTest.java | 0 .../com/patrikdufresne/ilp/SolverTest.java | 0 .../com/patrikdufresne/ilp/VariableTest.java | 0 {ilp/ilp-glpk => ilp-glpk}/.gitignore | 0 {ilp/ilp-glpk => ilp-glpk}/pom.xml | 2 +- .../ilp/glpk/GLPKConstraint.java | 0 .../patrikdufresne/ilp/glpk/GLPKLibrary.java | 0 .../ilp/glpk/GLPKLinearProblem.java | 0 .../patrikdufresne/ilp/glpk/GLPKSolver.java | 0 .../ilp/glpk/GLPKSolverFactory.java | 0 .../ilp/glpk/GLPKSolverOption.java | 0 .../patrikdufresne/ilp/glpk/GLPKVariable.java | 0 .../main/resources/linux/x86_64/libglpk.so | Bin .../resources/linux/x86_64/libglpk_java.so | Bin .../src/main/resources/win/x86/glpk_4_51.dll | Bin .../main/resources/win/x86/glpk_4_51_java.dll | Bin .../main/resources/win/x86_64/glpk_4_51.dll | Bin .../resources/win/x86_64/glpk_4_51_java.dll | Bin .../com/patrikdufresne/ilp/glpk/AllTests.java | 0 .../ilp/glpk/GLPKConstraintTest.java | 0 .../ilp/glpk/GLPKLinearProblemTest.java | 0 .../ilp/glpk/GLPKSolverTest.java | 0 .../ilp/glpk/GLPKVariableTest.java | 0 ilp/pom.xml | 27 ------------------ pom.xml | 6 ++-- 86 files changed, 127 insertions(+), 42 deletions(-) rename {ilp/ilp-cbc => ilp-cbc}/.gitignore (100%) rename {ilp/ilp-cbc => ilp-cbc}/pom.xml (98%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/Main.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java (100%) rename {ilp/ilp-cbc => ilp-cbc}/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java (100%) rename {ilp/ilp-core => ilp-core}/.gitignore (100%) rename {ilp/ilp-core => ilp-core}/pom.xml (95%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Constraint.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ILPError.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ILPException.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ILPLogger.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Linear.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/LinearProblem.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Solver.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/SolverFactory.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/SolverOption.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Status.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Term.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/VarType.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/Variable.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/Bound.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/Constraints.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/Linears.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java (100%) rename {ilp/ilp-core => ilp-core}/src/main/java/com/patrikdufresne/ilp/util/Variables.java (100%) rename {ilp/ilp-core => ilp-core}/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java (100%) rename {ilp/ilp-core => ilp-core}/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java (100%) rename {ilp/ilp-core => ilp-core}/src/test/java/com/patrikdufresne/ilp/SolverTest.java (100%) rename {ilp/ilp-core => ilp-core}/src/test/java/com/patrikdufresne/ilp/VariableTest.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/.gitignore (100%) rename {ilp/ilp-glpk => ilp-glpk}/pom.xml (96%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/linux/x86_64/libglpk.so (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/linux/x86_64/libglpk_java.so (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/win/x86/glpk_4_51.dll (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/win/x86/glpk_4_51_java.dll (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/win/x86_64/glpk_4_51.dll (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/main/resources/win/x86_64/glpk_4_51_java.dll (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java (100%) rename {ilp/ilp-glpk => ilp-glpk}/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java (100%) delete mode 100644 ilp/pom.xml diff --git a/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml b/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml index e40c9a9..e4322be 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml +++ b/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml @@ -1,4 +1,23 @@ + + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This program 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +==== + nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt index 67c7d52..d4912cf 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt @@ -1,3 +1,21 @@ +==== + Copyright (C) 2019 Patrik Dufresne Service Logiciel + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This program 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +==== + nsisFirewall 1.2 -- Small NSIS plugin for simple tasks with Windows build-in Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall --------------------------------------------------------- diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h index feca246..05b1e0c 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h @@ -1,3 +1,20 @@ +/** + * Copyright (C) 2019 Patrik Dufresne Service Logiciel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #ifndef _EXDLL_H_ #define _EXDLL_H_ diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp index ef50011..c96e823 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp @@ -1,3 +1,20 @@ +/** + * Copyright (C) 2019 Patrik Dufresne Service Logiciel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ /* nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall diff --git a/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml b/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml index bf04dcd..107cb75 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml +++ b/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml @@ -1,3 +1,22 @@ + diff --git a/formatter.xml b/formatter.xml index 2ce16cf..ca35534 100644 --- a/formatter.xml +++ b/formatter.xml @@ -1,19 +1,21 @@ diff --git a/ilp/ilp-cbc/.gitignore b/ilp-cbc/.gitignore similarity index 100% rename from ilp/ilp-cbc/.gitignore rename to ilp-cbc/.gitignore diff --git a/ilp/ilp-cbc/pom.xml b/ilp-cbc/pom.xml similarity index 98% rename from ilp/ilp-cbc/pom.xml rename to ilp-cbc/pom.xml index 4f32151..878e5c1 100644 --- a/ilp/ilp-cbc/pom.xml +++ b/ilp-cbc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.patrikdufresne - ilp-parent + planimod-parent ${revision} ilp-cbc diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/Main.java b/ilp-cbc/src/test/java/com/patrikdufresne/Main.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/Main.java rename to ilp-cbc/src/test/java/com/patrikdufresne/Main.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java diff --git a/ilp/ilp-core/.gitignore b/ilp-core/.gitignore similarity index 100% rename from ilp/ilp-core/.gitignore rename to ilp-core/.gitignore diff --git a/ilp/ilp-core/pom.xml b/ilp-core/pom.xml similarity index 95% rename from ilp/ilp-core/pom.xml rename to ilp-core/pom.xml index 8ef82ca..c8e9c6e 100644 --- a/ilp/ilp-core/pom.xml +++ b/ilp-core/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.patrikdufresne - ilp-parent + planimod-parent ${revision} ilp-core diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java diff --git a/ilp/ilp-glpk/.gitignore b/ilp-glpk/.gitignore similarity index 100% rename from ilp/ilp-glpk/.gitignore rename to ilp-glpk/.gitignore diff --git a/ilp/ilp-glpk/pom.xml b/ilp-glpk/pom.xml similarity index 96% rename from ilp/ilp-glpk/pom.xml rename to ilp-glpk/pom.xml index c6b435e..563970a 100644 --- a/ilp/ilp-glpk/pom.xml +++ b/ilp-glpk/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.patrikdufresne - ilp-parent + planimod-parent ${revision} ilp-glpk diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java diff --git a/ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so b/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so similarity index 100% rename from ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so rename to ilp-glpk/src/main/resources/linux/x86_64/libglpk.so diff --git a/ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so b/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so similarity index 100% rename from ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so rename to ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so diff --git a/ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll b/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll rename to ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll b/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll rename to ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll b/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll rename to ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll b/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll rename to ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java diff --git a/ilp/pom.xml b/ilp/pom.xml deleted file mode 100644 index db11374..0000000 --- a/ilp/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - com.patrikdufresne - planimod-parent - ${revision} - - ilp-parent - pom - - - - patrikdufresne - http://nexus.patrikdufresne.com/content/repositories/public/ - - - - UTF-8 - - - ilp-core - ilp-glpk - ilp-cbc - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index dc1bcf5..4df02fa 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,9 @@ ${revision} pom - ilp + ilp-core + ilp-glpk + ilp-cbc planimod-icons com.patrikdufresne.planimod com.patrikdufresne.planimod-installation-package @@ -42,4 +44,4 @@ - \ No newline at end of file + -- GitLab