From f9797de7fd0bf64c55d6dd9820a778408b271b8d Mon Sep 17 00:00:00 2001 From: Angel43ver Date: Wed, 20 May 2026 13:10:44 -0700 Subject: [PATCH 1/3] Initialize LR17 --- ...ge_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv | 76 +++++++++++++++++ .../test/web/readingsLineMeterRangeRaw.js | 85 ++++++++++++++++++- 2 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv diff --git a/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv b/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv new file mode 100644 index 000000000..8815e53db --- /dev/null +++ b/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv @@ -0,0 +1,76 @@ +min,max,start time,end time +178.133336199489,1055.70198401992,2022-08-18 00:00:00,2022-08-19 00:00:00 +173.074406662956,1053.47855526476,2022-08-19 00:00:00,2022-08-20 00:00:00 +172.092478277259,1053.02105088731,2022-08-20 00:00:00,2022-08-21 00:00:00 +182.056695970023,1061.65238595875,2022-08-21 00:00:00,2022-08-22 00:00:00 +175.456061305352,1053.33344108767,2022-08-22 00:00:00,2022-08-23 00:00:00 +190.758358302563,1044.26441262712,2022-08-23 00:00:00,2022-08-24 00:00:00 +183.931789655338,1054.67287862863,2022-08-24 00:00:00,2022-08-25 00:00:00 +186.946050470548,1056.67716093124,2022-08-25 00:00:00,2022-08-26 00:00:00 +200.349541456801,1051.99549254363,2022-08-26 00:00:00,2022-08-27 00:00:00 +173.310321653095,1059.42627966237,2022-08-27 00:00:00,2022-08-28 00:00:00 +197.569578998162,1050.94709198928,2022-08-28 00:00:00,2022-08-29 00:00:00 +177.153761348177,1031.17766513776,2022-08-29 00:00:00,2022-08-30 00:00:00 +178.444467921651,1053.01860177283,2022-08-30 00:00:00,2022-08-31 00:00:00 +179.727377368246,1035.92322542535,2022-08-31 00:00:00,2022-09-01 00:00:00 +189.597838534925,1061.92098400231,2022-09-01 00:00:00,2022-09-02 00:00:00 +181.758656525344,1059.77585210563,2022-09-02 00:00:00,2022-09-03 00:00:00 +188.675075241147,1048.12541674532,2022-09-03 00:00:00,2022-09-04 00:00:00 +198.28462976871,1037.83485672982,2022-09-04 00:00:00,2022-09-05 00:00:00 +177.36250566118,1056.36701169939,2022-09-05 00:00:00,2022-09-06 00:00:00 +174.169724310138,1056.32983172468,2022-09-06 00:00:00,2022-09-07 00:00:00 +180.270035713662,1020.71041042774,2022-09-07 00:00:00,2022-09-08 00:00:00 +178.141622107933,1049.57964182566,2022-09-08 00:00:00,2022-09-09 00:00:00 +174.430602690676,1058.79931444633,2022-09-09 00:00:00,2022-09-10 00:00:00 +172.661663303709,1058.49080691405,2022-09-10 00:00:00,2022-09-11 00:00:00 +179.737175394399,1062.10175744307,2022-09-11 00:00:00,2022-09-12 00:00:00 +178.168649199153,1053.94591338892,2022-09-12 00:00:00,2022-09-13 00:00:00 +172.444969737089,1060.12012093921,2022-09-13 00:00:00,2022-09-14 00:00:00 +178.838432883916,1058.6266429243,2022-09-14 00:00:00,2022-09-15 00:00:00 +173.253180596726,1061.72392086282,2022-09-15 00:00:00,2022-09-16 00:00:00 +173.712760723002,1032.83359678473,2022-09-16 00:00:00,2022-09-17 00:00:00 +173.653344939233,1059.55717341139,2022-09-17 00:00:00,2022-09-18 00:00:00 +179.773757702624,1055.2032691421,2022-09-18 00:00:00,2022-09-19 00:00:00 +178.751198400528,1056.51996616784,2022-09-19 00:00:00,2022-09-20 00:00:00 +179.702042859538,1059.09817102503,2022-09-20 00:00:00,2022-09-21 00:00:00 +184.762788705169,1059.34324799926,2022-09-21 00:00:00,2022-09-22 00:00:00 +174.617631422563,1061.1704145382,2022-09-22 00:00:00,2022-09-23 00:00:00 +203.361958024289,1052.06750975396,2022-09-23 00:00:00,2022-09-24 00:00:00 +176.188245244003,1061.91305910799,2022-09-24 00:00:00,2022-09-25 00:00:00 +176.885250862445,1061.38595234657,2022-09-25 00:00:00,2022-09-26 00:00:00 +182.591456321615,1051.30270485679,2022-09-26 00:00:00,2022-09-27 00:00:00 +177.284159234273,1040.48273920793,2022-09-27 00:00:00,2022-09-28 00:00:00 +181.551452114628,1041.27663679645,2022-09-28 00:00:00,2022-09-29 00:00:00 +178.218288099787,1044.97544285164,2022-09-29 00:00:00,2022-09-30 00:00:00 +183.494603407508,1060.68749945351,2022-09-30 00:00:00,2022-10-01 00:00:00 +180.456081038955,1044.53387422599,2022-10-01 00:00:00,2022-10-02 00:00:00 +181.291164756381,1045.11841243671,2022-10-02 00:00:00,2022-10-03 00:00:00 +177.672308026751,1053.54387087828,2022-10-03 00:00:00,2022-10-04 00:00:00 +185.227344844708,1052.02270506183,2022-10-04 00:00:00,2022-10-05 00:00:00 +176.980394632168,1049.26482554396,2022-10-05 00:00:00,2022-10-06 00:00:00 +174.429593653452,1044.95092200488,2022-10-06 00:00:00,2022-10-07 00:00:00 +180.258020882638,1055.56359574646,2022-10-07 00:00:00,2022-10-08 00:00:00 +180.56874204262,1042.41618208617,2022-10-08 00:00:00,2022-10-09 00:00:00 +174.167523721503,1059.32711260052,2022-10-09 00:00:00,2022-10-10 00:00:00 +183.687649646711,1057.89811116312,2022-10-10 00:00:00,2022-10-11 00:00:00 +172.562203906303,1055.23748621837,2022-10-11 00:00:00,2022-10-12 00:00:00 +180.422933714786,1061.35756354571,2022-10-12 00:00:00,2022-10-13 00:00:00 +187.533035302894,1060.44538635834,2022-10-13 00:00:00,2022-10-14 00:00:00 +182.437288169099,1039.12906379266,2022-10-14 00:00:00,2022-10-15 00:00:00 +177.981565962334,1055.81392718787,2022-10-15 00:00:00,2022-10-16 00:00:00 +182.528982554325,1059.70284628822,2022-10-16 00:00:00,2022-10-17 00:00:00 +172.213925376408,1053.8664722318,2022-10-17 00:00:00,2022-10-18 00:00:00 +183.195542638479,1060.64937020178,2022-10-18 00:00:00,2022-10-19 00:00:00 +189.119973645939,1060.42633636657,2022-10-19 00:00:00,2022-10-20 00:00:00 +176.579635702993,1057.36600747925,2022-10-20 00:00:00,2022-10-21 00:00:00 +172.719686109475,1061.51651495551,2022-10-21 00:00:00,2022-10-22 00:00:00 +214.537065878523,1055.82893786456,2022-10-22 00:00:00,2022-10-23 00:00:00 +172.460534285158,1046.88806235327,2022-10-23 00:00:00,2022-10-24 00:00:00 +225.431386949778,1055.6461104701,2022-10-24 00:00:00,2022-10-25 00:00:00 +173.075010869966,1062.00688704158,2022-10-25 00:00:00,2022-10-26 00:00:00 +172.104173051346,1059.42769838433,2022-10-26 00:00:00,2022-10-27 00:00:00 +182.214578465098,1056.11615385277,2022-10-27 00:00:00,2022-10-28 00:00:00 +175.145724056035,1048.45399455345,2022-10-28 00:00:00,2022-10-29 00:00:00 +203.99421403088,1055.84401923065,2022-10-29 00:00:00,2022-10-30 00:00:00 +182.637906898416,1058.84627218071,2022-10-30 00:00:00,2022-10-31 00:00:00 +174.016402744699,1062.1651062829,2022-10-31 00:00:00,2022-11-01 00:00:00 diff --git a/src/server/test/web/readingsLineMeterRangeRaw.js b/src/server/test/web/readingsLineMeterRangeRaw.js index 0bbf32303..f0ba5d230 100644 --- a/src/server/test/web/readingsLineMeterRangeRaw.js +++ b/src/server/test/web/readingsLineMeterRangeRaw.js @@ -183,9 +183,88 @@ mocha.describe('readings API', () => { // Add LR16 here - // Add LR17 here - - // Add LR22 here + mocha.it('LR17: range should have daily points for 15 minute reading intervals and raw units with +-inf start/end time & C as Widget with intercept & chained & reverse conversions', async () => { + const unitData = [ + { + // u6 + name: 'C', + identifier: '', + unitRepresent: Unit.unitRepresentType.RAW, + secInRate: 3600, + typeOfUnit: Unit.unitType.UNIT, + suffix: '', + displayable: Unit.displayableType.ALL, + preferredDisplay: true, + note: 'Celsius' + }, + { + // u7 + name: 'Degrees', + identifier: '', + unitRepresent: Unit.unitRepresentType.RAW, + secInRate: 3600, + typeOfUnit: Unit.unitType.METER, + suffix: '', + displayable: Unit.displayableType.NONE, + preferredDisplay: false, + note: 'special unit' + }, + { + // u8 + name: 'F', + identifier: '', + unitRepresent: Unit.unitRepresentType.RAW, + secInRate: 3600, + typeOfUnit: Unit.unitType.UNIT, + suffix: '', + displayable: Unit.displayableType.ALL, + preferredDisplay: false, + note: 'OED created standard unit' + }, + { + // u9 + name: 'Widget', + identifier: '', + unitRepresent: Unit.unitRepresentType.RAW, + secInRate: 3600, + typeOfUnit: Unit.unitType.UNIT, + suffix: '', + displayable: Unit.displayableType.ALL, + preferredDisplay: false, + note: 'fake unit' + } + ]; + const conversionData = [ + { + // c5 + sourceName: 'Degrees', + destinationName: 'C', + bidirectional: false, + slope: 1, + intercept: 0, + note: 'Degrees → C' + }, + { + // c8 + sourceName: 'F', + destinationName: 'C', + bidirectional: true, + slope: 1 / 1.8, + intercept: -32 / 1.8, + note: 'Fahrenheit → Celsius' + }, + { + // c10 + sourceName: 'Widget', + destinationName: 'F', + bidirectional: true, + slope: 0.2, + intercept: -0.6, + note: 'Fahrenheit → Widget' + } + ]; + //YOUR CODE START HERE! + }); mocha.it('LR22: range should have hourly points for middle readings of 15 minute for a 60 day period and raw units & C as F with intercept', async () => { const unitData = [ { From 78214a8e572119823eaa287896f10ed2a0e31862 Mon Sep 17 00:00:00 2001 From: Angel43ver Date: Wed, 20 May 2026 13:51:44 -0700 Subject: [PATCH 2/3] Fix: LR14 expected value --- .../test/web/readingsLineMeterRangeRaw.js | 86 +------------------ 1 file changed, 3 insertions(+), 83 deletions(-) diff --git a/src/server/test/web/readingsLineMeterRangeRaw.js b/src/server/test/web/readingsLineMeterRangeRaw.js index f0ba5d230..66696d66d 100644 --- a/src/server/test/web/readingsLineMeterRangeRaw.js +++ b/src/server/test/web/readingsLineMeterRangeRaw.js @@ -102,7 +102,7 @@ mocha.describe('readings API', () => { typeOfUnit: Unit.unitType.UNIT, suffix: '', displayable: Unit.displayableType.NONE, - preferredDisplay: false, + preferredDisplay: true, note: 'Celsius' }, { @@ -183,88 +183,8 @@ mocha.describe('readings API', () => { // Add LR16 here - mocha.it('LR17: range should have daily points for 15 minute reading intervals and raw units with +-inf start/end time & C as Widget with intercept & chained & reverse conversions', async () => { - const unitData = [ - { - // u6 - name: 'C', - identifier: '', - unitRepresent: Unit.unitRepresentType.RAW, - secInRate: 3600, - typeOfUnit: Unit.unitType.UNIT, - suffix: '', - displayable: Unit.displayableType.ALL, - preferredDisplay: true, - note: 'Celsius' - }, - { - // u7 - name: 'Degrees', - identifier: '', - unitRepresent: Unit.unitRepresentType.RAW, - secInRate: 3600, - typeOfUnit: Unit.unitType.METER, - suffix: '', - displayable: Unit.displayableType.NONE, - preferredDisplay: false, - note: 'special unit' - }, - { - // u8 - name: 'F', - identifier: '', - unitRepresent: Unit.unitRepresentType.RAW, - secInRate: 3600, - typeOfUnit: Unit.unitType.UNIT, - suffix: '', - displayable: Unit.displayableType.ALL, - preferredDisplay: false, - note: 'OED created standard unit' - }, - { - // u9 - name: 'Widget', - identifier: '', - unitRepresent: Unit.unitRepresentType.RAW, - secInRate: 3600, - typeOfUnit: Unit.unitType.UNIT, - suffix: '', - displayable: Unit.displayableType.ALL, - preferredDisplay: false, - note: 'fake unit' - } - ]; - const conversionData = [ - { - // c5 - sourceName: 'Degrees', - destinationName: 'C', - bidirectional: false, - slope: 1, - intercept: 0, - note: 'Degrees → C' - }, - { - // c8 - sourceName: 'F', - destinationName: 'C', - bidirectional: true, - slope: 1 / 1.8, - intercept: -32 / 1.8, - note: 'Fahrenheit → Celsius' - }, - { - // c10 - sourceName: 'Widget', - destinationName: 'F', - bidirectional: true, - slope: 0.2, - intercept: -0.6, - note: 'Fahrenheit → Widget' - } - ]; - //YOUR CODE START HERE! - }); + // Add LR17 here + mocha.it('LR22: range should have hourly points for middle readings of 15 minute for a 60 day period and raw units & C as F with intercept', async () => { const unitData = [ { From 00c1428254af9ee08933a34517acb76f73320443 Mon Sep 17 00:00:00 2001 From: Angel43v3r <167484241+Angel43v3r@users.noreply.github.com> Date: Wed, 20 May 2026 13:59:10 -0700 Subject: [PATCH 3/3] Delete src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv --- ...ge_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv | 76 ------------------- 1 file changed, 76 deletions(-) delete mode 100644 src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv diff --git a/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv b/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv deleted file mode 100644 index 8815e53db..000000000 --- a/src/server/test/web/readingsData/expected_line_range_ri_15_mu_C_gu_Widget_st_-inf_et_inf.csv +++ /dev/null @@ -1,76 +0,0 @@ -min,max,start time,end time -178.133336199489,1055.70198401992,2022-08-18 00:00:00,2022-08-19 00:00:00 -173.074406662956,1053.47855526476,2022-08-19 00:00:00,2022-08-20 00:00:00 -172.092478277259,1053.02105088731,2022-08-20 00:00:00,2022-08-21 00:00:00 -182.056695970023,1061.65238595875,2022-08-21 00:00:00,2022-08-22 00:00:00 -175.456061305352,1053.33344108767,2022-08-22 00:00:00,2022-08-23 00:00:00 -190.758358302563,1044.26441262712,2022-08-23 00:00:00,2022-08-24 00:00:00 -183.931789655338,1054.67287862863,2022-08-24 00:00:00,2022-08-25 00:00:00 -186.946050470548,1056.67716093124,2022-08-25 00:00:00,2022-08-26 00:00:00 -200.349541456801,1051.99549254363,2022-08-26 00:00:00,2022-08-27 00:00:00 -173.310321653095,1059.42627966237,2022-08-27 00:00:00,2022-08-28 00:00:00 -197.569578998162,1050.94709198928,2022-08-28 00:00:00,2022-08-29 00:00:00 -177.153761348177,1031.17766513776,2022-08-29 00:00:00,2022-08-30 00:00:00 -178.444467921651,1053.01860177283,2022-08-30 00:00:00,2022-08-31 00:00:00 -179.727377368246,1035.92322542535,2022-08-31 00:00:00,2022-09-01 00:00:00 -189.597838534925,1061.92098400231,2022-09-01 00:00:00,2022-09-02 00:00:00 -181.758656525344,1059.77585210563,2022-09-02 00:00:00,2022-09-03 00:00:00 -188.675075241147,1048.12541674532,2022-09-03 00:00:00,2022-09-04 00:00:00 -198.28462976871,1037.83485672982,2022-09-04 00:00:00,2022-09-05 00:00:00 -177.36250566118,1056.36701169939,2022-09-05 00:00:00,2022-09-06 00:00:00 -174.169724310138,1056.32983172468,2022-09-06 00:00:00,2022-09-07 00:00:00 -180.270035713662,1020.71041042774,2022-09-07 00:00:00,2022-09-08 00:00:00 -178.141622107933,1049.57964182566,2022-09-08 00:00:00,2022-09-09 00:00:00 -174.430602690676,1058.79931444633,2022-09-09 00:00:00,2022-09-10 00:00:00 -172.661663303709,1058.49080691405,2022-09-10 00:00:00,2022-09-11 00:00:00 -179.737175394399,1062.10175744307,2022-09-11 00:00:00,2022-09-12 00:00:00 -178.168649199153,1053.94591338892,2022-09-12 00:00:00,2022-09-13 00:00:00 -172.444969737089,1060.12012093921,2022-09-13 00:00:00,2022-09-14 00:00:00 -178.838432883916,1058.6266429243,2022-09-14 00:00:00,2022-09-15 00:00:00 -173.253180596726,1061.72392086282,2022-09-15 00:00:00,2022-09-16 00:00:00 -173.712760723002,1032.83359678473,2022-09-16 00:00:00,2022-09-17 00:00:00 -173.653344939233,1059.55717341139,2022-09-17 00:00:00,2022-09-18 00:00:00 -179.773757702624,1055.2032691421,2022-09-18 00:00:00,2022-09-19 00:00:00 -178.751198400528,1056.51996616784,2022-09-19 00:00:00,2022-09-20 00:00:00 -179.702042859538,1059.09817102503,2022-09-20 00:00:00,2022-09-21 00:00:00 -184.762788705169,1059.34324799926,2022-09-21 00:00:00,2022-09-22 00:00:00 -174.617631422563,1061.1704145382,2022-09-22 00:00:00,2022-09-23 00:00:00 -203.361958024289,1052.06750975396,2022-09-23 00:00:00,2022-09-24 00:00:00 -176.188245244003,1061.91305910799,2022-09-24 00:00:00,2022-09-25 00:00:00 -176.885250862445,1061.38595234657,2022-09-25 00:00:00,2022-09-26 00:00:00 -182.591456321615,1051.30270485679,2022-09-26 00:00:00,2022-09-27 00:00:00 -177.284159234273,1040.48273920793,2022-09-27 00:00:00,2022-09-28 00:00:00 -181.551452114628,1041.27663679645,2022-09-28 00:00:00,2022-09-29 00:00:00 -178.218288099787,1044.97544285164,2022-09-29 00:00:00,2022-09-30 00:00:00 -183.494603407508,1060.68749945351,2022-09-30 00:00:00,2022-10-01 00:00:00 -180.456081038955,1044.53387422599,2022-10-01 00:00:00,2022-10-02 00:00:00 -181.291164756381,1045.11841243671,2022-10-02 00:00:00,2022-10-03 00:00:00 -177.672308026751,1053.54387087828,2022-10-03 00:00:00,2022-10-04 00:00:00 -185.227344844708,1052.02270506183,2022-10-04 00:00:00,2022-10-05 00:00:00 -176.980394632168,1049.26482554396,2022-10-05 00:00:00,2022-10-06 00:00:00 -174.429593653452,1044.95092200488,2022-10-06 00:00:00,2022-10-07 00:00:00 -180.258020882638,1055.56359574646,2022-10-07 00:00:00,2022-10-08 00:00:00 -180.56874204262,1042.41618208617,2022-10-08 00:00:00,2022-10-09 00:00:00 -174.167523721503,1059.32711260052,2022-10-09 00:00:00,2022-10-10 00:00:00 -183.687649646711,1057.89811116312,2022-10-10 00:00:00,2022-10-11 00:00:00 -172.562203906303,1055.23748621837,2022-10-11 00:00:00,2022-10-12 00:00:00 -180.422933714786,1061.35756354571,2022-10-12 00:00:00,2022-10-13 00:00:00 -187.533035302894,1060.44538635834,2022-10-13 00:00:00,2022-10-14 00:00:00 -182.437288169099,1039.12906379266,2022-10-14 00:00:00,2022-10-15 00:00:00 -177.981565962334,1055.81392718787,2022-10-15 00:00:00,2022-10-16 00:00:00 -182.528982554325,1059.70284628822,2022-10-16 00:00:00,2022-10-17 00:00:00 -172.213925376408,1053.8664722318,2022-10-17 00:00:00,2022-10-18 00:00:00 -183.195542638479,1060.64937020178,2022-10-18 00:00:00,2022-10-19 00:00:00 -189.119973645939,1060.42633636657,2022-10-19 00:00:00,2022-10-20 00:00:00 -176.579635702993,1057.36600747925,2022-10-20 00:00:00,2022-10-21 00:00:00 -172.719686109475,1061.51651495551,2022-10-21 00:00:00,2022-10-22 00:00:00 -214.537065878523,1055.82893786456,2022-10-22 00:00:00,2022-10-23 00:00:00 -172.460534285158,1046.88806235327,2022-10-23 00:00:00,2022-10-24 00:00:00 -225.431386949778,1055.6461104701,2022-10-24 00:00:00,2022-10-25 00:00:00 -173.075010869966,1062.00688704158,2022-10-25 00:00:00,2022-10-26 00:00:00 -172.104173051346,1059.42769838433,2022-10-26 00:00:00,2022-10-27 00:00:00 -182.214578465098,1056.11615385277,2022-10-27 00:00:00,2022-10-28 00:00:00 -175.145724056035,1048.45399455345,2022-10-28 00:00:00,2022-10-29 00:00:00 -203.99421403088,1055.84401923065,2022-10-29 00:00:00,2022-10-30 00:00:00 -182.637906898416,1058.84627218071,2022-10-30 00:00:00,2022-10-31 00:00:00 -174.016402744699,1062.1651062829,2022-10-31 00:00:00,2022-11-01 00:00:00