Changeset 14 for src/main/webapp/utilstable.xhtml

Timestamp:

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

Author:

bart

Message:

Update to version 1.41

File:

• src/main/webapp/utilstable.xhtml (modified) (4 diffs)

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));