From 6d50174baa3fa3c21ad8d20fa6f3c0a62cf74394 Mon Sep 17 00:00:00 2001 From: tn Date: Thu, 19 Feb 2015 10:01:34 +0100 Subject: [PATCH] Remove deprecated classes in package geometry.partitioning.utilities. --- .../partitioning/utilities/AVLTree.java | 634 ------------------ .../partitioning/utilities/OrderedTuple.java | 431 ------------ .../utilities/doc-files/OrderedTuple.png | Bin 28882 -> 0 bytes .../partitioning/utilities/package-info.java | 24 - .../partitioning/utilities/AVLTreeTest.java | 176 ----- 5 files changed, 1265 deletions(-) delete mode 100644 src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTree.java delete mode 100644 src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/OrderedTuple.java delete mode 100644 src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/doc-files/OrderedTuple.png delete mode 100644 src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/package-info.java delete mode 100644 src/test/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTreeTest.java diff --git a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTree.java b/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTree.java deleted file mode 100644 index f995cd306..000000000 --- a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTree.java +++ /dev/null @@ -1,634 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.math4.geometry.partitioning.utilities; - -/** This class implements AVL trees. - * - *

The purpose of this class is to sort elements while allowing - * duplicate elements (i.e. such that {@code a.equals(b)} is - * true). The {@code SortedSet} interface does not allow this, so - * a specific class is needed. Null elements are not allowed.

- * - *

Since the {@code equals} method is not sufficient to - * differentiate elements, the {@link #delete delete} method is - * implemented using the equality operator.

- * - *

In order to clearly mark the methods provided here do not have - * the same semantics as the ones specified in the - * {@code SortedSet} interface, different names are used - * ({@code add} has been replaced by {@link #insert insert} and - * {@code remove} has been replaced by {@link #delete - * delete}).

- * - *

This class is based on the C implementation Georg Kraml has put - * in the public domain. Unfortunately, his page seems not - * to exist any more.

- * - * @param the type of the elements - * - * @since 3.0 - * @deprecated as of 3.4, this class is not used anymore and considered - * to be out of scope of Apache Commons Math - */ -@Deprecated -public class AVLTree> { - - /** Top level node. */ - private Node top; - - /** Build an empty tree. - */ - public AVLTree() { - top = null; - } - - /** Insert an element in the tree. - * @param element element to insert (silently ignored if null) - */ - public void insert(final T element) { - if (element != null) { - if (top == null) { - top = new Node(element, null); - } else { - top.insert(element); - } - } - } - - /** Delete an element from the tree. - *

The element is deleted only if there is a node {@code n} - * containing exactly the element instance specified, i.e. for which - * {@code n.getElement() == element}. This is purposely - * different from the specification of the - * {@code java.util.Set} {@code remove} method (in fact, - * this is the reason why a specific class has been developed).

- * @param element element to delete (silently ignored if null) - * @return true if the element was deleted from the tree - */ - public boolean delete(final T element) { - if (element != null) { - for (Node node = getNotSmaller(element); node != null; node = node.getNext()) { - // loop over all elements neither smaller nor larger - // than the specified one - if (node.element == element) { - node.delete(); - return true; - } else if (node.element.compareTo(element) > 0) { - // all the remaining elements are known to be larger, - // the element is not in the tree - return false; - } - } - } - return false; - } - - /** Check if the tree is empty. - * @return true if the tree is empty - */ - public boolean isEmpty() { - return top == null; - } - - - /** Get the number of elements of the tree. - * @return number of elements contained in the tree - */ - public int size() { - return (top == null) ? 0 : top.size(); - } - - /** Get the node whose element is the smallest one in the tree. - * @return the tree node containing the smallest element in the tree - * or null if the tree is empty - * @see #getLargest - * @see #getNotSmaller - * @see #getNotLarger - * @see Node#getPrevious - * @see Node#getNext - */ - public Node getSmallest() { - return (top == null) ? null : top.getSmallest(); - } - - /** Get the node whose element is the largest one in the tree. - * @return the tree node containing the largest element in the tree - * or null if the tree is empty - * @see #getSmallest - * @see #getNotSmaller - * @see #getNotLarger - * @see Node#getPrevious - * @see Node#getNext - */ - public Node getLargest() { - return (top == null) ? null : top.getLargest(); - } - - /** Get the node whose element is not smaller than the reference object. - * @param reference reference object (may not be in the tree) - * @return the tree node containing the smallest element not smaller - * than the reference object or null if either the tree is empty or - * all its elements are smaller than the reference object - * @see #getSmallest - * @see #getLargest - * @see #getNotLarger - * @see Node#getPrevious - * @see Node#getNext - */ - public Node getNotSmaller(final T reference) { - Node candidate = null; - for (Node node = top; node != null;) { - if (node.element.compareTo(reference) < 0) { - if (node.right == null) { - return candidate; - } - node = node.right; - } else { - candidate = node; - if (node.left == null) { - return candidate; - } - node = node.left; - } - } - return null; - } - - /** Get the node whose element is not larger than the reference object. - * @param reference reference object (may not be in the tree) - * @return the tree node containing the largest element not larger - * than the reference object (in which case the node is guaranteed - * not to be empty) or null if either the tree is empty or all its - * elements are larger than the reference object - * @see #getSmallest - * @see #getLargest - * @see #getNotSmaller - * @see Node#getPrevious - * @see Node#getNext - */ - public Node getNotLarger(final T reference) { - Node candidate = null; - for (Node node = top; node != null;) { - if (node.element.compareTo(reference) > 0) { - if (node.left == null) { - return candidate; - } - node = node.left; - } else { - candidate = node; - if (node.right == null) { - return candidate; - } - node = node.right; - } - } - return null; - } - - /** Enum for tree skew factor. */ - private static enum Skew { - /** Code for left high trees. */ - LEFT_HIGH, - - /** Code for right high trees. */ - RIGHT_HIGH, - - /** Code for Skew.BALANCED trees. */ - BALANCED; - } - - /** This class implements AVL trees nodes. - *

AVL tree nodes implement all the logical structure of the - * tree. Nodes are created by the {@link AVLTree AVLTree} class.

- *

The nodes are not independant from each other but must obey - * specific balancing constraints and the tree structure is - * rearranged as elements are inserted or deleted from the tree. The - * creation, modification and tree-related navigation methods have - * therefore restricted access. Only the order-related navigation, - * reading and delete methods are public.

- * @see AVLTree - */ - public class Node { - - /** Element contained in the current node. */ - private T element; - - /** Left sub-tree. */ - private Node left; - - /** Right sub-tree. */ - private Node right; - - /** Parent tree. */ - private Node parent; - - /** Skew factor. */ - private Skew skew; - - /** Build a node for a specified element. - * @param element element - * @param parent parent node - */ - Node(final T element, final Node parent) { - this.element = element; - left = null; - right = null; - this.parent = parent; - skew = Skew.BALANCED; - } - - /** Get the contained element. - * @return element contained in the node - */ - public T getElement() { - return element; - } - - /** Get the number of elements of the tree rooted at this node. - * @return number of elements contained in the tree rooted at this node - */ - int size() { - return 1 + ((left == null) ? 0 : left.size()) + ((right == null) ? 0 : right.size()); - } - - /** Get the node whose element is the smallest one in the tree - * rooted at this node. - * @return the tree node containing the smallest element in the - * tree rooted at this node or null if the tree is empty - * @see #getLargest - */ - Node getSmallest() { - Node node = this; - while (node.left != null) { - node = node.left; - } - return node; - } - - /** Get the node whose element is the largest one in the tree - * rooted at this node. - * @return the tree node containing the largest element in the - * tree rooted at this node or null if the tree is empty - * @see #getSmallest - */ - Node getLargest() { - Node node = this; - while (node.right != null) { - node = node.right; - } - return node; - } - - /** Get the node containing the next smaller or equal element. - * @return node containing the next smaller or equal element or - * null if there is no smaller or equal element in the tree - * @see #getNext - */ - public Node getPrevious() { - - if (left != null) { - final Node node = left.getLargest(); - if (node != null) { - return node; - } - } - - for (Node node = this; node.parent != null; node = node.parent) { - if (node != node.parent.left) { - return node.parent; - } - } - - return null; - - } - - /** Get the node containing the next larger or equal element. - * @return node containing the next larger or equal element (in - * which case the node is guaranteed not to be empty) or null if - * there is no larger or equal element in the tree - * @see #getPrevious - */ - public Node getNext() { - - if (right != null) { - final Node node = right.getSmallest(); - if (node != null) { - return node; - } - } - - for (Node node = this; node.parent != null; node = node.parent) { - if (node != node.parent.right) { - return node.parent; - } - } - - return null; - - } - - /** Insert an element in a sub-tree. - * @param newElement element to insert - * @return true if the parent tree should be re-Skew.BALANCED - */ - boolean insert(final T newElement) { - if (newElement.compareTo(this.element) < 0) { - // the inserted element is smaller than the node - if (left == null) { - left = new Node(newElement, this); - return rebalanceLeftGrown(); - } - return left.insert(newElement) ? rebalanceLeftGrown() : false; - } - - // the inserted element is equal to or greater than the node - if (right == null) { - right = new Node(newElement, this); - return rebalanceRightGrown(); - } - return right.insert(newElement) ? rebalanceRightGrown() : false; - - } - - /** Delete the node from the tree. - */ - public void delete() { - if ((parent == null) && (left == null) && (right == null)) { - // this was the last node, the tree is now empty - element = null; - top = null; - } else { - - Node node; - Node child; - boolean leftShrunk; - if ((left == null) && (right == null)) { - node = this; - element = null; - leftShrunk = node == node.parent.left; - child = null; - } else { - node = (left != null) ? left.getLargest() : right.getSmallest(); - element = node.element; - leftShrunk = node == node.parent.left; - child = (node.left != null) ? node.left : node.right; - } - - node = node.parent; - if (leftShrunk) { - node.left = child; - } else { - node.right = child; - } - if (child != null) { - child.parent = node; - } - - while (leftShrunk ? node.rebalanceLeftShrunk() : node.rebalanceRightShrunk()) { - if (node.parent == null) { - return; - } - leftShrunk = node == node.parent.left; - node = node.parent; - } - - } - } - - /** Re-balance the instance as left sub-tree has grown. - * @return true if the parent tree should be reSkew.BALANCED too - */ - private boolean rebalanceLeftGrown() { - switch (skew) { - case LEFT_HIGH: - if (left.skew == Skew.LEFT_HIGH) { - rotateCW(); - skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - } else { - final Skew s = left.right.skew; - left.rotateCCW(); - rotateCW(); - switch(s) { - case LEFT_HIGH: - left.skew = Skew.BALANCED; - right.skew = Skew.RIGHT_HIGH; - break; - case RIGHT_HIGH: - left.skew = Skew.LEFT_HIGH; - right.skew = Skew.BALANCED; - break; - default: - left.skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - } - skew = Skew.BALANCED; - } - return false; - case RIGHT_HIGH: - skew = Skew.BALANCED; - return false; - default: - skew = Skew.LEFT_HIGH; - return true; - } - } - - /** Re-balance the instance as right sub-tree has grown. - * @return true if the parent tree should be reSkew.BALANCED too - */ - private boolean rebalanceRightGrown() { - switch (skew) { - case LEFT_HIGH: - skew = Skew.BALANCED; - return false; - case RIGHT_HIGH: - if (right.skew == Skew.RIGHT_HIGH) { - rotateCCW(); - skew = Skew.BALANCED; - left.skew = Skew.BALANCED; - } else { - final Skew s = right.left.skew; - right.rotateCW(); - rotateCCW(); - switch (s) { - case LEFT_HIGH: - left.skew = Skew.BALANCED; - right.skew = Skew.RIGHT_HIGH; - break; - case RIGHT_HIGH: - left.skew = Skew.LEFT_HIGH; - right.skew = Skew.BALANCED; - break; - default: - left.skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - } - skew = Skew.BALANCED; - } - return false; - default: - skew = Skew.RIGHT_HIGH; - return true; - } - } - - /** Re-balance the instance as left sub-tree has shrunk. - * @return true if the parent tree should be reSkew.BALANCED too - */ - private boolean rebalanceLeftShrunk() { - switch (skew) { - case LEFT_HIGH: - skew = Skew.BALANCED; - return true; - case RIGHT_HIGH: - if (right.skew == Skew.RIGHT_HIGH) { - rotateCCW(); - skew = Skew.BALANCED; - left.skew = Skew.BALANCED; - return true; - } else if (right.skew == Skew.BALANCED) { - rotateCCW(); - skew = Skew.LEFT_HIGH; - left.skew = Skew.RIGHT_HIGH; - return false; - } else { - final Skew s = right.left.skew; - right.rotateCW(); - rotateCCW(); - switch (s) { - case LEFT_HIGH: - left.skew = Skew.BALANCED; - right.skew = Skew.RIGHT_HIGH; - break; - case RIGHT_HIGH: - left.skew = Skew.LEFT_HIGH; - right.skew = Skew.BALANCED; - break; - default: - left.skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - } - skew = Skew.BALANCED; - return true; - } - default: - skew = Skew.RIGHT_HIGH; - return false; - } - } - - /** Re-balance the instance as right sub-tree has shrunk. - * @return true if the parent tree should be reSkew.BALANCED too - */ - private boolean rebalanceRightShrunk() { - switch (skew) { - case RIGHT_HIGH: - skew = Skew.BALANCED; - return true; - case LEFT_HIGH: - if (left.skew == Skew.LEFT_HIGH) { - rotateCW(); - skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - return true; - } else if (left.skew == Skew.BALANCED) { - rotateCW(); - skew = Skew.RIGHT_HIGH; - right.skew = Skew.LEFT_HIGH; - return false; - } else { - final Skew s = left.right.skew; - left.rotateCCW(); - rotateCW(); - switch (s) { - case LEFT_HIGH: - left.skew = Skew.BALANCED; - right.skew = Skew.RIGHT_HIGH; - break; - case RIGHT_HIGH: - left.skew = Skew.LEFT_HIGH; - right.skew = Skew.BALANCED; - break; - default: - left.skew = Skew.BALANCED; - right.skew = Skew.BALANCED; - } - skew = Skew.BALANCED; - return true; - } - default: - skew = Skew.LEFT_HIGH; - return false; - } - } - - /** Perform a clockwise rotation rooted at the instance. - *

The skew factor are not updated by this method, they - * must be updated by the caller

- */ - private void rotateCW() { - - final T tmpElt = element; - element = left.element; - left.element = tmpElt; - - final Node tmpNode = left; - left = tmpNode.left; - tmpNode.left = tmpNode.right; - tmpNode.right = right; - right = tmpNode; - - if (left != null) { - left.parent = this; - } - if (right.right != null) { - right.right.parent = right; - } - - } - - /** Perform a counter-clockwise rotation rooted at the instance. - *

The skew factor are not updated by this method, they - * must be updated by the caller

- */ - private void rotateCCW() { - - final T tmpElt = element; - element = right.element; - right.element = tmpElt; - - final Node tmpNode = right; - right = tmpNode.right; - tmpNode.right = tmpNode.left; - tmpNode.left = left; - left = tmpNode; - - if (right != null) { - right.parent = this; - } - if (left.left != null) { - left.left.parent = left; - } - - } - - } - -} diff --git a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/OrderedTuple.java b/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/OrderedTuple.java deleted file mode 100644 index 490c80cb8..000000000 --- a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/OrderedTuple.java +++ /dev/null @@ -1,431 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.math4.geometry.partitioning.utilities; - -import java.util.Arrays; - -import org.apache.commons.math4.util.FastMath; - -/** This class implements an ordering operation for T-uples. - * - *

Ordering is done by encoding all components of the T-uple into a - * single scalar value and using this value as the sorting - * key. Encoding is performed using the method invented by Georg - * Cantor in 1877 when he proved it was possible to establish a - * bijection between a line and a plane. The binary representations of - * the components of the T-uple are mixed together to form a single - * scalar. This means that the 2k bit of component 0 is - * followed by the 2k bit of component 1, then by the - * 2k bit of component 2 up to the 2k bit of - * component {@code t}, which is followed by the 2k-1 - * bit of component 0, followed by the 2k-1 bit of - * component 1 ... The binary representations are extended as needed - * to handle numbers with different scales and a suitable - * 2p offset is added to the components in order to avoid - * negative numbers (this offset is adjusted as needed during the - * comparison operations).

- * - *

The more interesting property of the encoding method for our - * purpose is that it allows to select all the points that are in a - * given range. This is depicted in dimension 2 by the following - * picture:

- * - * - * - *

This picture shows a set of 100000 random 2-D pairs having their - * first component between -50 and +150 and their second component - * between -350 and +50. We wanted to extract all pairs having their - * first component between +30 and +70 and their second component - * between -120 and -30. We built the lower left point at coordinates - * (30, -120) and the upper right point at coordinates (70, -30). All - * points smaller than the lower left point are drawn in red and all - * points larger than the upper right point are drawn in blue. The - * green points are between the two limits. This picture shows that - * all the desired points are selected, along with spurious points. In - * this case, we get 15790 points, 4420 of which really belonging to - * the desired rectangle. It is possible to extract very small - * subsets. As an example extracting from the same 100000 points set - * the points having their first component between +30 and +31 and - * their second component between -91 and -90, we get a subset of 11 - * points, 2 of which really belonging to the desired rectangle.

- * - *

the previous selection technique can be applied in all - * dimensions, still using two points to define the interval. The - * first point will have all its components set to their lower bounds - * while the second point will have all its components set to their - * upper bounds.

- * - *

T-uples with negative infinite or positive infinite components - * are sorted logically.

- * - *

Since the specification of the {@code Comparator} interface - * allows only {@code ClassCastException} errors, some arbitrary - * choices have been made to handle specific cases. The rationale for - * these choices is to keep regular and consistent T-uples - * together.

- *
    - *
  • instances with different dimensions are sorted according to - * their dimension regardless of their components values
    • - *
  • instances with {@code Double.NaN} components are sorted - * after all other ones (even after instances with positive infinite - * components
    • - *
  • instances with both positive and negative infinite components - * are considered as if they had {@code Double.NaN} - * components
    • - *
- * - * @since 3.0 - * @deprecated as of 3.4, this class is not used anymore and considered - * to be out of scope of Apache Commons Math - */ -@Deprecated -public class OrderedTuple implements Comparable { - - /** Sign bit mask. */ - private static final long SIGN_MASK = 0x8000000000000000L; - - /** Exponent bits mask. */ - private static final long EXPONENT_MASK = 0x7ff0000000000000L; - - /** Mantissa bits mask. */ - private static final long MANTISSA_MASK = 0x000fffffffffffffL; - - /** Implicit MSB for normalized numbers. */ - private static final long IMPLICIT_ONE = 0x0010000000000000L; - - /** Double components of the T-uple. */ - private double[] components; - - /** Offset scale. */ - private int offset; - - /** Least Significant Bit scale. */ - private int lsb; - - /** Ordering encoding of the double components. */ - private long[] encoding; - - /** Positive infinity marker. */ - private boolean posInf; - - /** Negative infinity marker. */ - private boolean negInf; - - /** Not A Number marker. */ - private boolean nan; - - /** Build an ordered T-uple from its components. - * @param components double components of the T-uple - */ - public OrderedTuple(final double ... components) { - this.components = components.clone(); - int msb = Integer.MIN_VALUE; - lsb = Integer.MAX_VALUE; - posInf = false; - negInf = false; - nan = false; - for (int i = 0; i < components.length; ++i) { - if (Double.isInfinite(components[i])) { - if (components[i] < 0) { - negInf = true; - } else { - posInf = true; - } - } else if (Double.isNaN(components[i])) { - nan = true; - } else { - final long b = Double.doubleToLongBits(components[i]); - final long m = mantissa(b); - if (m != 0) { - final int e = exponent(b); - msb = FastMath.max(msb, e + computeMSB(m)); - lsb = FastMath.min(lsb, e + computeLSB(m)); - } - } - } - - if (posInf && negInf) { - // instance cannot be sorted logically - posInf = false; - negInf = false; - nan = true; - } - - if (lsb <= msb) { - // encode the T-upple with the specified offset - encode(msb + 16); - } else { - encoding = new long[] { - 0x0L - }; - } - - } - - /** Encode the T-uple with a given offset. - * @param minOffset minimal scale of the offset to add to all - * components (must be greater than the MSBs of all components) - */ - private void encode(final int minOffset) { - - // choose an offset with some margins - offset = minOffset + 31; - offset -= offset % 32; - - if ((encoding != null) && (encoding.length == 1) && (encoding[0] == 0x0L)) { - // the components are all zeroes - return; - } - - // allocate an integer array to encode the components (we use only - // 63 bits per element because there is no unsigned long in Java) - final int neededBits = offset + 1 - lsb; - final int neededLongs = (neededBits + 62) / 63; - encoding = new long[components.length * neededLongs]; - - // mix the bits from all components - int eIndex = 0; - int shift = 62; - long word = 0x0L; - for (int k = offset; eIndex < encoding.length; --k) { - for (int vIndex = 0; vIndex < components.length; ++vIndex) { - if (getBit(vIndex, k) != 0) { - word |= 0x1L << shift; - } - if (shift-- == 0) { - encoding[eIndex++] = word; - word = 0x0L; - shift = 62; - } - } - } - - } - - /** Compares this ordered T-uple with the specified object. - - *

The ordering method is detailed in the general description of - * the class. Its main property is to be consistent with distance: - * geometrically close T-uples stay close to each other when stored - * in a sorted collection using this comparison method.

- - *

T-uples with negative infinite, positive infinite are sorted - * logically.

- - *

Some arbitrary choices have been made to handle specific - * cases. The rationale for these choices is to keep - * normal and consistent T-uples together.

- *
    - *
  • instances with different dimensions are sorted according to - * their dimension regardless of their components values
    • - *
  • instances with {@code Double.NaN} components are sorted - * after all other ones (evan after instances with positive infinite - * components
    • - *
  • instances with both positive and negative infinite components - * are considered as if they had {@code Double.NaN} - * components
    • - *
- - * @param ot T-uple to compare instance with - * @return a negative integer if the instance is less than the - * object, zero if they are equal, or a positive integer if the - * instance is greater than the object - - */ - public int compareTo(final OrderedTuple ot) { - if (components.length == ot.components.length) { - if (nan) { - return +1; - } else if (ot.nan) { - return -1; - } else if (negInf || ot.posInf) { - return -1; - } else if (posInf || ot.negInf) { - return +1; - } else { - - if (offset < ot.offset) { - encode(ot.offset); - } else if (offset > ot.offset) { - ot.encode(offset); - } - - final int limit = FastMath.min(encoding.length, ot.encoding.length); - for (int i = 0; i < limit; ++i) { - if (encoding[i] < ot.encoding[i]) { - return -1; - } else if (encoding[i] > ot.encoding[i]) { - return +1; - } - } - - if (encoding.length < ot.encoding.length) { - return -1; - } else if (encoding.length > ot.encoding.length) { - return +1; - } else { - return 0; - } - - } - } - - return components.length - ot.components.length; - - } - - /** {@inheritDoc} */ - @Override - public boolean equals(final Object other) { - if (this == other) { - return true; - } else if (other instanceof OrderedTuple) { - return compareTo((OrderedTuple) other) == 0; - } else { - return false; - } - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - // the following constants are arbitrary small primes - final int multiplier = 37; - final int trueHash = 97; - final int falseHash = 71; - - // hash fields and combine them - // (we rely on the multiplier to have different combined weights - // for all int fields and all boolean fields) - int hash = Arrays.hashCode(components); - hash = hash * multiplier + offset; - hash = hash * multiplier + lsb; - hash = hash * multiplier + (posInf ? trueHash : falseHash); - hash = hash * multiplier + (negInf ? trueHash : falseHash); - hash = hash * multiplier + (nan ? trueHash : falseHash); - - return hash; - - } - - /** Get the components array. - * @return array containing the T-uple components - */ - public double[] getComponents() { - return components.clone(); - } - - /** Extract the sign from the bits of a double. - * @param bits binary representation of the double - * @return sign bit (zero if positive, non zero if negative) - */ - private static long sign(final long bits) { - return bits & SIGN_MASK; - } - - /** Extract the exponent from the bits of a double. - * @param bits binary representation of the double - * @return exponent - */ - private static int exponent(final long bits) { - return ((int) ((bits & EXPONENT_MASK) >> 52)) - 1075; - } - - /** Extract the mantissa from the bits of a double. - * @param bits binary representation of the double - * @return mantissa - */ - private static long mantissa(final long bits) { - return ((bits & EXPONENT_MASK) == 0) ? - ((bits & MANTISSA_MASK) << 1) : // subnormal number - (IMPLICIT_ONE | (bits & MANTISSA_MASK)); // normal number - } - - /** Compute the most significant bit of a long. - * @param l long from which the most significant bit is requested - * @return scale of the most significant bit of {@code l}, - * or 0 if {@code l} is zero - * @see #computeLSB - */ - private static int computeMSB(final long l) { - - long ll = l; - long mask = 0xffffffffL; - int scale = 32; - int msb = 0; - - while (scale != 0) { - if ((ll & mask) != ll) { - msb |= scale; - ll >>= scale; - } - scale >>= 1; - mask >>= scale; - } - - return msb; - - } - - /** Compute the least significant bit of a long. - * @param l long from which the least significant bit is requested - * @return scale of the least significant bit of {@code l}, - * or 63 if {@code l} is zero - * @see #computeMSB - */ - private static int computeLSB(final long l) { - - long ll = l; - long mask = 0xffffffff00000000L; - int scale = 32; - int lsb = 0; - - while (scale != 0) { - if ((ll & mask) == ll) { - lsb |= scale; - ll >>= scale; - } - scale >>= 1; - mask >>= scale; - } - - return lsb; - - } - - /** Get a bit from the mantissa of a double. - * @param i index of the component - * @param k scale of the requested bit - * @return the specified bit (either 0 or 1), after the offset has - * been added to the double - */ - private int getBit(final int i, final int k) { - final long bits = Double.doubleToLongBits(components[i]); - final int e = exponent(bits); - if ((k < e) || (k > offset)) { - return 0; - } else if (k == offset) { - return (sign(bits) == 0L) ? 1 : 0; - } else if (k > (e + 52)) { - return (sign(bits) == 0L) ? 0 : 1; - } else { - final long m = (sign(bits) == 0L) ? mantissa(bits) : -mantissa(bits); - return (int) ((m >> (k - e)) & 0x1L); - } - } - -} diff --git a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/doc-files/OrderedTuple.png b/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/doc-files/OrderedTuple.png deleted file mode 100644 index 4eca23302590d126d829cdda6f0a3349a1dc727c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28882 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⋘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 diff --git a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/package-info.java b/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/package-info.java deleted file mode 100644 index 9cf87254d..000000000 --- a/src/main/java/org/apache/commons/math4/geometry/partitioning/utilities/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * - *

- * This package provides multidimensional ordering features for partitioning. - *

- * - */ -package org.apache.commons.math4.geometry.partitioning.utilities; diff --git a/src/test/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTreeTest.java b/src/test/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTreeTest.java deleted file mode 100644 index 2174cd59b..000000000 --- a/src/test/java/org/apache/commons/math4/geometry/partitioning/utilities/AVLTreeTest.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.math4.geometry.partitioning.utilities; - -import org.apache.commons.math4.geometry.partitioning.utilities.AVLTree; -import org.junit.Assert; -import org.junit.Test; - -@Deprecated -public class AVLTreeTest { - - @Test - public void testInsert() { - // this array in this order allows to pass in all branches - // of the insertion algorithm - int[] array = { 16, 13, 15, 14, 2, 0, 12, 9, 8, 5, - 11, 18, 19, 17, 4, 7, 1, 3, 6, 10 }; - AVLTree tree = buildTree(array); - - Assert.assertEquals(array.length, tree.size()); - - for (int i = 0; i < array.length; ++i) { - Assert.assertEquals(array[i], value(tree.getNotSmaller(new Integer(array[i])))); - } - - checkOrder(tree); - - } - - @Test - public void testDelete1() { - int[][][] arrays = { - { { 16, 13, 15, 14, 2, 0, 12, 9, 8, 5, 11, 18, 19, 17, 4, 7, 1, 3, 6, 10 }, - { 11, 10, 9, 12, 16, 15, 13, 18, 5, 0, 3, 2, 14, 6, 19, 17, 8, 4, 7, 1 } }, - { { 16, 13, 15, 14, 2, 0, 12, 9, 8, 5, 11, 18, 19, 17, 4, 7, 1, 3, 6, 10 }, - { 0, 17, 14, 15, 16, 18, 6 } }, - { { 6, 2, 7, 8, 1, 4, 3, 5 }, { 8 } }, - { { 6, 2, 7, 8, 1, 4, 5 }, { 8 } }, - { { 3, 7, 2, 1, 5, 8, 4 }, { 1 } }, - { { 3, 7, 2, 1, 5, 8, 6 }, { 1 } } - }; - for (int i = 0; i < arrays.length; ++i) { - AVLTree tree = buildTree(arrays[i][0]); - Assert.assertTrue(! tree.delete(new Integer(-2000))); - for (int j = 0; j < arrays[i][1].length; ++j) { - Assert.assertTrue(tree.delete(tree.getNotSmaller(new Integer(arrays[i][1][j])).getElement())); - Assert.assertEquals(arrays[i][0].length - j - 1, tree.size()); - } - } - } - - @Test - public void testNavigation() { - int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; - AVLTree tree = buildTree(array); - - AVLTree.Node node = tree.getSmallest(); - Assert.assertEquals(array[0], value(node)); - for (int i = 0; i < array.length; ++i) { - Assert.assertEquals(array[i], value(node)); - node = node.getNext(); - } - Assert.assertNull(node); - - node = tree.getLargest(); - Assert.assertEquals(array[array.length - 1], value(node)); - for (int i = array.length - 1; i >= 0; --i) { - Assert.assertEquals(array[i], value(node)); - node = node.getPrevious(); - } - Assert.assertNull(node); - - checkOrder(tree); - - } - - @Test - public void testSearch() { - int[] array = { 2, 4, 6, 8, 10, 12, 14 }; - AVLTree tree = buildTree(array); - - Assert.assertNull(tree.getNotLarger(new Integer(array[0] - 1))); - Assert.assertNull(tree.getNotSmaller(new Integer(array[array.length - 1] + 1))); - - for (int i = 0; i < array.length; ++i) { - Assert.assertEquals(array[i], - value(tree.getNotSmaller(new Integer(array[i] - 1)))); - Assert.assertEquals(array[i], - value(tree.getNotLarger(new Integer(array[i] + 1)))); - } - - checkOrder(tree); - - } - - @Test - public void testRepetition() { - int[] array = { 1, 1, 3, 3, 4, 5, 6, 7, 7, 7, 7, 7 }; - AVLTree tree = buildTree(array); - Assert.assertEquals(array.length, tree.size()); - - AVLTree.Node node = tree.getNotSmaller(new Integer(3)); - Assert.assertEquals(3, value(node)); - Assert.assertEquals(1, value(node.getPrevious())); - Assert.assertEquals(3, value(node.getNext())); - Assert.assertEquals(4, value(node.getNext().getNext())); - - node = tree.getNotLarger(new Integer(2)); - Assert.assertEquals(1, value(node)); - Assert.assertEquals(1, value(node.getPrevious())); - Assert.assertEquals(3, value(node.getNext())); - Assert.assertNull(node.getPrevious().getPrevious()); - - AVLTree.Node otherNode = tree.getNotSmaller(new Integer(1)); - Assert.assertTrue(node != otherNode); - Assert.assertEquals(1, value(otherNode)); - Assert.assertNull(otherNode.getPrevious()); - - node = tree.getNotLarger(new Integer(10)); - Assert.assertEquals(7, value(node)); - Assert.assertNull(node.getNext()); - node = node.getPrevious(); - Assert.assertEquals(7, value(node)); - node = node.getPrevious(); - Assert.assertEquals(7, value(node)); - node = node.getPrevious(); - Assert.assertEquals(7, value(node)); - node = node.getPrevious(); - Assert.assertEquals(7, value(node)); - node = node.getPrevious(); - Assert.assertEquals(6, value(node)); - - checkOrder(tree); - - } - - private AVLTree buildTree(int[] array) { - AVLTree tree = new AVLTree(); - for (int i = 0; i < array.length; ++i) { - tree.insert(new Integer(array[i])); - tree.insert(null); - } - return tree; - } - - private int value(AVLTree.Node node) { - return node.getElement().intValue(); - } - - private void checkOrder(AVLTree tree) { - AVLTree.Node next = null; - for (AVLTree.Node node = tree.getSmallest(); - node != null; - node = next) { - next = node.getNext(); - if (next != null) { - Assert.assertTrue(node.getElement().compareTo(next.getElement()) <= 0); - } - } - } - -}