From 34bcf9b498bccb5c924f4cec850ff15d88df6f07 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 13 Aug 2014 10:08:31 +0200 Subject: java: remove dead methods found by UCDetector Change-Id: I219caa8e680dba5a395541a778df6144841c4dde --- .../src/net/adaptivebox/global/BasicBound.java | 14 ------ .../src/net/adaptivebox/global/GlobalCompare.java | 16 +------ .../src/net/adaptivebox/global/GlobalString.java | 22 ++-------- .../src/net/adaptivebox/global/OutputMethods.java | 13 +----- .../net/adaptivebox/global/RandomGenerator.java | 44 ++----------------- .../src/net/adaptivebox/knowledge/SearchPoint.java | 7 +-- .../net/adaptivebox/problem/ProblemEncoder.java | 13 +----- .../src/net/adaptivebox/space/DesignDim.java | 5 +-- .../src/net/adaptivebox/space/DesignSpace.java | 50 +++------------------- 9 files changed, 20 insertions(+), 164 deletions(-) (limited to 'nlpsolver/ThirdParty') diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java index 383e9c2ed202..39413006ab13 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java @@ -64,21 +64,7 @@ public class BasicBound { return value; } - public static BasicBound getBound(double[] data) { - BasicBound bound = new BasicBound(); - if(data!=null) { - if(data.length>0) { - bound.minValue = data[0]; - bound.maxValue = data[0]; - for(int i=1; i maxValue || value < minValue) { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java index 1721b240217c..8cbfaa158747 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java @@ -26,19 +26,5 @@ public class GlobalCompare { return CompareValue.EQUAL_TO; } -/* check the magnitude of two array, the frontial is more important - **/ - public static int compareArray(double[] fit1, double[] fit2) { - if (fit1.length!=fit2.length) { - return CompareValue.INVALID; //error - } - for (int i=0; ifit2[i]) { - return CompareValue.LARGER_THAN; //Large than - } else if (fit1[i]=totalIndices.length) { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java index c33d6490b4be..6fee1b7367e4 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java @@ -68,10 +68,5 @@ public class SearchPoint extends BasicPoint implements IEncodeEngine { return encodeInfo[0] == 0; //no constraint violations } - public void outputSelf() { - System.out.println("#--> Location:"); - OutputMethods.outputVector(getLocation()); - System.out.println("#--> (CON & OPTIM):"); - OutputMethods.outputVector(getEncodeInfo()); - } + } \ No newline at end of file diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java index 5bbd88a26a45..98c6824b73d6 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java @@ -65,11 +65,7 @@ public abstract class ProblemEncoder { designSpace.setElemAt(dd, i); } - protected void setDefaultXAt(int i, double min, double max) { - DesignDim dd = new DesignDim(); - dd.paramBound = new BasicBound(min, max); - designSpace.setElemAt(dd, i); - } + //set the default information for evaluation each response protected void setDefaultYAt(int i, double min, double max) { @@ -78,12 +74,7 @@ public abstract class ProblemEncoder { evalStruct.setElemAt(ee, i); } - protected void setDefaultYAt(int i, double min, double max, double weight) { - EvalElement ee = new EvalElement(); - ee.targetBound = new BasicBound(min, max); - ee.weight = weight; - evalStruct.setElemAt(ee, i); - } + //get a fresh point public SearchPoint getFreshSearchPoint() { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java index aa9988c1b3a9..2ddbf1b891a8 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java @@ -29,10 +29,7 @@ public class DesignDim { public BasicBound paramBound = new BasicBound(); //the range of a parameter - public void importData(DesignDim ipr) { - this.grain = ipr.grain; - this.paramBound = ipr.paramBound; - } + public boolean isDiscrete() { return grain!=0; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java index bd620fa5bb9c..0b98752acb80 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java @@ -35,9 +35,7 @@ public class DesignSpace { dimProps = new DesignDim[dim]; } - public DesignDim getDimAt(int index) { - return dimProps[index]; - } + public void setElemAt(DesignDim elem, int index) { dimProps[index] = elem; @@ -60,56 +58,26 @@ public class DesignSpace { } } - public void randomAdjust (double[] location){ - for (int i=0; i