Changeset 14 for src/main

Timestamp:

06/11/20 16:34:50 (4 years ago)

Author:

bart

Message:

Update to version 1.41

Location:

src/main

Files:

• java/geniusweb/runserver/Info.java (added)
• webapp/WEB-INF/web.xml (modified) (2 diffs)
• webapp/newsession.xhtml (modified) (4 diffs)
• webapp/newtournament.xhtml (modified) (7 diffs)
• webapp/plotlog.xhtml (modified) (4 diffs)
• webapp/utilstable.xhtml (modified) (4 diffs)

src/main/webapp/WEB-INF/web.xml

@@ -45 +45 @@
         </servlet>
 
+        <servlet>
+                <servlet-name>Info</servlet-name>
+                <display-name>Info</display-name>
+                <description>get info</description>
+                <servlet-class>geniusweb.runserver.Info</servlet-class>
+        </servlet>
+
 
         <servlet-mapping>
@@ -54 +61 @@
                 <url-pattern>/run</url-pattern>
         </servlet-mapping>
-
+        <servlet-mapping>
+                <servlet-name>Info</servlet-name>
+                <url-pattern>/info</url-pattern>
+        </servlet-mapping>
 
 </web-app>

src/main/webapp/newsession.xhtml

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

src/main/webapp/newtournament.xhtml

@@ -18 +18 @@
         </select>
         <br />
-        <br />
-        <input type="number" id="teamspersession" name="tentacles" min="2"
-                max="10" value="2" /> Number of teams in each session
+        <input type="number" id="ntournaments" min="1" max="1000000" value="1" />
+        Number of times to repeat the entire tournament
+        <br />
+
+        <br />
+        <input type="number" id="teamspersession" min="2" max="10" value="2" />
+        Number of teams in each session
         <br />
 
@@ -103 +107 @@
                                 <th align="left">Party</th>
                                 <th align="left">Parameters</th>
-                                <th align="left"><div class="onlySHAOP">Compare Bids Party</div></th>
-                                <th align="left"><div class="onlySHAOP">Compare Bids Parameters</div></th>
+                                <th align="left"><div class="onlySHAOP">Compare Bids
+                                                Party</div></th>
+                                <th align="left"><div class="onlySHAOP">Compare Bids
+                                                Parameters</div></th>
                         </thead>
                         <tbody id="teamList">
@@ -127 +133 @@
 
 <script type="application/javascript">
+        
         
         
@@ -506 +513 @@
         function makeRequest() {
                 const npersession = document.getElementById("teamspersession").value;
+                const ntournaments = document.getElementById("ntournaments").value;
                 const reuseTeams  = document.getElementById("reuseteams").checked;
                 const protocolcombobox = document.getElementById("protocolselection");
@@ -540 +548 @@
                 
                 return JSON.stringify({"AllPermutationsSettings":{"teams":teamsFull,"profileslists":profilesFull,
-                        "reuseTeams":reuseTeams,"teamsPerSession":npersession,"sessionsettings":sessionSettings}});
+                        "reuseTeams":reuseTeams,"teamsPerSession":npersession,"sessionsettings":sessionSettings,
+                        "numberTournaments":ntournaments}});
         }
         
@@ -547 +556 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.4.0";
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.4.0";
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.4.1";
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.4.1";
 
                 selectProtocol();
@@ -570 +579 @@
 
 
+
 </script>
 

src/main/webapp/plotlog.xhtml

@@ -26 +26 @@
                 <canvas id="canvas"></canvas>
         </div>
+        
+        Agreement: <div id="agreement" style="display:inline;">?</div>
 </body>
 
@@ -127 +129 @@
                 var keys = Object.keys(partyprofileURIs);
                         if (keys.length==0) {
-                                plotResults(computeUtils(json, partyprofiles));
+                                plotResults(computeUtils(json, partyprofiles), isAgreement(json));
                                 return;
                         }
@@ -158 +160 @@
         
         /**
+        @return true if there is agreement
+        */
+        function isAgreement(logfile) {
+                var actions=logfile['actions'];
+                        var lastact = actions[actions.length -1];
+                        return 'accept' in lastact;
+        }
+        /**
         @json the log file contents
         @param partyprofiles a dict with key=party id and value a the (linear additive) profile
@@ -199 +209 @@
         /**
         @param utilities the dict with key=party id  of the utilities of all steps for each party )
-        */
-        
-        function plotResults( utilities) {
+        @param isAgreement true iff there is agreement reached
+        */
+        
+        function plotResults( utilities, isAgreement) {
                 setStatus("Plotting" )
+                
+            document.getElementById('agreement').innerHTML=isAgreement?"Yes":"No";
 
                 var parties=Object.keys(utilities);

src/main/webapp/utilstable.xhtml

@@ -257 +257 @@
         */
         function addUtilityCell(cell, agreedbid, partyname, profileurl) {
-                if (Object.keys(agreedbid).lengt==0) {
-                cell.innerHTML = "0 :"+partyname;
-                return;
-                }
                 var util = utility(profiles[profileurl],agreedbid);
                 cell.innerHTML = Math.round(util*1000000)/1000000 +" :"+partyname;
@@ -267 +263 @@
         
 
-
-        
-        /**
-        @json the log file contents
-        @param partyprofiles a dict with key=party id and value a the (linear additive) profile
-        */
-        function computeUtils(json, partyprofiles) {
-                
-                setStatus("Computing utilities.")
-                var utilities={};
-                        for (var party in partyprofiles) {
-                                utilities[party]=[];
-                        }
-                var actions = json['actions'];
-                for (var action in actions) {
-                        var offer = actions[action];
-                        if (offer['offer']==undefined)
-                                continue;
-                        var issueutilities = offer['offer']['bid']['issuevalues']
-                                for (var party in partyprofiles) {
-                                        utilities[party].push(utility(partyprofiles[party],issueutilities));
-                                }
-                }
-                return utilities;
-                
-                
-        }
 
 
@@ -324 +293 @@
                 /**
                 Compute utilityes
-                @param linadditive the linear additive utility space
+                @param profile the linear additive utility space
                 @param issueValues the bid containing dict with values for the issues
-                @return utility of issueValues
+                @param isResBidAlternative true if the reservation bid is usable as alternative bid
+                  . If true, and the issueValues list is empty/null, this returns the utility
+                  of the reservation bid instead.
+                @return utility of issueValues. Returns 0 if profile =null or no bid available
+                
                 */
-                function utility(profile, issueValues) {
+                function utility(profile, issueValues, isResBidAlternative) {
+                        if (profile==null) return 0;
+
+                        // check if we need the reservationbid.
+                        if (issueValues==null || Object.keys(issueValues).length==0) {
+                                var resBid = profile['reservationBid'];
+                                if (resBid==null) return 0;
+                                issueValues = resBid['issuevalues'];
+                        }
+                        
+                        if (issueValues==null) return 0;
+                        
                         var util=0;
                         var weights = profile['issueWeights'];
@@ -359 +343 @@
                         if (utilfunc['discreteutils']!=undefined) {
                                 // it's discrete issue. Compute
-                                return utilfunc['discreteutils']['valueUtilities'][value];
+                                if (value in utilfunc['discreteutils']['valueUtilities']) 
+                                        return utilfunc['discreteutils']['valueUtilities'][value];
+                                return 0;
                         }
                 setStatus("Unknown utility function type "+Object.keys(utilfunc));