Changeset 53 for bidspace

Timestamp:

12/18/24 13:28:59 (4 days ago)

Author:

ruud

Message:

All TimeDependent parties now support the nonlinear SumOfGroupsUtilitySpace. Example Nonlinear space in the computer domain

Location:

bidspace

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/geniusweb/bidspace/BidsWithUtility.java (modified) (4 diffs)
• src/main/java/geniusweb/bidspace/PartialSpaceFromUtility.java (modified) (3 diffs)
• src/main/java/geniusweb/bidspace/SumOfGroupsLinAdditiveAdapter.java (added)
• src/test/java/geniusweb/bidspace/SumOfGroupsLinAdditiveAdapterTest.java (added)
• src/test/java/geniusweb/bidspace/pareto/ParetoRandomTest.java (added)
• src/test/resources/computer (added)
• src/test/resources/computer/computerbuy.json (added)

bidspace/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb</groupId>
         <artifactId>bidspace</artifactId>
-        <version>2.1.6</version>
+        <version>2.2.1</version>  <!-- equals the geniusweb version -->
         <packaging>jar</packaging>
 
@@ -43 +43 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>utilities</artifactId>
-                        <version>1.2.1</version>
+                        <version>1.3.1</version>
                 </dependency>
 
@@ -113 +113 @@
                         <scope>test</scope>
                 </dependency>
-
+                <dependency>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-math</artifactId>
+                        <version>2.2</version>
+                        <scope>test</scope>
+                </dependency>
         </dependencies>
 

bidspace/src/main/java/geniusweb/bidspace/BidsWithUtility.java

@@ -3 +3 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39 +40 @@
          */
         private final Map<Tuple<Integer, Interval>, ImmutableList<Bid>> cache = new HashMap<>();
-        private ImmutableList<Bid> emptylist = new FixedList<>();
+        private ImmutableList<Bid> emptylist = new FixedList<>(
+                        Collections.emptyList());
 
         /**
@@ -176 +178 @@
                 goal = goal.intersect(getRange(n));
                 if (goal.isEmpty()) {
-                        return new FixedList<>();
+                        return new FixedList<>(Collections.emptyList());
                 }
 
@@ -220 +222 @@
                                         pbid -> pbid.merge(new Bid(issue, val)), partialbids);
                         if (!fullbids.size().equals(BigInteger.ZERO))
-                                fulllist = new JoinedList<Bid>(fullbids, fulllist);
+                                fulllist = new JoinedList<Bid>(
+                                                Arrays.asList(fullbids, fulllist));
                 }
                 return fulllist;

bidspace/src/main/java/geniusweb/bidspace/PartialSpaceFromUtility.java

@@ -3 +3 @@
 import java.math.BigInteger;
 import java.security.SecureRandom;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -24 +25 @@
 public class PartialSpaceFromUtility extends DefaultPartialOrdering {
         public PartialSpaceFromUtility(UtilitySpace space, int nRankings) {
-                super(space.getName() + "_" + nRankings, space.getDomain(), space.getReservationBid(),
-                                pickBetter(space, nRankings));
+                super(space.getName() + "_" + nRankings, space.getDomain(),
+                                space.getReservationBid(), pickBetter(space, nRankings));
         }
 
         /**
-         * Pick subset of static isbetter rankings. Notice, ShuffledList currently can't
-         * handle really large lists which also limits this. This has to be fixed.
+         * Pick subset of static isbetter rankings. Notice, ShuffledList currently
+         * can't handle really large lists which also limits this. This has to be
+         * fixed.
          * 
          * @param space     the space to sample from
-         * @param nRankings the number of rankings to be placed in the PartialOrdering.
+         * @param nRankings the number of rankings to be placed in the
+         *                  PartialOrdering.
          * @return a subset creating a partial profile of the geiven UtilitySpace
          */
-        private static Map<Bid, Set<Bid>> pickBetter(UtilitySpace space, int nRankings) {
+        private static Map<Bid, Set<Bid>> pickBetter(UtilitySpace space,
+                        int nRankings) {
                 Map<Bid, Set<Bid>> eqOrBetter = new HashMap<>();
 
                 AllBidsList allbids = new AllBidsList(space.getDomain());
-                ListWithRemove<Tuple<Bid, Bid>> available = new ListWithRemove<>(new Tuples<Bid, Bid>(allbids, allbids));
+                ListWithRemove<Tuple<Bid, Bid>> available = new ListWithRemove<>(
+                                new Tuples<Bid, Bid>(allbids, allbids), Collections.emptySet());
                 for (int n = 0; n < nRankings; n++) {
                         BigInteger sel = rnd(available.size());
@@ -79 +84 @@
 
         /**
-         * Bit simplistic way to generate random in [0,n>. Simplistic because the mod()
-         * operator that we use causes bias in the random numbers.
+         * Bit simplistic way to generate random in [0,n>. Simplistic because the
+         * mod() operator that we use causes bias in the random numbers.
          * 
          * @param n the maximum value for the random number