Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove comparator. 

Its usage is unnecessary within the library.
This commit is contained in:
Gilles Sadowski 2022-01-06 01:04:31 +01:00
parent 08e51aa539
commit 468d81714d
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
commons-math-neuralnet/src/main/java/org/apache/commons/math4/neuralnet/Network.java
View File

@ -24,7 +24,6 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collection;
import java.util.Iterator;
import java.util.Comparator;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -55,23 +54,6 @@ public class Network
private final ConcurrentHashMap<Long, Set<Long>> linkMap
= new ConcurrentHashMap<>();
/**
* Comparator that prescribes an order of the neurons according
* to the increasing order of their identifier.
*/
public static class NeuronIdentifierComparator
implements Comparator<Neuron> {
/** {@inheritDoc} */
@Override
public int compare(Neuron a,
Neuron b) {
final long aId = a.getIdentifier();
final long bId = b.getIdentifier();
return aId < bId ? -1 :
aId > bId ? 1 : 0;
}
}
/**
* @param firstId Identifier of the first neuron that will be added
* to this network.
@ -162,19 +144,10 @@ public class Network
}
/**
* Creates a list of the neurons, sorted in a custom order.
*
* @param comparator {@link Comparator} used for sorting the neurons.
* @return a list of neurons, sorted in the order prescribed by the
* given {@code comparator}.
* @see NeuronIdentifierComparator
* @return a shallow copy of the network's neurons.
*/
public Collection<Neuron> getNeurons(Comparator<Neuron> comparator) {
final List<Neuron> neurons = new ArrayList<>(neuronMap.values());
Collections.sort(neurons, comparator);
return neurons;
public Collection<Neuron> getNeurons() {
return Collections.unmodifiableCollection(neuronMap.values());
}
/**

2
commons-math-neuralnet/src/test/java/org/apache/commons/math4/neuralnet/NetworkTest.java
View File

@ -118,7 +118,7 @@ public class NetworkTest {
// Check that the comparator provides a specific order.
boolean isUnspecifiedOrder = false;
long previousId = Long.MIN_VALUE;
for (Neuron n : net.getNeurons(new Network.NeuronIdentifierComparator())) {
for (Neuron n : net.getNeurons()) {
final long currentId = n.getIdentifier();
if (currentId < previousId) {
isUnspecifiedOrder = true;