NumberContext

Author: apete

.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7

src/org/ojalgo/access/Access1D.java

@@ -58,9 +58,16 @@ public interface Elements extends Structure1D {
 
         /**
          * @see Scalar#isZero()
+         * @deprecated v37
          */
+        @Deprecated
         boolean isZero(long index);
 
+        /**
+         * @see Scalar#isSmall(double)
+         */
+        boolean isSmall(long index, double comparedTo);
+
     }
 
     public interface Factory<I extends Access1D<?>> {

src/org/ojalgo/access/Access2D.java

@@ -68,9 +68,16 @@ public interface Elements extends Structure2D, Access1D.Elements {
 
         /**
          * @see Scalar#isZero()
+         * @deprecated v37
          */
+        @Deprecated
         boolean isZero(long row, long column);
 
+        /**
+         * @see Scalar#isSmall(double)
+         */
+        boolean isSmall(long row, long column, double comparedTo);
+
     }
 
     public interface Factory<I extends Access2D<?>> {

src/org/ojalgo/access/AccessAnyD.java

@@ -61,6 +61,11 @@ public interface Elements extends StructureAnyD, Access1D.Elements {
          */
         boolean isZero(long[] reference);
 
+        /**
+         * @see Scalar#isSmall(double)
+         */
+        boolean isSmall(long[] reference, double comparedTo);
+
     }
 
     public interface Factory<I extends AccessAnyD<?>> {

src/org/ojalgo/access/AccessUtils.java

@@ -500,14 +500,14 @@ public static boolean equals(final Access1D<?> accessA, final Access1D<?> access
             final Access1D<ComplexNumber> tmpAccessB = (Access1D<ComplexNumber>) accessB;
 
             for (int i = 0; retVal && (i < tmpLength); i++) {
-                retVal &= context.isSmallError(tmpAccessA.get(i).doubleValue(), tmpAccessB.get(i).doubleValue());
-                retVal &= context.isSmallError(tmpAccessA.get(i).i, tmpAccessB.get(i).i);
+                retVal &= !context.isDifferent(tmpAccessA.get(i).getReal(), tmpAccessB.get(i).getReal());
+                retVal &= !context.isDifferent(tmpAccessA.get(i).i, tmpAccessB.get(i).i);
             }
 
         } else {
 
             for (int i = 0; retVal && (i < tmpLength); i++) {
-                retVal &= context.isSmallError(accessA.doubleValue(i), accessB.doubleValue(i));
+                retVal &= !context.isDifferent(accessA.doubleValue(i), accessB.doubleValue(i));
             }
         }
 

src/org/ojalgo/array/Array1D.java

@@ -46,7 +46,7 @@
  * @author apete
  */
 public final class Array1D<N extends Number> extends AbstractList<N> implements Access1D<N>, Access1D.Elements, Access1D.Fillable<N>, Access1D.Modifiable<N>,
-Access1D.Visitable<N>, RandomAccess, Serializable {
+        Access1D.Visitable<N>, RandomAccess, Serializable {
 
     public static abstract class Factory<N extends Number> implements Access1D.Factory<Array1D<N>> {
 
@@ -398,6 +398,10 @@ public boolean isRangeZeros(final long first, final long limit) {
         return myDelegate.isZeros((myFirst + (myStep * first)), (myFirst + (myStep * limit)), myStep);
     }
 
+    public boolean isSmall(final long index, final double comparedTo) {
+        return myDelegate.isSmall(myFirst + (myStep * index), comparedTo);
+    }
+
     /**
      * @see Scalar#isZero()
      */

src/org/ojalgo/array/Array2D.java

@@ -46,7 +46,7 @@
  * @author apete
  */
 public final class Array2D<N extends Number> implements Access2D<N>, Access2D.Elements, Access2D.Fillable<N>, Access2D.Iterable2D<N>, Access2D.Modifiable<N>,
-        Access2D.Visitable<N>, Serializable {
+Access2D.Visitable<N>, Serializable {
 
     public static abstract class Factory<N extends Number> implements Access2D.Factory<Array2D<N>> {
 
@@ -441,6 +441,14 @@ public boolean isRowZeros(final long row, final long column) {
         return myDelegate.isZeros(row + (column * myRowsCount), row + (myColumnsCount * myRowsCount), myRowsCount);
     }
 
+    public boolean isSmall(final long index, final double comparedTo) {
+        return myDelegate.isSmall(index, comparedTo);
+    }
+
+    public boolean isSmall(final long row, final long column, final double comparedTo) {
+        return myDelegate.isSmall(row + (column * myRowsCount), comparedTo);
+    }
+
     public boolean isZero(final long index) {
         return myDelegate.isZero(index);
     }

src/org/ojalgo/array/ArrayAnyD.java

@@ -239,6 +239,14 @@ public boolean isPositive(final long[] reference) {
         return myDelegate.isPositive(AccessUtils.index(myStructure, reference));
     }
 
+    public boolean isSmall(final long index, final double comparedTo) {
+        return myDelegate.isSmall(index, comparedTo);
+    }
+
+    public boolean isSmall(final long[] reference, final double comparedTo) {
+        return myDelegate.isSmall(AccessUtils.index(myStructure, reference), comparedTo);
+    }
+
     public boolean isZero(final long index) {
         return myDelegate.isZero(index);
     }

src/org/ojalgo/array/BigArray.java

@@ -368,4 +368,9 @@ DenseArray<BigDecimal> newInstance(final int capacity) {
         return new BigArray(capacity);
     }
 
+    @Override
+    protected boolean isSmall(final int index, final double comparedTo) {
+        return BigScalar.isSmall(comparedTo, data[index]);
+    }
+
 }