Changeset 10 for exampleparties/randomparty/src

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

Location:

exampleparties/randomparty/src

Files:

• main/java/geniusweb/exampleparties/randomparty/RandomParty.java (modified) (4 diffs)
• test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java (modified) (6 diffs)

exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -30 +28 @@
 import geniusweb.progress.Progress;
 import geniusweb.progress.ProgressRounds;
-import geniusweb.references.ProtocolRef;
 import tudelft.utilities.logging.Reporter;
 
@@ -81 +78 @@
         @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")));
         }
 
@@ -115 +105 @@
         }
 
-        private boolean isGood(Bid bid) {
+        private boolean isGood(Bid bid) throws IOException {
                 if (bid == null)
                         return false;

exampleparties/randomparty/src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java

@@ -42 +42 @@
 import geniusweb.party.inform.YourTurn;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import geniusweb.progress.ProgressRounds;
 import geniusweb.references.Parameters;
@@ -53 +53 @@
 public class RandomPartyTest {
 
-        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";
@@ -63 +63 @@
         private final ProgressRounds progress = mock(ProgressRounds.class);
         private Settings settings;
-        private LinearAdditiveUtilitySpace profile;
+        private LinearAdditive profile;
         private final Parameters parameters = new Parameters();
 
@@ -76 +76 @@
                 String serialized = new String(Files.readAllBytes(Paths.get(PROFILE)),
                                 StandardCharsets.UTF_8);
-                profile = (LinearAdditiveUtilitySpace) jackson.readValue(serialized,
-                                Profile.class);
+                profile = (LinearAdditive) jackson.readValue(serialized, Profile.class);
 
         }
@@ -94 +93 @@
                 Capabilities capabilities = party.getCapabilities();
                 assertFalse("party does not define protocols",
-                                capabilities.getProtocols().isEmpty());
+                                capabilities.getBehaviours().isEmpty());
         }
 
@@ -176 +175 @@
         @Test
         public void testGetCapabilities() {
-                assertTrue(party.getCapabilities().getProtocols().contains(SAOP));
+                assertTrue(party.getCapabilities().getBehaviours().contains(SAOP));
         }