Changeset 20

Timestamp:

10/06/20 13:12:35 (4 years ago)

Author:

bart

Message:

Fixes an issue with processing maxPower of a vote. Javadoc maven plugin now uses latest version.

Files:

• pom.xml (modified) (2 diffs)
• src/main/webapp/newsession.xhtml (modified) (4 diffs)
• src/main/webapp/newtournament.xhtml (modified) (1 diff)
• src/main/webapp/plotlog.xhtml (modified) (1 diff)

pom.xml

@@ -7 +7 @@
         <artifactId>runserver</artifactId>
         <packaging>war</packaging>
-        <version>1.5.2</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.3</version> <!-- must equal ${geniusweb.version} -->
         <name>runserver Maven Webapp</name>
         <url>http://maven.apache.org</url>
@@ -20 +20 @@
                 <jackson-2-version>2.9.10</jackson-2-version>
                 <tomcat.version>8.0.53</tomcat.version>
-                <geniusweb.version>1.5.2</geniusweb.version>
+                <geniusweb.version>1.5.3</geniusweb.version>
         </properties>
 

src/main/webapp/newsession.xhtml

@@ -40 +40 @@
         <br /> Domain/Profile Server:
         <input type="url" name="url" id="profilesserverurl"
-                value="localhost:8080/profilesserver-1.5.2"
+                value="localhost:8080/profilesserver-1.5.3"
                 pattern=".*:[0-9]+/profilesserver" size="30"
                 onchange="connectDomain()"> </input>
@@ -54 +54 @@
                 <br /> <b>Participants</b> <br /> Parties Server: <input type="url"
                         name="url" id="partiesserverurl"
-                        value="localhost:8080/partiesserver-1.5.2"
+                        value="localhost:8080/partiesserver-1.5.3"
                         pattern=".*:[0-9]+/partiesserver" size="30"
                         onchange="connectParties()"> </input> <br /> <br /> <b>Party
@@ -294 +294 @@
          refresh table: copy all parties elements in there.
          Typically parties is something like
-         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.5.2",
+         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.5.3",
                  "capabilities":{"protocols":["SAOP"]},
                  "description":"places random bids until it can accept an offer with utility >0.6",
-                 "id":"randomparty-1.5.2",
+                 "id":"randomparty-1.5.3",
                  "partyClass":"geniusweb.exampleparties.randomparty.RandomParty"},
                                  ...]
@@ -632 +632 @@
         function init() {
                 selectProtocol();
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.5.2"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.5.2"
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.5.3"
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.5.3"
                 connectDomain();
                 connectParties();

src/main/webapp/newtournament.xhtml

@@ -585 +585 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.5.2";
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.5.2";
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.5.3";
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.5.3";
 
                 selectProtocol();

src/main/webapp/plotlog.xhtml

@@ -203 +203 @@
                                         return 'accept' in lastact ? 'Yes':'No';
                                 case "MOPAC":
-                                        var finalstate=logfile['phase']['partyStates'];
+                                        var finalstate=logfile['phase'][Object.keys(logfile['phase'])[0]]['partyStates'];
                                         var nagrees=Object.keys(finalstate['agreements']).length;
                                         var nparties=Object.keys(finalstate['powers']).length;