private=>protected for some methods

This commit is contained in:
Michael de Paly 2010-02-11 01:05:23 +00:00
parent 952d3585a0
commit 569379d18f

View File

@ -19,25 +19,25 @@ import eva2.tools.math.Jama.Matrix;
public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java.io.Serializable { public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java.io.Serializable {
private int m_D; protected int m_D;
private double[] m_Z; protected double[] m_Z;
private double m_SigmaGlobal = 1; protected double m_SigmaGlobal = 1;
private double m_InitSigmaScalar = 1; protected double m_InitSigmaScalar = 1;
private double m_c; protected double m_c;
private double cu; protected double cu;
private double cov; protected double cov;
private double Beta; protected double Beta;
private double[] s_N; protected double[] s_N;
private double[] m_PathS; protected double[] m_PathS;
public double[] Bz; protected double[] Bz;
private double xi_dach; protected double xi_dach;
private Matrix m_C; protected Matrix m_C;
private Matrix B; protected Matrix B;
private boolean m_CheckConstraints = false; protected boolean m_CheckConstraints = false;
private int m_constraint = 20; protected int m_constraint = 20;
private int m_Counter; protected int m_Counter;
private int m_frequency = 1; protected int m_frequency = 1;
private double[] m_Eigenvalues; protected double[] m_Eigenvalues;
public MutateESCovarianceMatrixAdaption() { public MutateESCovarianceMatrixAdaption() {
@ -158,7 +158,7 @@ public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java
// nothing to do here // nothing to do here
} }
private void adaptStrategy() { protected void adaptStrategy() {
double Cij; double Cij;
double Bz_d; double Bz_d;
double pathLen = 0.0; double pathLen = 0.0;
@ -184,7 +184,7 @@ public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java
this.m_SigmaGlobal = this.m_SigmaGlobal * Math.exp(this.Beta * this.m_c * (Math.sqrt(pathLen) - this.xi_dach));; this.m_SigmaGlobal = this.m_SigmaGlobal * Math.exp(this.Beta * this.m_c * (Math.sqrt(pathLen) - this.xi_dach));;
} }
private void evaluateNewObjectX(double[] x,double[][] range) { protected void evaluateNewObjectX(double[] x,double[][] range) {
// if (Double.isNaN((x[0]))) System.out.println("treffer in cma "+ x[0]); // if (Double.isNaN((x[0]))) System.out.println("treffer in cma "+ x[0]);
// if (Double.isNaN((m_C.get(0,0)))) System.out.println("treffer in cma"); // if (Double.isNaN((m_C.get(0,0)))) System.out.println("treffer in cma");
// for (int i=0;i<N;i++) { // evaluate new random values // for (int i=0;i<N;i++) { // evaluate new random values