Convert to new A55 platform name and add updated mobile weightings.

diff --git a/details.html b/details.html
index 1f25acfd3bc2b5e75b82bc5dcf7932393613f8d0..bc6eef7a7f1e2d1ca4d93247e40eae3362701871 100644 (file)
--- a/details.html
+++ b/details.html
@@ -56,18 +56,18 @@
       platform = 'android-hw-a51-11-0-aarch64-shippable-qr';
       likelyDataURL = 'https://sql.telemetry.mozilla.org/api/queries/90959/results.json?api_key=uuoiM8Xdob1HcGB5UxdFG3TvZi6D08kfNR5pWC9O';
       timeWindow = '4wk';
-    } else if (searchParams.get('os') == 'android-s21') {
+    } else if (searchParams.get('os') == 'android-s24') {
       total_sig_firefox = 5052258;
       total_sig_chrome = 5051172;
       total_sig_car = 5052905;
-      platform = 'android-hw-s21-13-0-android-aarch64-shippable-qr';
+      platform = 'android-hw-s24-14-0-android-aarch64-shippable-qr';
       likelyDataURL = 'https://sql.telemetry.mozilla.org/api/queries/90959/results.json?api_key=uuoiM8Xdob1HcGB5UxdFG3TvZi6D08kfNR5pWC9O';
       timeWindow = '4wk';
     } else if (searchParams.get('os') == 'android-a55') {
-      total_sig_firefox = 182595;
-      total_sig_chrome = 183909;
-      total_sig_car = 184707;
-      platform = 'android-hw-a55-14-0-android-aarch64-shippable-qr';
+      total_sig_firefox = 228888;
+      total_sig_chrome = 230167;
+      total_sig_car = 230550;
+      platform = 'android-hw-a55-14-0-aarch64-shippable';
       likelyDataURL = 'https://sql.telemetry.mozilla.org/api/queries/90959/results.json?api_key=uuoiM8Xdob1HcGB5UxdFG3TvZi6D08kfNR5pWC9O';
       timeWindow = '4wk';
     } else if (searchParams.get('os') == 'android-p6') {
@@ -367,25 +367,6 @@
           plugins: {
             annotation: {
               annotations: {
-                line9: {
-                  type: 'line',
-                  xMin: '2024-03-09 00:00',
-                  xMax: '2024-03-09 00:00',
-                  borderColor: 'black',
-                  borderWidth: 2,
-                },
-                label9: {
-                  type: 'label',
-                  xValue: '2024-03-09 00:00',
-                  yValue: platform == 'android-hw-a51-11-0-aarch64-shippable-qr' ? 200 : 40,
-                  backgroundColor: 'rgb(255,128,128)',
-                  content: ['Release'],
-                  font: {
-                    size: 14
-                  },
-                  rotation: -90,
-                  borderRadius: 4
-                },
               }
             }
           }

diff --git a/index.html b/index.html
index 7b63017370780f81cecda78cfa1836f36c9f5abb..43842fe7f54b66111dc4debeaec46ea747a78267 100644 (file)
--- a/index.html
+++ b/index.html
@@ -55,12 +55,14 @@
         CaRGeoMeanDesktop += Math.exp(arithmeticMeanOfLogsCaR[platform] / numValues[platform]) * getPlatformWeight(platform);
       }
 
-      let FxGeoMeanMobile = Math.exp(arithmeticMeanOfLogsFX['android-hw-a55-14-0-android-aarch64-shippable-qr'] /
-        numValues['android-hw-a55-14-0-android-aarch64-shippable-qr'])
-      let ChromeGeoMeanMobile = Math.exp(arithmeticMeanOfLogsChrome['android-hw-a55-14-0-android-aarch64-shippable-qr'] /
-        numValues['android-hw-a55-14-0-android-aarch64-shippable-qr'])
-      let CaRGeoMeanMobile = Math.exp(arithmeticMeanOfLogsCaR['android-hw-a55-14-0-android-aarch64-shippable-qr'] /
-        numValues['android-hw-a55-14-0-android-aarch64-shippable-qr'])
+      let FxGeoMeanMobile = 0;
+      let ChromeGeoMeanMobile = 0;
+      let CaRGeoMeanMobile = 0;
+      for (const platform in arithmeticMeanOfLogsFX) {
+        FxGeoMeanMobile += Math.exp(arithmeticMeanOfLogsFX[platform] / numValues[platform]) * getMobilePlatformWeight(platform);
+        ChromeGeoMeanMobile += Math.exp(arithmeticMeanOfLogsChrome[platform] / numValues[platform]) * getMobilePlatformWeight(platform);
+        CaRGeoMeanMobile += Math.exp(arithmeticMeanOfLogsCaR[platform] / numValues[platform]) * getMobilePlatformWeight(platform);
+      }
       let diffDesktop = FxGeoMeanDesktop / ChromeGeoMeanDesktop - 1;
       let diffMobile = (FxGeoMeanMobile / ChromeGeoMeanMobile) - 1;
       let diffDesktopCaR = FxGeoMeanDesktop / CaRGeoMeanDesktop - 1;
@@ -116,6 +118,19 @@
       }
     }
 
+    function getMobilePlatformWeight(platform) {
+      switch (platform) {
+        case 'android-hw-a55-14-0-aarch64-shippable':
+          return 0.5;
+        case 'android-hw-p6-13-0-android-aarch64-shippable-qr':
+          return 0.25;
+        case 'android-hw-s24-14-0-android-aarch64-shippable-qr':
+          return 0.25;
+        default:
+          return 0.0;
+      }
+    }
+
     function displayChart(data) {
       const ctxDesktop = document.getElementById('chartDesktop').getContext('2d');
       const ctxMobile = document.getElementById('chartMobile').getContext('2d');
@@ -126,20 +141,23 @@
         if (!weightedValuesDesktop.hasOwnProperty(row.push_timestamp)) {
           weightedValuesDesktop[row.push_timestamp] = {};
         }
+        if (!weightedValuesMobile.hasOwnProperty(row.push_timestamp)) {
+          weightedValuesMobile[row.push_timestamp] = {};
+        }
         if (!weightedValuesDesktop[row.push_timestamp].hasOwnProperty(row.application)) {
           weightedValuesDesktop[row.push_timestamp][row.application] = {};
           weightedValuesDesktop[row.push_timestamp][row.application]['value'] = 0;
           weightedValuesDesktop[row.push_timestamp][row.application]['totalWeight'] = 0;
         }
-
+        if (!weightedValuesMobile[row.push_timestamp].hasOwnProperty(row.application)) {
+          weightedValuesMobile[row.push_timestamp][row.application] = {};
+          weightedValuesMobile[row.push_timestamp][row.application]['value'] = 0;
+          weightedValuesMobile[row.push_timestamp][row.application]['totalWeight'] = 0;
+        }
         weightedValuesDesktop[row.push_timestamp][row.application]['value'] += getPlatformWeight(row.platform) * row.geomean;
         weightedValuesDesktop[row.push_timestamp][row.application]['totalWeight'] += getPlatformWeight(row.platform);
-        if (row.platform == 'android-hw-a55-14-0-android-aarch64-shippable-qr') {
-          if (!weightedValuesMobile.hasOwnProperty(row.push_timestamp)) {
-            weightedValuesMobile[row.push_timestamp] = {};
-          }
-          weightedValuesMobile[row.push_timestamp][row.application] = row.geomean;
-        }
+        weightedValuesMobile[row.push_timestamp][row.application]['value'] += getMobilePlatformWeight(row.platform) * row.geomean;
+        weightedValuesMobile[row.push_timestamp][row.application]['totalWeight'] += getMobilePlatformWeight(row.platform);
       });
 
       let xyValuesFx = [];
@@ -170,15 +188,19 @@
 
       for (const timestamp in weightedValuesMobile) {
         if (weightedValuesMobile[timestamp].hasOwnProperty('fenix')) {
-          if (weightedValuesMobile[timestamp]['fenix'] < 950) {
-            xyValuesFenix.push({ x: timestamp, y: weightedValuesMobile[timestamp]['fenix'] });
+          if (weightedValuesMobile[timestamp]['fenix']['totalWeight'] > 0.999) {
+            xyValuesFenix.push({ x: timestamp, y: weightedValuesMobile[timestamp]['fenix']['value'] });
           }
         }
         if (weightedValuesMobile[timestamp].hasOwnProperty('chrome-m')) {
-          xyValuesChromeM.push({ x: timestamp, y: weightedValuesMobile[timestamp]['chrome-m'] });
+          if (weightedValuesMobile[timestamp]['chrome-m']['totalWeight'] > 0.999) {
+            xyValuesChromeM.push({ x: timestamp, y: weightedValuesMobile[timestamp]['chrome-m']['value'] });
+          }
         }
         if (weightedValuesMobile[timestamp].hasOwnProperty('cstm-car-m')) {
-          xyValuesCaRM.push({ x: timestamp, y: weightedValuesMobile[timestamp]['cstm-car-m'] });
+          if (weightedValuesMobile[timestamp]['cstm-car-m']['totalWeight'] > 0.999) {
+            xyValuesCaRM.push({ x: timestamp, y: weightedValuesMobile[timestamp]['cstm-car-m']['value'] });
+          }
         }
       }