Fixed Some Bug with Uninitialized Variables, Removed Useless Class

Thomas Weise · Thomas Weise · commit f71776045def · 2016-07-17T15:48:24.000+08:00
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/Transformation.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/Transformation.java
@@ -80,15 +80,15 @@ public boolean isLongArithmeticAccurate() {
    *          the data element
    * @return the transformation function
    */
-  public final TransformationFunction use(final IDataElement element) {
+  public final UnaryFunction use(final IDataElement element) {
     UnaryFunction useFunction;
 
     useFunction = ((this.m_func instanceof ICloneable)
         ? ((UnaryFunction) (((ICloneable) (this.m_func)).clone()))
         : this.m_func);
 
     Transformation.__use(useFunction, element);
-    return new TransformationFunction(this, useFunction);
+    return useFunction;
   }
 
   /**
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/TransformationFunction.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/TransformationFunction.java
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/_DataBasedConstant.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/_DataBasedConstant.java
@@ -101,13 +101,6 @@ final void _update(final IDataElement element) {
     }
   }
 
-  /** clear this property constant's numerical value */
-  final void _clear() {
-    this.m_longVal = Long.MIN_VALUE;
-    this.m_doubleVal = Double.NaN;
-    this.m_state = BasicNumber.STATE_EMPTY;
-  }
-
   /** {@inheritDoc} */
   @Override
   public final int getState() {
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/aggregation2D/Aggregation2D.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/aggregation2D/Aggregation2D.java
@@ -12,7 +12,6 @@
 import org.optimizationBenchmarking.evaluator.attributes.functions.FunctionAttribute;
 import org.optimizationBenchmarking.evaluator.attributes.functions.NamedParameterTransformationParser;
 import org.optimizationBenchmarking.evaluator.attributes.functions.Transformation;
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.EAttributeType;
 import org.optimizationBenchmarking.evaluator.data.spec.IElementSet;
 import org.optimizationBenchmarking.evaluator.data.spec.IExperiment;
@@ -24,6 +23,7 @@
 import org.optimizationBenchmarking.utils.document.spec.IComplexText;
 import org.optimizationBenchmarking.utils.document.spec.IMath;
 import org.optimizationBenchmarking.utils.hash.HashUtils;
+import org.optimizationBenchmarking.utils.math.functions.UnaryFunction;
 import org.optimizationBenchmarking.utils.math.functions.basic.Identity;
 import org.optimizationBenchmarking.utils.math.matrix.IMatrix;
 import org.optimizationBenchmarking.utils.math.matrix.processing.ColumnTransformedMatrix;
@@ -225,9 +225,8 @@ final IMatrix _computeInstanceRuns(final IInstanceRuns data,
     final IMatrix result;
     final DimensionTransformation xIn, yIn;
     final Transformation yOut;
-    final TransformationFunction xFunction, yInputFunction,
-        yOutputFunction;
-    final boolean useX, useY;
+    final UnaryFunction xFunction, yInputFunction, yOutputFunction;
+    boolean doTransform;
     IMatrix current;
     CallableMatrixIteration2DBuilder<IMatrix> builder;
     ScalarAggregate aggregate;
@@ -241,24 +240,32 @@ final IMatrix _computeInstanceRuns(final IInstanceRuns data,
       name = null;
     }
 
+    doTransform = false;
     xIn = this.getXAxisTransformation();
-    xFunction = xIn.use(data);
-    useX = (!(xFunction.isIdentityTransformation()));
+    if (xIn.isIdentityTransformation()) {
+      xFunction = Identity.INSTANCE;
+    } else {
+      doTransform = true;
+      xFunction = xIn.use(data);
+    }
 
     yIn = this.getYAxisInputTransformation();
-    yInputFunction = yIn.use(data);
-    useY = (!(yInputFunction.isIdentityTransformation()));
+    if (yIn.isIdentityTransformation()) {
+      yInputFunction = Identity.INSTANCE;
+    } else {
+      yInputFunction = yIn.use(data);
+      doTransform = true;
+    }
 
     runs = data.getData();
     i = runs.size();
     matrices = new IMatrix[i];
 
     for (; (--i) >= 0;) {
       current = runs.get(i).selectColumns(this.m_xIndex, this.m_yIndex);
-      if (useX || useY) {
+      if (doTransform) {
         current = new ColumnTransformedMatrix(current, //
-            useX ? xFunction : Identity.INSTANCE, //
-            useY ? yInputFunction : Identity.INSTANCE).copy();
+            xFunction, yInputFunction).copy();
       }
       matrices[i] = current.copy();
     }
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/ECDF.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/ECDF.java
@@ -11,7 +11,6 @@
 import org.optimizationBenchmarking.evaluator.attributes.functions.FunctionAttribute;
 import org.optimizationBenchmarking.evaluator.attributes.functions.NamedParameterTransformationParser;
 import org.optimizationBenchmarking.evaluator.attributes.functions.Transformation;
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.EAttributeType;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IElementSet;
@@ -41,6 +40,7 @@
 import org.optimizationBenchmarking.utils.document.spec.IText;
 import org.optimizationBenchmarking.utils.hash.HashUtils;
 import org.optimizationBenchmarking.utils.math.NumericalTypes;
+import org.optimizationBenchmarking.utils.math.functions.UnaryFunction;
 import org.optimizationBenchmarking.utils.math.matrix.IMatrix;
 import org.optimizationBenchmarking.utils.math.matrix.processing.iterator2D.CallableMatrixIteration2DBuilder;
 import org.optimizationBenchmarking.utils.math.matrix.processing.iterator2D.EIterationDirection;
@@ -507,7 +507,7 @@ final IMatrix _computeInstanceRuns(final IInstanceRuns data,
       final Logger logger) {
     final _List list;
     final DimensionTransformation xIn, yIn;
-    TransformationFunction yInFunc, xInFunc, yOutFunc;
+    UnaryFunction yInFunc, xInFunc, yOutFunc;
     final IDimension timeDim, goalDim;
     final IMatrix result;
     String name;
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_DoubleTimeDoubleGoal.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_DoubleTimeDoubleGoal.java
@@ -1,6 +1,5 @@
 package org.optimizationBenchmarking.evaluator.attributes.functions.ecdf;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDataPoint;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IRun;
@@ -28,8 +27,8 @@ final class _DoubleTimeDoubleGoal extends _Doubles {
    *          the goal
    */
   _DoubleTimeDoubleGoal(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform, final double goal) {
+      final EComparison criterion, final UnaryFunction goalTransform,
+      final double goal) {
     super(timeDim, goalDim, criterion, goalTransform);
     this.m_goal = goal;
   }
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_DoubleTimeLongGoal.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_DoubleTimeLongGoal.java
@@ -1,6 +1,5 @@
 package org.optimizationBenchmarking.evaluator.attributes.functions.ecdf;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDataPoint;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IRun;
@@ -28,8 +27,8 @@ final class _DoubleTimeLongGoal extends _Doubles {
    *          the goal
    */
   _DoubleTimeLongGoal(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform, final long goal) {
+      final EComparison criterion, final UnaryFunction goalTransform,
+      final long goal) {
     super(timeDim, goalDim, criterion, goalTransform);
     this.m_goal = goal;
   }
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_Doubles.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_Doubles.java
@@ -2,7 +2,6 @@
 
 import java.util.Arrays;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.utils.comparison.EComparison;
 import org.optimizationBenchmarking.utils.math.functions.UnaryFunction;
@@ -30,8 +29,7 @@ abstract class _Doubles extends _List {
    *          the goal transformation
    */
   _Doubles(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform) {
+      final EComparison criterion, final UnaryFunction goalTransform) {
     super(timeDim, goalDim, criterion, goalTransform);
     this.m_data = new double[1024];
     this.m_last = (this.m_isTimeIncreasing ? Double.NEGATIVE_INFINITY
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_List.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_List.java
@@ -1,10 +1,10 @@
 package org.optimizationBenchmarking.evaluator.attributes.functions.ecdf;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IRun;
 import org.optimizationBenchmarking.utils.comparison.EComparison;
 import org.optimizationBenchmarking.utils.math.functions.UnaryFunction;
+import org.optimizationBenchmarking.utils.math.functions.basic.Identity;
 import org.optimizationBenchmarking.utils.math.matrix.impl.DoubleMatrix1D;
 
 /** a list */
@@ -53,8 +53,7 @@ abstract class _List {
    *          the goal transformation
    */
   _List(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform) {
+      final EComparison criterion, final UnaryFunction goalTransform) {
     super();
     this.m_timeIndex = timeDim.getIndex();
     this.m_goalIndex = goalDim.getIndex();
@@ -63,7 +62,7 @@ abstract class _List {
 
     setTransform: {
 
-      if (goalTransform.isIdentityTransformation()) {
+      if (goalTransform instanceof Identity) {
         setNoTransform: {
           switcher: switch (criterion) {
             case LESS_OR_EQUAL: {
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_LongTimeDoubleGoal.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_LongTimeDoubleGoal.java
@@ -1,6 +1,5 @@
 package org.optimizationBenchmarking.evaluator.attributes.functions.ecdf;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDataPoint;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IRun;
@@ -28,8 +27,8 @@ final class _LongTimeDoubleGoal extends _Longs {
    *          the goal
    */
   _LongTimeDoubleGoal(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform, final double goal) {
+      final EComparison criterion, final UnaryFunction goalTransform,
+      final double goal) {
     super(timeDim, goalDim, criterion, goalTransform);
     this.m_goal = goal;
   }
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_LongTimeLongGoal.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_LongTimeLongGoal.java
@@ -1,6 +1,5 @@
 package org.optimizationBenchmarking.evaluator.attributes.functions.ecdf;
 
-import org.optimizationBenchmarking.evaluator.attributes.functions.TransformationFunction;
 import org.optimizationBenchmarking.evaluator.data.spec.IDataPoint;
 import org.optimizationBenchmarking.evaluator.data.spec.IDimension;
 import org.optimizationBenchmarking.evaluator.data.spec.IRun;
@@ -28,8 +27,8 @@ final class _LongTimeLongGoal extends _Longs {
    *          the goal
    */
   _LongTimeLongGoal(final IDimension timeDim, final IDimension goalDim,
-      final EComparison criterion,
-      final TransformationFunction goalTransform, final long goal) {
+      final EComparison criterion, final UnaryFunction goalTransform,
+      final long goal) {
     super(timeDim, goalDim, criterion, goalTransform);
     this.m_goal = goal;
   }
diff --git a/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_Longs.java b/src/main/java/org/optimizationBenchmarking/evaluator/attributes/functions/ecdf/_Longs.java

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,6 @@ final void _update(final IDataElement element) {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- /** clear this property constant's numerical value */`
`105`		`- final void _clear() {`
`106`		`- this.m_longVal = Long.MIN_VALUE;`
`107`		`- this.m_doubleVal = Double.NaN;`
`108`		`- this.m_state = BasicNumber.STATE_EMPTY;`
`109`		`- }`
`110`		`-`
`111`	`104`	`/** {@inheritDoc} */`
`112`	`105`	`@Override`
`113`	`106`	`public final int getState() {`