@zac-apps/helium 1.3.0-beta.4 → 1.3.0-beta.6

package/dist/index.js

@@ -33,6 +33,7 @@ import { LineChart, Line, CartesianGrid, XAxis, Label, YAxis, ReferenceLine, Ref
 import ButtonGroup from '@mui/material/ButtonGroup';
 import Switch from '@mui/material/Switch';
 import regression from 'regression';
+import { mean, sqrt, sum } from 'mathjs';
 
 function NumField(_ref) {
   var input = _ref.input,
@@ -377,8 +378,8 @@ function SelectSpecs(_ref) {
   });
 }
 
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 // Admonition colors
 
@@ -441,7 +442,7 @@ function HePrognosisSum(_ref2) {
   var boilOff = heliumLookupData.boilOff;
   var boilData = {};
   Object.keys(heliumData).map(function (spec) {
-    boilData = _objectSpread$5(_objectSpread$5({}, boilData), {}, _defineProperty({}, spec, Math.round(heliumData[spec] + days * boilOff[spec])));
+    boilData = _objectSpread$4(_objectSpread$4({}, boilData), {}, _defineProperty({}, spec, Math.round(heliumData[spec] + days * boilOff[spec])));
     return null;
   });
   var toMaxSum = Object.keys(boilData).reduce(function (total, current) {
@@ -610,7 +611,7 @@ function HePrognosis(_ref6) {
   var specDefault = {};
   var specList = Object.keys(heliumData.helium);
   specList.map(function (spec) {
-    return specDefault = _objectSpread$5(_objectSpread$5({}, specDefault), {}, _defineProperty({}, spec, true));
+    return specDefault = _objectSpread$4(_objectSpread$4({}, specDefault), {}, _defineProperty({}, spec, true));
   });
   var _useImmer = useImmer(specDefault),
     _useImmer2 = _slicedToArray(_useImmer, 2),
@@ -624,13 +625,13 @@ function HePrognosis(_ref6) {
   Object.keys(specs).filter(function (spec) {
     return specs[spec];
   }).map(function (spec) {
-    return currHeliumData = _objectSpread$5(_objectSpread$5({}, currHeliumData), {}, _defineProperty({}, spec, heliumData.helium[spec]));
+    return currHeliumData = _objectSpread$4(_objectSpread$4({}, currHeliumData), {}, _defineProperty({}, spec, heliumData.helium[spec]));
   });
   var dates = {};
   for (var i in increments) {
     var d = new Date();
     d.setDate(d.getDate() + increments[i]);
-    dates = _objectSpread$5(_objectSpread$5({}, dates), {}, _defineProperty({}, increments[i], moment(d).format("ll")));
+    dates = _objectSpread$4(_objectSpread$4({}, dates), {}, _defineProperty({}, increments[i], moment(d).format("ll")));
   }
   return /*#__PURE__*/jsxs(Grid, {
     container: true,
@@ -921,8 +922,8 @@ function FindTriple(_ref2) {
   return minTriple;
 }
 
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function TupleResult(_ref) {
   var children = _ref.children,
     title = _ref.title;
@@ -1007,7 +1008,7 @@ function PairWizard(_ref4) {
   var boilOff = heliumLookupData.boilOff;
   var defaultSpecs = {};
   Object.keys(boilOff).map(function (spec) {
-    return defaultSpecs = _objectSpread$4(_objectSpread$4({}, defaultSpecs), {}, _defineProperty({}, spec, true));
+    return defaultSpecs = _objectSpread$3(_objectSpread$3({}, defaultSpecs), {}, _defineProperty({}, spec, true));
   });
   var _useImmer = useImmer(defaultSpecs),
     _useImmer2 = _slicedToArray(_useImmer, 2),
@@ -1024,13 +1025,13 @@ function PairWizard(_ref4) {
     _useState4 = _slicedToArray(_useState3, 2),
     limit = _useState4[0],
     SetLimit = _useState4[1];
-  var minPair = FindPair(_objectSpread$4({}, {
+  var minPair = FindPair(_objectSpread$3({}, {
     currSpecs: currSpecs,
     heliumData: heliumData,
     boilOff: boilOff,
     limit: limit
   }));
-  var minTriple = FindTriple(_objectSpread$4({}, {
+  var minTriple = FindTriple(_objectSpread$3({}, {
     currSpecs: currSpecs,
     heliumData: heliumData,
     boilOff: boilOff,
@@ -1236,8 +1237,8 @@ function FillTarget(_ref) {
   });
 }
 
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function EstimateConsumption() {
   // Get data
 
@@ -1263,7 +1264,7 @@ function EstimateConsumption() {
   // Calculate consumption per day, month, year from values above
 
   specCons = specCons.map(function (spec) {
-    return _objectSpread$3(_objectSpread$3({}, spec), {}, {
+    return _objectSpread$2(_objectSpread$2({}, spec), {}, {
       perDay: spec.liters / spec.days,
       perMonth: (spec.liters / spec.days * 30).toFixed(1),
       perYear: (spec.liters / spec.days * 365).toFixed(1)
@@ -1331,31 +1332,101 @@ function EstimateConsumption() {
   });
 }
 
+function ShowEstimate(_ref) {
+  var spec = _ref.spec,
+    estimatedBoiloff = _ref.estimatedBoiloff,
+    estimatedError = _ref.estimatedError;
+  var heliumLookupData = useContext(LookupContext);
+
+  // Get stored data
+
+  var storedBoiloff = heliumLookupData.boilOff[spec].toFixed(3) || "N/A";
+
+  // Round values from props
+
+  estimatedBoiloff = estimatedBoiloff.toFixed(3) || "N/A";
+  estimatedError = estimatedError.toFixed(3) || "N/A";
+
+  // Warn if values differ
+
+  var renderEstimatedBoiloff = Math.abs(estimatedBoiloff - storedBoiloff) < 0.01 ? estimatedBoiloff : /*#__PURE__*/jsx("strong", {
+    style: {
+      color: AppTheme.palette.primary.main
+    },
+    children: estimatedBoiloff
+  });
+  return /*#__PURE__*/jsxs("div", {
+    children: [/*#__PURE__*/jsx("h4", {
+      children: "Boiloff coefficients (%/day)"
+    }), /*#__PURE__*/jsx(Grid, {
+      container: true,
+      children: /*#__PURE__*/jsxs(AppTable, {
+        children: [/*#__PURE__*/jsx(TableHead, {
+          children: /*#__PURE__*/jsxs(TableRow, {
+            children: [/*#__PURE__*/jsx(TableHeadCell, {
+              children: "Estimated"
+            }), /*#__PURE__*/jsx(TableHeadCell, {
+              children: "Stored"
+            })]
+          })
+        }), /*#__PURE__*/jsx(TableBody, {
+          children: /*#__PURE__*/jsxs(TableRow, {
+            children: [/*#__PURE__*/jsxs(TableCell, {
+              children: [renderEstimatedBoiloff, " ", /*#__PURE__*/jsxs("em", {
+                style: {
+                  color: AppTheme.palette.secondary.main
+                },
+                children: ["(\xB1", estimatedError, ")"]
+              })]
+            }), /*#__PURE__*/jsx(TableCell, {
+              children: storedBoiloff
+            })]
+          })
+        })]
+      })
+    })]
+  });
+}
+
 function EstimateSlope(_ref) {
   var data = _ref.data;
+    _ref.spec;
   // define slope and intercept
 
   var slope = 0;
   var intercept = 0;
 
-  // find last time when spectrometer was filled - for this start from last point and go back until the first maximum is found
+  // Define firstMax and firstMaxIndex
 
   var firstMax = Number(data[data.length - 1].level);
   var firstMaxIndex = data.length - 1;
+
+  // Check if the last time when the spectrometer was filled is more than 45 days ago
+
+  var lastMaxIndex = data.length - 1;
+  var lastMax = Number(data[lastMaxIndex].level);
   for (var i = data.length - 2; i >= 0; i--) {
     var level = Number(data[i].level);
     if (level > firstMax) {
-      firstMax = level;
-      firstMaxIndex = i;
+      lastMax = level;
+      lastMaxIndex = i;
     }
 
     // stop if level decreases from maximum
 
-    if (level < firstMax) {
+    if (level < lastMax) {
       break;
     }
   }
 
+  // if the last maximum is less than 45 days ago, use the last maximum as the first maximum
+  // otherwise, the initial firstMaxIndex is the last maximum index
+
+  if (lastMaxIndex >= data.length - 45) {
+    firstMaxIndex = lastMaxIndex - 1;
+    firstMax = Number(data[firstMaxIndex].level);
+  }
+
   // minimum level is the level at firstMaxIndex
 
   var minLevelIndex = firstMaxIndex - 1;
@@ -1388,69 +1459,36 @@ function EstimateSlope(_ref) {
   // Perform linear regression on the points
 
   var result = regression.linear(points, {
-    precision: 3
+    precision: 6
   });
   slope = result.equation[0];
   intercept = result.equation[1];
-  return {
-    slope: slope,
-    intercept: intercept
-  };
-}
 
-function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function ShowEstimate(_ref) {
-  var data = _ref.data,
-    spec = _ref.spec;
-  var heliumLookupData = useContext(LookupContext);
+  // Determine slope uncertainty based on regression result
+  // For that, create an array of control values
+  var control = [];
+  for (var _i3 = maxLevelIndex; _i3 <= minLevelIndex; _i3++) {
+    control.push([_i3, _i3 * slope + intercept]);
+  }
 
-  // Get estimated data
+  // Calculate mean x value
 
-  var estimateResult = EstimateSlope(_objectSpread$2({}, {
-    data: data,
-    spec: spec
+  var meanX = mean(points.map(function (point) {
+    return point[0];
   }));
-  var estimatedBoiloff = estimateResult.slope.toFixed(3) || "N/A";
-
-  // Get stored data
 
-  var storedBoiloff = heliumLookupData.boilOff[spec].toFixed(3) || "N/A";
-
-  // Warn if values differ
+  // Calculate standard slope error
 
-  var renderEstimatedBoiloff = Math.abs(estimatedBoiloff - storedBoiloff) < 0.1 ? estimatedBoiloff : /*#__PURE__*/jsx("strong", {
-    style: {
-      color: AppTheme.palette.primary.main
-    },
-    children: estimatedBoiloff
-  });
-  return /*#__PURE__*/jsxs("div", {
-    children: [/*#__PURE__*/jsx("h4", {
-      children: "Boiloff coefficients (%/day)"
-    }), /*#__PURE__*/jsx(Grid, {
-      container: true,
-      children: /*#__PURE__*/jsxs(AppTable, {
-        children: [/*#__PURE__*/jsx(TableHead, {
-          children: /*#__PURE__*/jsxs(TableRow, {
-            children: [/*#__PURE__*/jsx(TableHeadCell, {
-              children: "Estimated"
-            }), /*#__PURE__*/jsx(TableHeadCell, {
-              children: "Stored"
-            })]
-          })
-        }), /*#__PURE__*/jsx(TableBody, {
-          children: /*#__PURE__*/jsxs(TableRow, {
-            children: [/*#__PURE__*/jsx(TableCell, {
-              children: renderEstimatedBoiloff
-            }), /*#__PURE__*/jsx(TableCell, {
-              children: storedBoiloff
-            })]
-          })
-        })]
-      })
-    })]
-  });
+  var slopeError = sqrt(1 / (control.length - 2) * sum(points.map(function (point, i) {
+    return Math.pow(point[1] - control[i][1], 2);
+  })) / sum(points.map(function (point, i) {
+    return Math.pow(point[0] - meanX, 2);
+  })));
+  return {
+    slope: slope,
+    intercept: intercept,
+    slopeError: slopeError
+  };
 }
 
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -1472,6 +1510,7 @@ function RenderGraph(_ref) {
   }));
   var estimatedBoiloff = estimateResult.slope;
   var estimatedIntercept = estimateResult.intercept;
+  var estimatedError = estimateResult.slopeError;
 
   // Custom Tooltip for LineChart
 
@@ -1541,10 +1580,16 @@ function RenderGraph(_ref) {
 
   // Get chart data from estimate
 
+  // First, get difference between today and last data point
+
+  var daysSinceUpate = moment().diff(moment(data[data.length - 1].date, "ddd MMM D HH:mm:ss YYYY"), "days");
+
+  // Then calculate estimated data points
+
   showEstimate && (data = data.map(function (item) {
     var days = item.days;
     var level = item.level;
-    var estimate = estimatedBoiloff * (data.length - days) + estimatedIntercept;
+    var estimate = estimatedBoiloff * (data.length - days + daysSinceUpate) + estimatedIntercept;
     return {
       date: item.date,
       days: days,
@@ -1668,7 +1713,8 @@ function RenderGraph(_ref) {
       })]
     }), /*#__PURE__*/jsx(ShowEstimate, {
       spec: spec,
-      data: data
+      estimatedBoiloff: estimatedBoiloff,
+      estimatedError: estimatedError
     })]
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zac-apps/helium",
-    "version": "1.3.0-beta.4",
+    "version": "1.3.0-beta.6",
     "scripts": {
         "rollup": "node_modules/rollup/dist/rollup.js",
         "dev": "next dev",
@@ -30,9 +30,9 @@
     "dependencies": {
         "@mui/icons-material": "^5.17.1",
         "@mui/material": "^5.17.1",
-        "@zac-apps/commons": "^1",
+        "mathjs": "^14.4.0",
         "moment": "^2.30.1",
-        "recharts": "^2.15.1",
+        "recharts": "^2.15.3",
         "regression": "^2.0.1",
         "use-immer": "^0.11.0"
     },
@@ -47,25 +47,25 @@
         "@semantic-release/git": "^10.0.1",
         "@semantic-release/gitlab": "^13.2.4",
         "@semantic-release/npm": "^12.0.1",
-        "@storybook/addon-essentials": "^8.6.10",
-        "@storybook/addon-interactions": "^8.6.10",
-        "@storybook/addon-links": "^8.6.10",
-        "@storybook/addon-onboarding": "^8.6.10",
-        "@storybook/blocks": "^8.6.10",
-        "@storybook/nextjs": "^8.6.10",
-        "@storybook/react": "^8.6.10",
-        "@storybook/test": "^8.6.10",
+        "@storybook/addon-essentials": "^8.6.12",
+        "@storybook/addon-interactions": "^8.6.12",
+        "@storybook/addon-links": "^8.6.12",
+        "@storybook/addon-onboarding": "^8.6.12",
+        "@storybook/blocks": "^8.6.12",
+        "@storybook/nextjs": "^8.6.12",
+        "@storybook/react": "^8.6.12",
+        "@storybook/test": "^8.6.12",
         "babel-loader": "^10.0.0",
         "eslint": "^9",
-        "eslint-config-next": "15.2.4",
+        "eslint-config-next": "15.3.1",
         "eslint-plugin-storybook": "^0.12.0",
-        "rollup": "^4.37.0",
+        "next": "^14",
+        "rollup": "^4.40.0",
         "semantic-release": "^24.2.3",
-        "storybook": "^8.6.10"
+        "storybook": "^8.6.12"
     },
     "peerDependencies": {
         "@zac-apps/commons": "^1",
-        "next": "^14",
         "react": "^18 || ^19",
         "react-dom": "^18 || ^19"
     },