Merge branch 'master' into groupsCustomerStats

matsim-org · Mar 4, 2024 · c624a8d · c624a8d
2 parents 11a2c8f + a4b2eca
commit c624a8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/contribs/common/src/main/java/org/matsim/contrib/common/util/WeightedRandomSelection.java b/contribs/common/src/main/java/org/matsim/contrib/common/util/WeightedRandomSelection.java
@@ -67,6 +67,10 @@ public int size() {
 		return entryList.size();
 	}
 
+	public double getTotalWeight() {
+		return totalWeight;
+	}
+
 	private record Entry<E>(E e, double cumulativeWeight) implements Comparable<Entry<E>> {
 		public int compareTo(Entry<E> o) {
 			double diff = this.cumulativeWeight - o.cumulativeWeight;

diff --git a/pom.xml b/pom.xml
@@ -316,13 +316,13 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>5.10.0</version>
+                <version>5.11.0</version>
                 <scope>test</scope>
             </dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-junit-jupiter</artifactId>
-				<version>5.10.0</version>
+				<version>5.11.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>