diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-19 16:03:41 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-05 08:23:29 +0200 |
commit | 43cc8ad33e815522e2b23ac87a4a9c4526cd85c9 (patch) | |
tree | b042266508f8b084bc7bbe9cc57250a971311099 /nlpsolver | |
parent | cfcbe2e44e33f4a60e70006ff5e1cbb9aa2adceb (diff) |
java: remove dead code
found by UCDetector
Change-Id: I6b0f49529379072da566e927b86815f173e7a90b
Diffstat (limited to 'nlpsolver')
19 files changed, 0 insertions, 664 deletions
diff --git a/nlpsolver/Jar_EvolutionarySolver.mk b/nlpsolver/Jar_EvolutionarySolver.mk index ba8f23f4398a..5dad01a717bb 100644 --- a/nlpsolver/Jar_EvolutionarySolver.mk +++ b/nlpsolver/Jar_EvolutionarySolver.mk @@ -24,21 +24,12 @@ $(eval $(call gb_Jar_set_packageroot,EvolutionarySolver,net/adaptivebox)) $(eval $(call gb_Jar_set_manifest,EvolutionarySolver,$(SRCDIR)/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/Manifest.mf)) $(eval $(call gb_Jar_add_sourcefiles,EvolutionarySolver,\ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine \ @@ -46,7 +37,6 @@ $(eval $(call gb_Jar_add_sourcefiles,EvolutionarySolver,\ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim \ - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library \ nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine \ diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk index 5dca8ac42e95..b7749e2d4189 100644 --- a/nlpsolver/Jar_nlpsolver.mk +++ b/nlpsolver/Jar_nlpsolver.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label \ - nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/DummyEvolutionarySolverStatusDialog \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno \ diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java index 6eed75dc3167..15760e23a39e 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java @@ -32,9 +32,6 @@ public class EvalStruct { public EvalStruct(int elemsNum) { evalElems = new EvalElement[elemsNum]; } - public int getSize() { - return evalElems.length; - } public void setElemAt(EvalElement dim, int index) { evalElems[index] = dim; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java deleted file mode 100644 index 4718f6ce62da..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Description: basic operations on Arrays - * - * Author Create/Modi Note - * Xiaofeng Xie Oct. 9, 2002 - * - */ - -package net.adaptivebox.global; - -public class BasicArray { - public static double getMinValue(double[] v) { - double mv = Double.MAX_VALUE; - for (int i=0; i<v.length; i++) { - if (v[i]<mv) { - mv=v[i]; - } - } - return mv; - } - public static double getMaxValue(double[] v) { - double mv = -Double.MAX_VALUE; - for (int i=0; i<v.length; i++) { - if (v[i]>mv) { - mv=v[i]; - } - } - return mv; - } - -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java index f7b8dfdb6f2d..31ab19f800e4 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java @@ -37,13 +37,6 @@ public class BasicBound { return Math.abs(maxValue-minValue); } - public boolean isSatisfyCondition(double child){ - if(child > maxValue || child < minValue) { - return(false); - } - return(true); - } - public double boundAdjust(double value){ if(value > maxValue) { value = maxValue; @@ -66,13 +59,6 @@ public class BasicBound { - public double randomAdjust (double value){ - if(value > maxValue || value < minValue) { - value = getRandomValue(); - } - return value; - } - public double getRandomValue(){ return RandomGenerator.doubleRangeRandom(minValue, maxValue); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java deleted file mode 100644 index 0bb5cc663817..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Description: defines some static constant values. - * - * Author Create/Modi Note - * Xiaofeng Xie Sep 22, 2000 xiaofengxie@tsinghua.org.cn - * - * @version 1.0 - * @Since MAOS1.0 - */ - -package net.adaptivebox.global; - - -public class BasicTag { - - public static final String DOT_TAG = "."; - - public static final String FILE_SEP_TAG = System.getProperty("file.separator"); - -} - diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java deleted file mode 100644 index a48796a55109..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Description: Global value for comparison. - * - * Author Create/Modi Note - * Xiaofeng Xie Jun 15, 2002 - * Xiaofeng Xie Feb 18, 2004 - * - * @version 1.0 - * @Since MAOS1.0 - */ - - -package net.adaptivebox.global; - -public class CompareValue { - public static final int LARGER_THAN = 2; - public static final int EQUAL_TO = 1; - public static final int LESS_THAN = 0; -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java deleted file mode 100644 index 741f201e5a11..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Description: Global package for comparison. - * - * Author Create/Modi Note - * Xiaofeng Xie Jun 15, 2002 xiaofengxie@tsinghua.org.cn - * - * - * @version 1.0 - * @Since MAOS1.0 - */ - - -package net.adaptivebox.global; - -public class GlobalCompare { - -/* compare the data1 and data2, if data1=data2, return 0 - * if data1 < data2, return LESS_THAN, else if data1 > data2, LARGER_THAN - **/ - static public int compare(double data1, double data2) { - if (data1 < data2) - return CompareValue.LESS_THAN; - else if (data1 > data2) - return CompareValue.LARGER_THAN; - else - return CompareValue.EQUAL_TO; - } - - -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java deleted file mode 100644 index 707dd7e1d214..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java +++ /dev/null @@ -1,277 +0,0 @@ -/** - * Description: Global package for file operations. - * - * Author Create/Modi Note - * Xiaofeng Xie Jun 15, 2002 - * - * @version 1.0 - * @Since MAOS1.0 - */ - - -package net.adaptivebox.global; - -import java.io.*; -import java.util.*; - -public class GlobalFile { - -// used by the createTempDir to give an index of temp number. - private static int counter = -1; - -/** - * Create a temp directory in the given directory. - * @param prefix the prefix for the directory. - * @param directory the directory that the temp dirctory placed. - * @return If a temp directory is created, return a File Object, else - * return null. - */ - public static File createTempDir(String prefix, String directory) - { - File f = null; - String tempDir; - boolean isCreated = false; - do { - if (counter == -1) { - counter = new Random().nextInt() & 0xffff; - } - counter++; - if (prefix == null) - throw new NullPointerException(); - if (prefix.length() < 3) - throw new IllegalArgumentException("Prefix string too short"); - if (directory == null) { - tempDir = prefix + counter; - } else { - tempDir = getFileLocation(directory, prefix + counter); - } - f = new File(tempDir); - isCreated = f.mkdir(); - } while (!isCreated); - return f; - } - -/** - * Add the given text string to the end of a given file. - * @param inStr The string to be added. - * @param fileStr the name of the file to be added. - */ - public static void addStringToFile(String inStr, String fileStr) throws Exception { - - RandomAccessFile raFile = new RandomAccessFile(fileStr,"rw"); - raFile.seek(raFile.length()); - raFile.writeBytes(inStr); - raFile.close(); - } - - public static Object loadObjectFromFile(String fileName) throws Exception { - FileInputStream fis = new FileInputStream(fileName); - ObjectInputStream ois = new ObjectInputStream(fis); - Object obj = ois.readObject(); - ois.close(); - return obj; - } - - public static void saveObjectToFile(String fileName, Object obj) throws Exception { - FileOutputStream ostream = new FileOutputStream(fileName); - ObjectOutputStream p = new ObjectOutputStream(ostream); - p.writeObject(obj); - p.flush(); - ostream.close(); - } - -/** - * Save the given text string to a given file. - * @param inStr The string to be saved. - * @param fileStr the name of the file to be saved. - */ - public static void saveStringToFile(String inStr, String fileStr) throws Exception{ - new File(new File(fileStr).getParent()).mkdirs(); - FileOutputStream pspOutputStream = null; - try { - pspOutputStream = new FileOutputStream(new File(fileStr)); - pspOutputStream.write(inStr.getBytes()); - } finally { - if (pspOutputStream != null) - pspOutputStream.close(); - } - } - -/** - * Load text string from a given file. - * @param fileStr the name of the file to be loaded. - * @return A text string that is the content of the file. if the given file is - * not exist, then return null. - */ - public static String getStringFromFile(String fileStr) throws Exception { - String getStr = null; - FileInputStream pspInputStream = null; - try { - pspInputStream = new FileInputStream(fileStr); - byte[] pspFileBuffer = new byte[pspInputStream.available()]; - pspInputStream.read(pspFileBuffer); - - getStr = new String(pspFileBuffer); - } finally { - if (pspInputStream != null) - pspInputStream.close(); - } - return getStr; - } - -/** - * Load curve data from a specified file. - * @param fileName the name of the file to be loaded. - * @return An ArrayList that include the curve data. - */ - public static ArrayList<ArrayList<Double>> getCurveDataFromFile(String fileName) { - File file = new File(fileName); - if(!file.exists()){ - return null; - } - //open data file - FileInputStream inStream = null; - BufferedReader inReader = null; - try{ - inStream = new FileInputStream(file); - inReader = new BufferedReader(new InputStreamReader(inStream)); - }catch(Exception e){ - return null;//Data file open error. - } - ArrayList<Double> xaxes = new ArrayList<Double>(1); - ArrayList<Double> yaxes = new ArrayList<Double>(1); - try{ - StringTokenizer st; - String s; - boolean start = false; - while(inReader.ready()){ - st = new StringTokenizer(inReader.readLine()); - over:{ - while(!st.hasMoreTokens()){//Justify blank lines. - if(inReader.ready()){ - st = new StringTokenizer(inReader.readLine()); - }else - break over; - } - s = st.nextToken(); - if((!start)&&(!s.startsWith("@"))) - break over; - if(!start){ - start = true; - break over; - } - if(s.startsWith("#")||s.startsWith("$")||s.startsWith("/")) break over;//Justify comment line. - Double xaxis = null; - Double yaxis = null; - try{ - xaxis = Double.valueOf(s); - xaxes.add(xaxis); - }catch(NumberFormatException e){ - inReader.close(); - inStream.close(); - return null;//Data file data format error. - } - s = st.nextToken(); - try{ - yaxis = Double.valueOf(s); - yaxes.add(yaxis); - }catch(NumberFormatException e){ - inReader.close(); - inStream.close(); - return null;//Data file data format error. - } - } - } - inReader.close(); - }catch(Exception e){ - return null;//Uncertain data file error. - } - ArrayList<ArrayList<Double>> curveData = new ArrayList<ArrayList<Double>>(2); - curveData.add(xaxes); - curveData.add(yaxes); - return curveData; - } - -/** - * Get a full path of a given file name and a directory name. - * @param fileName the name of the file. - * @param dir the name of directory. - * @return The full path. - */ - public static String getFileLocation(String dir, String fileName) { - String realDir = dir; - while (realDir.length()>0 && (realDir.endsWith("/")||realDir.endsWith("\\"))) { - realDir = dir.substring(0, dir.length()-1); - } - return realDir+BasicTag.FILE_SEP_TAG+fileName; - } - - public static String getFileName(String nameBody, String suffix) { - if (suffix==null || suffix.trim().length()==0) { - return nameBody; - } - String fileName = nameBody; - if(nameBody.endsWith(".")) { - return fileName+suffix; - } else { - return nameBody+"."+suffix; - } - } - - public static String getFileLocation(String dir, String fileNameBody, String fileNameSuffix) { - String filename = getFileName(fileNameBody, fileNameSuffix); - return getFileLocation(dir, filename); - } - - public static void clear(String fileStr) throws Exception { - File file = new File(fileStr); - if(file.isFile()) { - file.delete(); - return; - } - String[] fileNames = file.list(); - if (fileNames==null) { - return; - } - for (int i=0; i<fileNames.length; i++) { - String newFileName = GlobalFile.getFileLocation(fileStr,fileNames[i]); - clear(newFileName); - } - file.delete(); - } - - public static String getFilePrefix(String fileStr) { - int index = fileStr.lastIndexOf(BasicTag.DOT_TAG); - if(index==-1) index = fileStr.length(); - return fileStr.substring(0, index); - } - - public static String getFileSuffix(String fileStr) { - String[] subNames = GlobalString.tokenize(fileStr, BasicTag.DOT_TAG); - int subNameLen = subNames.length; - if(subNameLen==1) return ""; - else return subNames[subNameLen-1]; - } - - public static String createTempImageFile(String origFile) throws Exception { - return createTempImageFile(origFile, "img", ".inf"); - } - - public static String createTempImageFile(String origFile, String prefix, String suffix) throws Exception { - File outputFile = createTempFile(prefix, suffix); - outputFile.deleteOnExit(); - copyFile(outputFile.getAbsolutePath(), origFile); - return outputFile.getAbsolutePath(); - } - - public static void copyFile(String imgFile, String origFile) throws Exception { - String fileContent = GlobalFile.getStringFromFile(origFile); - GlobalFile.saveStringToFile(fileContent, imgFile); - } - - public static File createTempFile(String prefix, String suffix) throws Exception { - String realSuffix = suffix; - if (!realSuffix.startsWith(".")) realSuffix = "."+suffix; - return File.createTempFile(prefix, realSuffix); - } -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java deleted file mode 100644 index d7dafebb091a..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Description: operations for the a text string. - * - * Author Create/Modi Note - * Xiaofeng Xie Feb 22, 2001 - * Xiaofeng Xie May 12, 2004 - * - * This library 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 2.1 of the License, or (at your option) any later version. - * - * This library 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. - * - * Please acknowledge the author(s) if you use this code in any way. - * - * @version 1.0 - * @Since MAOS1.0 - */ - -package net.adaptivebox.global; - -import java.util.*; - -public class GlobalString { - - /** - * Tokenize a String with given key. - * - * @param input the String to be tokenized. - * @param tokenKey the delimiters. - * @return a String array that include the elements of input string that - * divided by the tokenKey. - */ - public static String[] tokenize(String input, String tokenKey) { - ArrayList<String> v = new ArrayList<String>(); - StringTokenizer t = new StringTokenizer(input, tokenKey); - while (t.hasMoreTokens()) { - v.add(t.nextToken()); - } - return v.toArray(new String[v.size()]); - } - -}
\ No newline at end of file diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java deleted file mode 100644 index 19dfab7a2a7b..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Description: Output methods for Array - * - * Author Create/Modi Note - * Xiaofeng Xie Feb 22, 2001 - * - * This library 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 2.1 of the License, or (at your option) any later version. - * - * This library 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. - * - * Please acknowledge the author(s) if you use this code in any way. - * - * @version 1.0 - * @Since MAOS1.0 - */ - -package net.adaptivebox.global; - - -public class OutputMethods { - - public static void outputVector(double[] vector){ - for(int i=0;i<vector.length;i++){ - System.out.print(vector[i]+" \t"); - } - System.out.println(""); - } -}
\ No newline at end of file diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java deleted file mode 100644 index 54ff61ce7dec..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Description: For comparison of goodness in landscape with penalty method. - * - * @Applied domain: efficiently for ridge class feasible space (SF), such as - * the problem with equality constraints - * - * Author Create/Modi Note - * Xiaofeng Xie May 29, 2004 - * - * @version 1.0 - * - * [1] Runarsson T P, Yao X. Stochastic ranking for constrained evolutionary - * optimization. IEEE Trans. on Evolutionary Computation. 2000, 4 (3): 284-294 - * - */ - -package net.adaptivebox.goodness; - -import net.adaptivebox.global.*; - -public class PenaltyComparator implements IGoodnessCompareEngine { - public double Rg = 0; - - public PenaltyComparator() {} - - public PenaltyComparator(double rg) { - this.Rg = rg; - } - - public double calcPenaltyValue(double fit1, double fit2) { - return fit1+Rg*fit2; - } - /** - * check the magnitude of two array, the frontial is more important - * Stoch ranking: array size = 2 - **/ - public int compare(double[] fit1, double[] fit2) { - return GlobalCompare.compare(calcPenaltyValue(fit1[1], fit1[0]), calcPenaltyValue(fit2[1], fit2[0])); - } - -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator.java deleted file mode 100644 index 5b2e82305d2b..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Description: For comparison of goodness in landscape with stoch. ranking. - * - * Author Create/Modi Note - * Xiaofeng Xie May 29, 2004 - * - * [1] Runarsson T P, Yao X. Stochastic ranking for constrained evolutionary - * optimization. IEEE Trans. on Evolutionary Computation. 2000, 4 (3): 284-294 - * - */ - -package net.adaptivebox.goodness; - -import net.adaptivebox.global.*; - -public class SRComparator implements IGoodnessCompareEngine, IUpdateCycleEngine { - public double Pf = 0.5; - - public SRComparator() {} - - public SRComparator(double pf) { - this.Pf = pf; - } - - public void updateCycle(int t) { - Pf *=0.995; - } - - /** - * check the magnitude of two array, the frontial is more important - * Stoch ranking: array size = 2 - **/ - public int compare(double[] fit1, double[] fit2) { - if((fit1[0]==fit2[0])||Pf>Math.random()) { - return GlobalCompare.compare(fit1[1], fit2[1]); - } else { - return GlobalCompare.compare(fit1[0], fit2[0]); - } - } - -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java index d4c202c989fc..cca7f0d4a069 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java @@ -32,10 +32,6 @@ public class Library { private final SearchPoint[] libPoints; private int gIndex = -1; - public Library(SearchPoint[] points){ - this.libPoints = points; - } - public Library(int number, ProblemEncoder problemEncoder){ libPoints = new SearchPoint[number]; for (int i=0; i<number; i++) { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java index bc32c1c8d78b..b7b055a1412d 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java @@ -53,10 +53,6 @@ public abstract class ProblemEncoder { return designSpace; } - public EvalStruct getEvalStruct() { - return evalStruct; - } - //set the default information for each dimension of search space (S) protected void setDefaultXAt(int i, double min, double max, double grain) { DesignDim dd = new DesignDim(); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java deleted file mode 100644 index 60b3644ffa5c..000000000000 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Description: For unconstrained function - * - * Author Create/Modi Note - * Xiaofeng Xie Dec 28, 2001 - * Xiaofeng Xie Mar 02, 2003 - * Xiaofeng Xie May 11, 2004 - * - * This library 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 2.1 of the License, or (at your option) any later version. - * - * This library 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. - * - * Please acknowledge the author(s) if you use this code in any way. - * - * @version 1.0 - * @Since MAOS1.0 - */ - -package net.adaptivebox.problem; - -import net.adaptivebox.global.*; - -public abstract class UnconstrainedProblemEncoder extends ProblemEncoder { - protected UnconstrainedProblemEncoder(int NX) throws Exception { - super(NX, 1); - setDefaultYAt(0, BasicBound.MINDOUBLE, BasicBound.MINDOUBLE); - } - - @Override - protected double calcTargetAt(int index, double[] VX) { - return calcTarget(VX); - } - abstract public double calcTarget(double[] VX); -} diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java index 1c36dd3d5910..7e7629af8e10 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java @@ -72,11 +72,6 @@ public class DesignSpace { for(int i=0;i<tempX.length;i++) tempX[i] = dimProps[i].paramBound.getRandomValue(); //Global.RandomGenerator.doubleRangeRandom(9.8, 10); } - public double[] getFreshGene() { - double[] tempX = new double[this.getDimension()]; - initializeGene(tempX); - return tempX; - } public void getMappingPoint(double[] point) { for(int i=0; i<getDimension(); i++) { point[i] = dimProps[i].paramBound.annulusAdjust(point[i]); diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java deleted file mode 100644 index 3f2fd198686d..000000000000 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2009 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package com.sun.star.comp.Calc.NLPSolver.dialogs; - -/** - * The ModalState is used to represent the state of the dialog when it closes. - * "Exit" indicates no significant change (for example when the user presses - * Cancel or simply closes the dialog). "OK" indicates for example, that the - * user pressed the OK button. - */ -public enum ModalState { - Exit -} diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java index 2af5b1176046..7de59c4b0f12 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java @@ -65,10 +65,6 @@ public abstract class BaseControl { properties = UnoRuntime.queryInterface(XPropertySet.class, unoModel); } - public Object getUnoControl() { - return unoControl; - } - public void setParentControl(BaseControl parentControl) { //TODO : remove from existing parentControl try { |