Changeset 4 for issuevalue/src

Timestamp:

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

Author:

bart

Message:

Faster example parties

Location:

issuevalue/src

Files:

• main/java/geniusweb/issuevalue/Bid.java (modified) (3 diffs)
• test/java/geniusweb/issuevalue/BidTest.java (modified) (2 diffs)

issuevalue/src/main/java/geniusweb/issuevalue/Bid.java

@@ -3 +3 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -40 +41 @@
 
         /**
+         * Makes partial bid with just 1 issue and value.
+         * 
+         * @param issue the issue name
+         * @param value the {@link Value}
+         */
+        public Bid(String issue, Value value) {
+                if (issue == null || value == null) {
+                        throw new NullPointerException("issue and value must be not =null");
+                }
+
+                issuevalues = new HashMap<>();
+                issuevalues.put(issue, value);
+        }
+
+        /**
          * @param issue
          * @return the value for the given issue, or null if there is no value for
@@ -59 +75 @@
         public Set<String> getIssues() {
                 return Collections.unmodifiableSet(issuevalues.keySet());
+        }
+
+        /**
+         * Merges this partial bid with another partial bid.
+         * 
+         * @param otherbid another partial bid.
+         * @return a bid with the combined values of both partial bids.
+         * @throws IllegalArgumentException if issues overlap.
+         */
+        public Bid merge(Bid otherbid) {
+                Set<String> ourissues = new HashSet<>(issuevalues.keySet());
+                ourissues.retainAll(otherbid.getIssues());
+                if (!ourissues.isEmpty()) {
+                        throw new IllegalArgumentException(
+                                        "Otherbid contains issues that are already set:"
+                                                        + ourissues);
+                }
+                HashMap<String, Value> newvalues = new HashMap<>(issuevalues);
+                newvalues.putAll(otherbid.issuevalues);
+                return new Bid(newvalues);
+
         }
 

issuevalue/src/test/java/geniusweb/issuevalue/BidTest.java

@@ -17 +17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.issuevalue.Bid;
-import geniusweb.issuevalue.DiscreteValue;
-import geniusweb.issuevalue.NumberValue;
-import geniusweb.issuevalue.Value;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -125 +121 @@
         }
 
+        @Test
+        public void testMerge() {
+                Map<String, Value> issuevalues = new HashMap<>();
+                issuevalues.put(ISSUE1, VALUE1);
+                Bid partial1 = new Bid(issuevalues);
+
+                issuevalues = new HashMap<>();
+                issuevalues.put(ISSUE2, VALUE2);
+                Bid partial2 = new Bid(issuevalues);
+
+                Bid mergedbid = partial1.merge(partial2);
+                assertEquals(bidc, mergedbid);
+        }
+
+        @Test(expected = IllegalArgumentException.class)
+        public void testMergeIssuesOverlap() {
+                Map<String, Value> issuevalues = new HashMap<>();
+                issuevalues.put(ISSUE1, VALUE1);
+                Bid partial1 = new Bid(issuevalues);
+
+                issuevalues = new HashMap<>();
+                issuevalues.put(ISSUE1, VALUE2);
+                Bid partial2 = new Bid(issuevalues);
+
+                partial1.merge(partial2);
+        }
+
+        @Test
+        public void smokeTestConstructor2() {
+                new Bid("issue", new DiscreteValue("dss"));
+        }
+
+        @Test
+        public void smokeTestConstructor2b() {
+                new Bid("issue", new NumberValue("0.5"));
+        }
+
+        @Test(expected = NullPointerException.class)
+        public void smokeTestConstructor2Null1() {
+                new Bid(null, new DiscreteValue("dss"));
+        }
+
+        @Test(expected = NullPointerException.class)
+        public void smokeTestConstructor2Null2() {
+                new Bid("issue", null);
+        }
+
 }