Changeset 4 for exampleparties

Timestamp:

09/18/19 10:00:22 (5 years ago)

Author:

bart

Message:

Faster example parties

Location:

exampleparties

Files:

• boulware/pom.xml (modified) (1 diff)
• conceder/pom.xml (modified) (1 diff)
• hardliner/pom.xml (modified) (1 diff)
• linear/pom.xml (modified) (1 diff)
• randomparty/pom.xml (modified) (1 diff)
• randompartypy/pom.xml (modified) (1 diff)
• timedependentparty/pom.xml (modified) (1 diff)
• timedependentparty/src/main/java/geniusweb/exampleparties/timedependentparty/ExtendedUtilSpace.java (added)
• timedependentparty/src/main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java (modified) (9 diffs)
• timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/ExtendedUtilSpaceTest.java (added)
• timedependentparty/src/test/resources/7issues (added)
• timedependentparty/src/test/resources/7issues/7issues1.json (added)
• timedependentparty/src/test/resources/9issues (added)
• timedependentparty/src/test/resources/9issues/9issues1.json (added)
• timedependentparty/src/test/resources/jobs (added)
• timedependentparty/src/test/resources/jobs/jobs1.json (added)

exampleparties/boulware/pom.xml

@@ -74 +74 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/conceder/pom.xml

@@ -74 +74 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/hardliner/pom.xml

@@ -74 +74 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/linear/pom.xml

@@ -74 +74 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/randomparty/pom.xml

@@ -156 +156 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/randompartypy/pom.xml

@@ -147 +147 @@
                                         <target>1.8</target>
                                 </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
                         </plugin>
 

exampleparties/timedependentparty/pom.xml

@@ -158 +158 @@
                         </plugin>
 
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-source-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-sources</id>
+                                                <goals>
+                                                        <goal>jar</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
+                        </plugin>
 
                         <plugin>

exampleparties/timedependentparty/src/main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -14 +15 @@
 import geniusweb.actions.Offer;
 import geniusweb.actions.PartyId;
-import geniusweb.bidspace.AllBidsList;
-import geniusweb.bidspace.BidsWithUtility;
 import geniusweb.issuevalue.Bid;
 import geniusweb.party.Capabilities;
@@ -24 +23 @@
 import geniusweb.party.inform.Settings;
 import geniusweb.party.inform.YourTurn;
+import geniusweb.profile.Profile;
 import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
-import geniusweb.profile.utilityspace.UtilitySpace;
 import geniusweb.profileconnection.ProfileConnectionFactory;
 import geniusweb.profileconnection.ProfileInterface;
@@ -31 +30 @@
 import geniusweb.progress.ProgressRounds;
 import geniusweb.references.ProtocolRef;
+import tudelft.utilities.immutablelist.ImmutableList;
 import tudelft.utilities.logging.Reporter;
 
@@ -41 +41 @@
 public abstract class TimeDependentParty extends DefaultParty {
 
+        private static final BigDecimal DEC0001 = new BigDecimal("0.0001");
+        private static final BigDecimal DEC100 = new BigDecimal("100");
         private ProfileInterface profileint;
+        private LinearAdditiveUtilitySpace utilspace = null; // last received space
         private PartyId me;
         private Progress progress;
-        private Double minUtil = null, maxUtil = null;
         private Bid lastReceivedBid = null;
-        private double tolerance;
+        private ExtendedUtilSpace extendedspace;
 
         public TimeDependentParty() {
@@ -77 +79 @@
                                 this.me = settings.getID();
                                 this.progress = settings.getProgress();
-                                computeMinMax();
                         } else if (info instanceof ActionDone) {
                                 Action otheract = ((ActionDone) info).getAction();
@@ -117 +118 @@
 
         private void myTurn() throws IOException {
-                Action myAction = null;
+                updateUtilSpace();
                 Bid bid = makeBid();
-                UtilitySpace utilspace = getUtilSpace();
 
-                if (lastReceivedBid != null && utilspace.getUtility(lastReceivedBid)
-                                .compareTo(utilspace.getUtility(bid)) >= 0) {
+                Action myAction;
+                if (bid == null || lastReceivedBid != null
+                                && utilspace.getUtility(lastReceivedBid)
+                                                .compareTo(utilspace.getUtility(bid)) >= 0) {
+                        // if bid==null we failed to suggest next bid.
                         myAction = new Accept(me, lastReceivedBid);
                 } else {
-                        myAction = new Offer(me, makeBid());
+                        myAction = new Offer(me, bid);
                 }
                 getConnection().send(myAction);
@@ -131 +134 @@
         }
 
-        private UtilitySpace getUtilSpace() {
-                return (LinearAdditiveUtilitySpace) profileint.getProfile();
+        private LinearAdditiveUtilitySpace updateUtilSpace() {
+                Profile newutilspace = profileint.getProfile();
+                if (!newutilspace.equals(utilspace)) {
+                        utilspace = (LinearAdditiveUtilitySpace) newutilspace;
+                        extendedspace = new ExtendedUtilSpace(utilspace);
+                }
+                return utilspace;
         }
 
         /**
-         * Computes the fields minutil and maxUtil if not yet computed. minutil is
-         * the minimum utility of any bid, but at least the utility of the
-         * reservation bid. maxUtil is the maximum util of any bid.
-         * <p>
-         * TODO this is simplistic, very expensive method and may cause us to run
-         * out of time on large domains.
-         * <p>
-         * Can be called only after profileint has been set.
+         * @return next possible bid with current target utility, or null if no such
+         *         bid.
          */
-        private void computeMinMax() {
-                if (this.maxUtil != null && this.minUtil != null)
-                        return;
-                this.minUtil = 1d;
-                this.maxUtil = 0d;
-                UtilitySpace utilspace = getUtilSpace();
-                AllBidsList allbidslist = new AllBidsList(
-                                profileint.getProfile().getDomain());
-                for (Bid bid : allbidslist) {
-                        double util = utilspace.getUtility(bid).doubleValue();
-                        if (util < minUtil)
-                                minUtil = util;
-                        if (util > maxUtil)
-                                maxUtil = util;
-                }
-
-                Bid rvbid = utilspace.getReservationBid();
-                if (rvbid != null) {
-                        double rv = utilspace.getUtility(rvbid).doubleValue();
-                        if (rv > minUtil)
-                                minUtil = rv;
-                }
-                tolerance = 100 / allbidslist.size().longValue();
-                tolerance = Math.max(tolerance, 0.1);
-        }
-
         private Bid makeBid() {
                 double time = progress.get(System.currentTimeMillis());
-                double utilityGoal = utilityGoal(time, getE());
-                BidsWithUtility options = new BidsWithUtility(
-                                (LinearAdditiveUtilitySpace) profileint.getProfile(),
-                                BigDecimal.valueOf(utilityGoal),
-                                BigDecimal.valueOf(utilityGoal + tolerance));
+                BigDecimal utilityGoal = utilityGoal(time, getE());
+                ImmutableList<Bid> options = extendedspace.getBids(utilityGoal);
+                if (options.size() == BigInteger.ZERO)
+                        return null;
                 // pick a random one.
                 return options.get(new Random().nextInt(options.size().intValue()));
@@ -190 +165 @@
          * @return the utility goal for this time and e value
          */
-        private double utilityGoal(double t, double e) {
+        private BigDecimal utilityGoal(double t, double e) {
+                BigDecimal minUtil = extendedspace.getMin();
+                BigDecimal maxUtil = extendedspace.getMax();
+
                 double ft = 0;
                 if (e != 0)
                         ft = Math.pow(t, 1 / e);
-                // we subtract 0.000001 to correct possibly small round-up errors
-                return minUtil + (maxUtil - minUtil) * (1 - ft) - 0.000001;
+                // we subtract epsilon to correct possibly small round-up errors
+                return new BigDecimal(minUtil.doubleValue()
+                                + (maxUtil.doubleValue() - minUtil.doubleValue()) * (1 - ft))
+                                                .min(maxUtil).max(minUtil);
         }
 }