Changeset 11 for exampleparties/simpleshaop

Timestamp:

01/30/20 16:52:38 (5 years ago)

Author:

bart

Message:

Tournament overview table, few bug fixes

Location:

exampleparties/simpleshaop

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/geniusweb/exampleparties/simpleshaop/ShaopParty.java (modified) (2 diffs)
• src/main/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrdering.java (modified) (1 diff)
• src/test/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrderingTest.java (modified) (1 diff)

exampleparties/simpleshaop/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb.exampleparties</groupId>
         <artifactId>simpleshaop</artifactId>
-        <version>1.0.0</version>
+        <version>1.2.0</version>
         <packaging>jar</packaging>
 
@@ -33 +33 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>party</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
 
@@ -39 +39 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>bidspace</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>
                         <groupId>geniusweb</groupId>
                         <artifactId>profileconnection</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>

exampleparties/simpleshaop/src/main/java/geniusweb/exampleparties/simpleshaop/ShaopParty.java

@@ -15 +15 @@
 import geniusweb.actions.Offer;
 import geniusweb.actions.PartyId;
-import geniusweb.bidspace.AllPartialBidsList;
+import geniusweb.bidspace.AllBidsList;
 import geniusweb.issuevalue.Bid;
 import geniusweb.party.Capabilities;
@@ -132 +132 @@
 
         private Offer randomBid() throws IOException {
-                AllPartialBidsList bidspace = new AllPartialBidsList(
+                AllBidsList bidspace = new AllBidsList(
                                 profileint.getProfile().getDomain());
                 long i = random.nextInt(bidspace.size().intValue());

exampleparties/simpleshaop/src/main/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrdering.java

@@ -94 +94 @@
                 DefaultPartialOrdering prof = (DefaultPartialOrdering) profile;
                 List<Bid> bidslist = prof.getBids();
+                // NOTE sort defaults to ascending order, this is missing in docs.
                 Collections.sort(bidslist, new Comparator<Bid>() {
 
                         @Override
                         public int compare(Bid b1, Bid b2) {
-                                // notice, -1 if better because WORST bid first
-                                return prof.isPreferredOrEqual(b1, b2) ? -1 : 1;
+                                return prof.isPreferredOrEqual(b1, b2) ? 1 : -1;
                         }
 

exampleparties/simpleshaop/src/test/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrderingTest.java

@@ -64 +64 @@
                 SimpleLinearOrdering testprofile = new SimpleLinearOrdering(
                                 realprofile);
-                assertEquals(Arrays.asList(bid3, bid2, bid1), testprofile.getBids());
+                assertEquals(Arrays.asList(bid1, bid2, bid3), testprofile.getBids());
         }