Changeset 3 for exampleparties/timedependentparty/src

Timestamp:

08/29/19 17:09:32 (5 years ago)

Author:

bart

Message:

Small fixes

Location:

exampleparties/timedependentparty/src

Files:

• main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java (modified) (2 diffs)
• test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java (modified) (2 diffs)

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

@@ -122 +122 @@
 
                 if (lastReceivedBid != null && utilspace.getUtility(lastReceivedBid)
-                                .compareTo(utilspace.getUtility(bid)) > 0) {
+                                .compareTo(utilspace.getUtility(bid)) >= 0) {
                         myAction = new Accept(me, lastReceivedBid);
                 } else {
@@ -160 +160 @@
                                 maxUtil = util;
                 }
-                double rv = utilspace.getUtility(utilspace.getReservationBid())
-                                .doubleValue();
-                if (rv > minUtil)
-                        minUtil = rv;
+
+                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);

exampleparties/timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java

@@ -27 +27 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.actions.Accept;
 import geniusweb.actions.Action;
 import geniusweb.actions.EndNegotiation;
@@ -146 +147 @@
         }
 
-//      @Test
-//      public void testAgentAccepts() {
-//              party.connect(connection);
-//              party.notifyChange(settings);
-//
-//              Bid bid = findBestBid();
-//              party.notifyChange(new ActionDone(new Offer(otherparty, bid)));
-//              party.notifyChange(new YourTurn());
-//              assertEquals(1, connection.getActions().size());
-//              assertTrue(connection.getActions().get(0) instanceof Accept);
-//
-//      }
+        @Test
+        public void testAgentAccepts() {
+                party.connect(connection);
+                party.notifyChange(settings);
+
+                Bid bid = findBestBid();
+                party.notifyChange(new ActionDone(new Offer(otherparty, bid)));
+                party.notifyChange(new YourTurn());
+                assertEquals(1, connection.getActions().size());
+                assertTrue(connection.getActions().get(0) instanceof Accept);
+
+        }
 
         @Test