Changeset 46 for src

Timestamp:

12/18/24 13:54:06 (5 days ago)

Author:

ruud

Message:

All TimeDependent parties now support the nonlinear SumOfGroupsUtilitySpace. Example Nonlinear space in the computer domain

Location:

src/main/webapp

Files:

• newsession.xhtml (modified) (4 diffs)
• newtournament.xhtml (modified) (1 diff)
• plotlog.xhtml (modified) (5 diffs)

src/main/webapp/newsession.xhtml

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

src/main/webapp/newtournament.xhtml

@@ -683 +683 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-2.1.6";
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-2.1.6";
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-2.2.1";
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-2.2.1";
 
                 selectSessionProtocol();

src/main/webapp/plotlog.xhtml

@@ -56 +56 @@
         
         var ws = null;
+        
+        function arrayequals(array1, array2) {
+                return array1.length === array2.length && array1.every(function(value, index) { return value === array2[index]})
+        }
 
         <!-- Most functions are reactive programming written out-->
@@ -179 +183 @@
             ws.onmessage = function (event) {
                 var profile = JSON.parse(event.data);
-                if (profile['LinearAdditiveUtilitySpace']==undefined) {
-                    setStatus('Fatal: profile '+uri+" does not contain a LinearAdditiveUtilitySpace.");
+                if (profile['LinearAdditiveUtilitySpace']==undefined && profile['SumOfGroupsUtilitySpace']==undefined) {
+                    setStatus('Fatal: profile '+uri+" does not contain a LinearAdditive- or SumOfGroups UtilitySpace.");
                     return;
                 }
-                partyprofiles[party]=profile['LinearAdditiveUtilitySpace'];
+                partyprofiles[party]=profile;
                 getProfiles(json, partyprofileURIs, protocol, partyprofiles);
             };
@@ -381 +385 @@
         
    
+    function utility(profile, issueValues) {
+        if (profile['LinearAdditiveUtilitySpace']!=undefined) 
+                return linearUtility(profile['LinearAdditiveUtilitySpace'], issueValues);
+
+                if (profile['SumOfGroupsUtilitySpace']!=undefined) 
+                return groupUtility(profile['SumOfGroupsUtilitySpace'], issueValues);
+        
+    }
+
+        /**
+        Compute utilityes for a linear-additive profile
+        @param linadditive the linear additive utility space
+        @param issueValues the bid containing dict with values for the issues
+        @return utility of issueValues
+        */
+        function groupUtility(profile, issueValues) {
+                var util=0;
+                
+                for (var part in profile['partUtilities']) {
+                        util = util + grouputil(profile['partUtilities'][part]['PartsUtilities'], issueValues );
+                }
+                return util;
+        }
+        
+        function grouputil(partutils, issueValues) {
+                
+                // extract the exact value list of this group
+                var value = []
+                for (const iss of partutils['issues']) {
+                        value.push( issueValues[iss] )
+                }
+                
+                // find the utility in the utilslist
+                for (const item of partutils['utilslist']) {
+                        if ( arrayequals(  item['values'], value))
+                                return item['util']
+                }
+                return 0; // fallback, not found. Maybe error?
+                
+        }       
+
+        
     
-                
         /**
-                Compute utilityes
+                Compute utilityes for a linear-additive profile
                 @param linadditive the linear additive utility space
                 @param issueValues the bid containing dict with values for the issues
                 @return utility of issueValues
                 */
-                function utility(profile, issueValues) {
+                function linearUtility(profile, issueValues) {
                         var util=0;
                         var weights = profile['issueWeights'];
@@ -399 +444 @@
                 }
         
-                /**
+
+        /**
                 Bit hacky, javascript version of evaluator of utility space. 
                 Would be much nicer if we could use java here
@@ -437 +483 @@
 
 
+
 </script>