efischer/BiGpairSEQ
1
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

Correctly store matching weight

Browse Source
This commit is contained in:
eugenefischer
2022-10-14 18:44:56 -05:00
parent 174db66c46
commit ef349ea5f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/MaximumWeightBipartiteAuctionMatching.java
View File

@@ -17,7 +17,7 @@ public class MaximumWeightBipartiteAuctionMatching<V, E> implements MatchingAlgo
private final Set<V> partition2; private final Set<V> partition2;
private final BigDecimal delta; private final BigDecimal delta;
private final Set<E> matching; private final Set<E> matching;
private final BigDecimal matchingWeight; private BigDecimal matchingWeight;
private boolean swappedPartitions = false; private boolean swappedPartitions = false;
public MaximumWeightBipartiteAuctionMatching(Graph<V, E> graph, Set<V> partition1, Set<V> partition2) { public MaximumWeightBipartiteAuctionMatching(Graph<V, E> graph, Set<V> partition1, Set<V> partition2) {
@@ -26,6 +26,7 @@ public class MaximumWeightBipartiteAuctionMatching<V, E> implements MatchingAlgo
this.partition2 = Objects.requireNonNull(partition2, "Partition 2 cannot be null"); this.partition2 = Objects.requireNonNull(partition2, "Partition 2 cannot be null");
int n = Math.max(partition1.size(), partition2.size()); int n = Math.max(partition1.size(), partition2.size());
this.delta = BigDecimal.valueOf(1 / ((double) n + 1)); this.delta = BigDecimal.valueOf(1 / ((double) n + 1));
// this.delta = BigDecimal.valueOf(n/2);
this.matching = new LinkedHashSet<>(); this.matching = new LinkedHashSet<>();
this.matchingWeight = BigDecimal.ZERO; this.matchingWeight = BigDecimal.ZERO;
} }
@@ -35,7 +36,7 @@ public class MaximumWeightBipartiteAuctionMatching<V, E> implements MatchingAlgo
Method coded using MaximumWeightBipartiteMatching.class from JgraphT as a model Method coded using MaximumWeightBipartiteMatching.class from JgraphT as a model
*/ */
@Override @Override
public Matching getMatching() { public Matching<V, E> getMatching() {
/* /*
* Test input instance * Test input instance
@@ -113,7 +114,7 @@ public class MaximumWeightBipartiteAuctionMatching<V, E> implements MatchingAlgo
} }
for(E edge: matching) { for(E edge: matching) {
matchingWeight.add(BigDecimal.valueOf(graph.getEdgeWeight(edge))); this.matchingWeight = this.matchingWeight.add(BigDecimal.valueOf(graph.getEdgeWeight(edge)));
} }