From 85e0b5674bc449616e7bed0b8107d46d63d34e24 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Mon, 4 Aug 2008 15:16:03 +0000 Subject: [PATCH] Moving des package to eva2.tools.des --- .../inference/metabolic/AbstractCurveFittingProblem.java | 2 +- .../inference/metabolic/AbstractValineCurveFittingProblem.java | 2 +- .../problems/inference/metabolic/odes/AbstractValineSystem.java | 2 +- .../{server/go/problems/inference => tools}/des/DESSolver.java | 2 +- .../{server/go/problems/inference => tools}/des/DESystem.java | 2 +- .../{server/go/problems/inference => tools}/des/RKSolver.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/eva2/{server/go/problems/inference => tools}/des/DESSolver.java (96%) rename src/eva2/{server/go/problems/inference => tools}/des/DESystem.java (95%) rename src/eva2/{server/go/problems/inference => tools}/des/RKSolver.java (99%) diff --git a/src/eva2/server/go/problems/inference/metabolic/AbstractCurveFittingProblem.java b/src/eva2/server/go/problems/inference/metabolic/AbstractCurveFittingProblem.java index 1f904568..4aea0551 100644 --- a/src/eva2/server/go/problems/inference/metabolic/AbstractCurveFittingProblem.java +++ b/src/eva2/server/go/problems/inference/metabolic/AbstractCurveFittingProblem.java @@ -8,8 +8,8 @@ import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.inference.des.RKSolver; import eva2.tools.Mathematics; +import eva2.tools.des.RKSolver; /** * This class provides a collection of methods to compare two curves one against diff --git a/src/eva2/server/go/problems/inference/metabolic/AbstractValineCurveFittingProblem.java b/src/eva2/server/go/problems/inference/metabolic/AbstractValineCurveFittingProblem.java index 35fe380f..d7fc6209 100644 --- a/src/eva2/server/go/problems/inference/metabolic/AbstractValineCurveFittingProblem.java +++ b/src/eva2/server/go/problems/inference/metabolic/AbstractValineCurveFittingProblem.java @@ -8,8 +8,8 @@ import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; -import eva2.server.go.problems.inference.des.RKSolver; import eva2.server.go.problems.inference.metabolic.odes.AbstractValineSystem; +import eva2.tools.des.RKSolver; /** * Super class for many simulation problems of the valine and leucine reaction diff --git a/src/eva2/server/go/problems/inference/metabolic/odes/AbstractValineSystem.java b/src/eva2/server/go/problems/inference/metabolic/odes/AbstractValineSystem.java index 7944f465..62817b65 100644 --- a/src/eva2/server/go/problems/inference/metabolic/odes/AbstractValineSystem.java +++ b/src/eva2/server/go/problems/inference/metabolic/odes/AbstractValineSystem.java @@ -1,6 +1,6 @@ package eva2.server.go.problems.inference.metabolic.odes; -import eva2.server.go.problems.inference.des.DESystem; +import eva2.tools.des.DESystem; /** * This class contains the necessary splines for selected metabolites of the diff --git a/src/eva2/server/go/problems/inference/des/DESSolver.java b/src/eva2/tools/des/DESSolver.java similarity index 96% rename from src/eva2/server/go/problems/inference/des/DESSolver.java rename to src/eva2/tools/des/DESSolver.java index d3cc9709..50d814dc 100644 --- a/src/eva2/server/go/problems/inference/des/DESSolver.java +++ b/src/eva2/tools/des/DESSolver.java @@ -6,7 +6,7 @@ * @version 1.0 */ -package eva2.server.go.problems.inference.des; +package eva2.tools.des; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/inference/des/DESystem.java b/src/eva2/tools/des/DESystem.java similarity index 95% rename from src/eva2/server/go/problems/inference/des/DESystem.java rename to src/eva2/tools/des/DESystem.java index fcd4af8c..80c8fd8d 100644 --- a/src/eva2/server/go/problems/inference/des/DESystem.java +++ b/src/eva2/tools/des/DESystem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.inference.des; +package eva2.tools.des; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/inference/des/RKSolver.java b/src/eva2/tools/des/RKSolver.java similarity index 99% rename from src/eva2/server/go/problems/inference/des/RKSolver.java rename to src/eva2/tools/des/RKSolver.java index 1228a9ef..fce0fca9 100644 --- a/src/eva2/server/go/problems/inference/des/RKSolver.java +++ b/src/eva2/tools/des/RKSolver.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.inference.des; +package eva2.tools.des; import eva2.tools.Mathematics;