Changeset 10 for exampleparties/timedependentparty/src

Timestamp:

01/28/20 10:19:54 (5 years ago)

Author:

bart

Message:

Update 28 jan 2020

Location:

exampleparties/timedependentparty/src

Files:

• main/java/geniusweb/exampleparties/timedependentparty/ExtendedUtilSpace.java (modified) (3 diffs)
• main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java (modified) (5 diffs)
• test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.Value;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import tudelft.utilities.immutablelist.ImmutableList;
 
@@ -20 +20 @@
  */
 public class ExtendedUtilSpace {
-        private LinearAdditiveUtilitySpace utilspace;
+        private LinearAdditive utilspace;
         private BigDecimal tolerance; // utility tolerance for a bid.
         private BidsWithUtility bidutils;
@@ -27 +27 @@
         private BigDecimal maxUtil;
 
-        public ExtendedUtilSpace(LinearAdditiveUtilitySpace space) {
+        public ExtendedUtilSpace(LinearAdditive space) {
                 this.utilspace = space;
                 bidutils = new BidsWithUtility(utilspace);

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

@@ -4 +4 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -24 +22 @@
 import geniusweb.party.inform.YourTurn;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import geniusweb.profileconnection.ProfileConnectionFactory;
 import geniusweb.profileconnection.ProfileInterface;
 import geniusweb.progress.Progress;
 import geniusweb.progress.ProgressRounds;
-import geniusweb.references.ProtocolRef;
 import tudelft.utilities.immutablelist.ImmutableList;
 import tudelft.utilities.logging.Reporter;
@@ -44 +41 @@
         private static final BigDecimal DEC100 = new BigDecimal("100");
         private ProfileInterface profileint;
-        private LinearAdditiveUtilitySpace utilspace = null; // last received space
+        private LinearAdditive utilspace = null; // last received space
         private PartyId me;
         private Progress progress;
@@ -61 +58 @@
         @Override
         public Capabilities getCapabilities() {
-                try {
-                        return new Capabilities(new HashSet<>(
-                                        Arrays.asList(new ProtocolRef(new URI("SAOP")))));
-                } catch (URISyntaxException e) {
-                        getReporter().log(Level.SEVERE, "Failed to create capabilities URI",
-                                        e);
-                        return null;
-                }
+                return new Capabilities(new HashSet<>(Arrays.asList("SAOP")));
         }
 
@@ -148 +138 @@
         }
 
-        private LinearAdditiveUtilitySpace updateUtilSpace() {
+        private LinearAdditive updateUtilSpace() throws IOException {
                 Profile newutilspace = profileint.getProfile();
                 if (!newutilspace.equals(utilspace)) {
-                        utilspace = (LinearAdditiveUtilitySpace) newutilspace;
+                        utilspace = (LinearAdditive) newutilspace;
                         extendedspace = new ExtendedUtilSpace(utilspace);
                 }

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

@@ -53 +53 @@
 public class TimeDependentPartyTest {
 
-        private static final ProtocolRef SAOP = new ProtocolRef("SAOP");
+        private static final String SAOP = "SAOP";
         private static final PartyId otherparty = new PartyId("other");
         private static final String PROFILE = "src/test/resources/testprofile.json";
@@ -105 +105 @@
                 Capabilities capabilities = party.getCapabilities();
                 assertFalse("party does not define protocols",
-                                capabilities.getProtocols().isEmpty());
+                                capabilities.getBehaviours().isEmpty());
         }
 
@@ -198 +198 @@
         @Test
         public void testGetCapabilities() {
-                assertTrue(party.getCapabilities().getProtocols().contains(SAOP));
+                assertTrue(party.getCapabilities().getBehaviours().contains(SAOP));
         }