Fix FLensProblem and viewer. setProblemDimension is now in AbstractOptimizationProblem
This commit is contained in:
		@@ -3,18 +3,10 @@ package eva2.gui;
 | 
				
			|||||||
import javax.swing.*;
 | 
					import javax.swing.*;
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Title:        EvA2
 | 
					 *
 | 
				
			||||||
 * Description:
 | 
					 | 
				
			||||||
 * Copyright:    Copyright (c) 2003
 | 
					 | 
				
			||||||
 * Company:      University of Tuebingen, Computer Architecture
 | 
					 | 
				
			||||||
 * @author Holger Ulmer, Felix Streichert, Hannes Planatscher
 | 
					 | 
				
			||||||
 * @version:  $Revision: 10 $
 | 
					 | 
				
			||||||
 *            $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $
 | 
					 | 
				
			||||||
 *            $Author: streiche $
 | 
					 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public final class JEFrameRegister {
 | 
					public final class JEFrameRegister {
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Singleton instance.
 | 
					     * Singleton instance.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -570,4 +570,13 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati
 | 
				
			|||||||
    public int getProblemDimension() {
 | 
					    public int getProblemDimension() {
 | 
				
			||||||
        return this.problemDimension;
 | 
					        return this.problemDimension;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Length of the x vector at is to be optimized
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param t Length of the x vector at is to be optimized
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public void setProblemDimension(int t) {
 | 
				
			||||||
 | 
					        this.problemDimension = t;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,14 +73,5 @@ public abstract class AbstractProblemDoubleOffset extends AbstractProblemDouble
 | 
				
			|||||||
    public double getYOffset() {
 | 
					    public double getYOffset() {
 | 
				
			||||||
        return this.yOffset;
 | 
					        return this.yOffset;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * Length of the x vector at is to be optimized
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param t Length of the x vector at is to be optimized
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public void setProblemDimension(int t) {
 | 
					 | 
				
			||||||
        this.problemDimension = t;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -175,7 +175,6 @@ public class FLensProblem extends AbstractOptimizationProblem
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    private static final long serialVersionUID = 4694920294291719310L;
 | 
					    private static final long serialVersionUID = 4694920294291719310L;
 | 
				
			||||||
    protected AbstractEAIndividual overallBest = null;
 | 
					    protected AbstractEAIndividual overallBest = null;
 | 
				
			||||||
    protected int problemDimension = 10;
 | 
					 | 
				
			||||||
    protected double noise = 0.0;
 | 
					    protected double noise = 0.0;
 | 
				
			||||||
    protected double xOffset = 0.0;
 | 
					    protected double xOffset = 0.0;
 | 
				
			||||||
    protected double yOffset = 0.0;
 | 
					    protected double yOffset = 0.0;
 | 
				
			||||||
@@ -520,16 +519,6 @@ public class FLensProblem extends AbstractOptimizationProblem
 | 
				
			|||||||
        return "Choose an offset for the objective value.";
 | 
					        return "Choose an offset for the objective value.";
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * This method allows you to set the number of mulitruns that are to be performed,
 | 
					 | 
				
			||||||
     * necessary for stochastic optimizers to ensure reliable results.
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param multiruns The number of multiruns that are to be performed
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public void setProblemDimension(int multiruns) {
 | 
					 | 
				
			||||||
        this.problemDimension = multiruns;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * This method allows you to toggle the solution representation.
 | 
					     * This method allows you to toggle the solution representation.
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user