Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup code for issue 1226 #1452

Merged
merged 2 commits into from
Feb 12, 2024
Merged

cleanup code for issue 1226 #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa11831
cleanup code for issue 1226
rmroot Feb 12, 2024
21c53ae
cleanup code for issue 1226
rmroot Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/calculations/analysis-calculations/annualAccountAnalysisSummaryClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export class AnnualAccountAnalysisSummaryClass {
year: summaryDataClass.year,
energyUse: summaryDataClass.energyUse,
modeledEnergy: summaryDataClass.modeledEnergy,
// adjustementForNormalization: summaryDataClass.adjustementForNormalization,
adjusted: summaryDataClass.adjusted,
baselineAdjustmentForNormalization: summaryDataClass.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataClass.baselineAdjustmentForOtherV2,
Expand Down
20 changes: 0 additions & 20 deletions src/app/calculations/analysis-calculations/annualAnalysisSummaryDataClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export class AnnualAnalysisSummaryDataClass {
year: number;
energyUse: number;
modeledEnergy: number;
// adjustedForNormalization: number;
adjusted: number;
baselineAdjustmentForNormalization: number;
baselineAdjustmentForOtherV2: number;
Expand Down Expand Up @@ -38,7 +37,6 @@ export class AnnualAnalysisSummaryDataClass {
modelYearDataAdjustment: number;
//adjustment corresponding to the current year
dataAdjustment: number;
// adjustementForNormalization: number;
adjustmentForOther: number;
baselineAdjustmentInput: number;
constructor(
Expand All @@ -56,16 +54,13 @@ export class AnnualAnalysisSummaryDataClass {
this.setBaselineEnergyUse(previousYearsSummaryData);
this.setBaselineModeledEnergy(previousYearsSummaryData);
this.setBaselineAdjustmentInput()
// this.setAdjustedForNormalization();
// this.setBaselineAdjustmentForOther();
this.setModelYearDataAdjustment();
this.setDataAdjustment();
this.setAdjustedStar();
this.setAdjustedStarStar();
this.setAdjusted();
this.setAdjustmentForOther();
this.setBaselineAdjustmentForOtherV2();
// this.setAdjustmentForNormalization();
this.setBaselineAdjustmentForNormalization(previousYearsSummaryData);
this.setBaselineAdjustment(previousYearsSummaryData);
this.setSEnPI();
Expand Down Expand Up @@ -111,21 +106,13 @@ export class AnnualAnalysisSummaryDataClass {
}
}

// setAdjustedForNormalization() {
// this.adjustedForNormalization = this.modeledEnergy + this.baselineEnergyUse - this.baselineModeledEnergyUse;
// }

setBaselineAdjustmentInput() {
this.baselineAdjustmentInput = _.sumBy(this.yearAnalysisSummaryData, (data: MonthlyAnalysisSummaryData) => {
return data.baselineAdjustmentInput;
})
}


setBaselineAdjustmentForOtherV2() {
// this.baselineAdjustmentForOther = _.sumBy(this.yearAnalysisSummaryData, (data: MonthlyAnalysisSummaryData) => {
// return data.baselineAdjustmentForOther;
// })
this.baselineAdjustmentForOtherV2 = this.adjustedStarStar - this.adjustedStar;
}

Expand All @@ -141,13 +128,6 @@ export class AnnualAnalysisSummaryDataClass {
});
}

// setAdjustmentForNormalization() {
// this.adjustementForNormalization = this.adjustedStar - (this.baselineEnergyUse + this.baselineAdjustmentForOther);
// if ((this.adjustementForNormalization > 0 && this.adjustementForNormalization < 0.00001) || (this.adjustementForNormalization < 0 && this.adjustementForNormalization > -0.00001)) {
// this.adjustementForNormalization = 0;
// }
// }

setBaselineAdjustmentForNormalization(previousYearsSummaryData: Array<AnnualAnalysisSummaryDataClass>) {
if (previousYearsSummaryData.length != 0) {
this.baselineAdjustmentForNormalization = this.adjustedStar - (this.baselineEnergyUse + this.baselineAdjustmentInput);
Expand Down
1 change: 0 additions & 1 deletion src/app/calculations/analysis-calculations/annualFacilityAnalysisSummaryClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export class AnnualFacilityAnalysisSummaryClass {
year: summaryDataClass.year,
energyUse: summaryDataClass.energyUse,
modeledEnergy: summaryDataClass.modeledEnergy,
// adjustementForNormalization: summaryDataClass.adjustementForNormalization,
adjusted: summaryDataClass.adjusted,
baselineAdjustmentForNormalization: summaryDataClass.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataClass.baselineAdjustmentForOtherV2,
Expand Down
1 change: 0 additions & 1 deletion src/app/calculations/analysis-calculations/annualGroupAnalysisSummaryClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export class AnnualGroupAnalysisSummaryClass {
year: summaryDataClass.year,
energyUse: summaryDataClass.energyUse,
modeledEnergy: summaryDataClass.modeledEnergy,
// adjustementForNormalization: summaryDataClass.adjustementForNormalization,
adjusted: summaryDataClass.adjusted,
baselineAdjustmentForNormalization: summaryDataClass.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataClass.baselineAdjustmentForOtherV2,
Expand Down
2 changes: 0 additions & 2 deletions src/app/calculations/analysis-calculations/monthlyAccountAnalysisClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,10 @@ export class MonthlyAccountAnalysisClass {
date: summaryDataItem.date,
energyUse: summaryDataItem.energyUse,
modeledEnergy: summaryDataItem.modeledEnergy,
// adjustementForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.adjustementForNormalization,
adjusted: summaryDataItem.monthlyAnalysisCalculatedValues.adjusted,
baselineAdjustmentForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForOtherV2,
baselineAdjustment: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustment,
// predictorUsage: summaryDataItem.predictorUsage,
fiscalYear: summaryDataItem.fiscalYear,
group: undefined,
SEnPI: checkAnalysisValue(summaryDataItem.monthlyAnalysisCalculatedValues.SEnPI),
Expand Down
4 changes: 1 addition & 3 deletions src/app/calculations/analysis-calculations/monthlyAccountAnalysisDataClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import { MonthlyAnalysisCalculatedValues } from "./monthlyAnalysisCalculatedValu
import { MonthlyAnalysisSummaryDataClass } from "./monthlyAnalysisSummaryDataClass";
import * as _ from 'lodash';
import { getFiscalYear } from "../shared-calculations/calanderizationFunctions";
import { MonthlyAnalysisSummaryData } from "src/app/models/analysis";
export class MonthlyAccountAnalysisDataClass {


export class MonthlyAccountAnalysisDataClass {
date: Date;
energyUse: number;
modeledEnergy: number;
Expand Down
32 changes: 1 addition & 31 deletions src/app/calculations/analysis-calculations/monthlyAnalysisCalculatedValuesClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export class MonthlyAnalysisCalculatedValues {
//results
energyUse: number;
modeledEnergy: number;
// adjustedForNormalization: number;
adjusted: number;
baselineAdjustmentForNormalization: number;
baselineAdjustment: number;
Expand All @@ -29,7 +28,6 @@ export class MonthlyAnalysisCalculatedValues {

adjustedStar: number;
adjustedStarStar: number;
// adjustementForNormalization: number;
baselineAdjustmentForOtherV2: number;
constructor(
energyUse: number,
Expand All @@ -50,11 +48,9 @@ export class MonthlyAnalysisCalculatedValues {
this.setYearToDateModeledEnergyUse();
this.setYearToDateActualEnergyUse();
this.setBaselineModeledEnergyUse(baselineYear, previousMonthValues);
// this.setAdjustedForNormalization(baselineActualEnergyUse);
this.setAdjustedStar(baselineActualEnergyUse, modelYearDataAdjusted, baselineAdjustementInput);
this.setAdjustedStarStar(dataAdjustment);
this.setAdjusted();
// this.setAdjustmentForNormalization(baselineActualEnergyUse, baselineAdjustmentForOther);
this.setBaselineAdjustmentForNormalization(baselineActualEnergyUse, baselineAdjustementInput);
this.setBaselineAdjustmentForOtherV2();
this.setBaselineAdjustment();
Expand Down Expand Up @@ -116,22 +112,8 @@ export class MonthlyAnalysisCalculatedValues {
this.yearToDateBaselineModeledEnergyUse = this.yearToDateBaselineModeledEnergyUse + this.baselineModeledEnergyUse;
}

// setAdjustedForNormalization(baselineActualEnergyUse: number) {
// this.adjustedForNormalization = this.modeledEnergy + baselineActualEnergyUse - this.baselineModeledEnergyUse;
// }

setAdjustedStar(baselineActualEnergyUse: number, modelYearDataAdjustment: number, baselineAdjustementInput: number) {
this.adjustedStar = (baselineActualEnergyUse + baselineAdjustementInput) * ((this.modeledEnergy - modelYearDataAdjustment) / (baselineActualEnergyUse - modelYearDataAdjustment));
if(this.fiscalYear == 2018){
// console.log('baselineActualEnergyUse:' + baselineActualEnergyUse);
// console.log('baselineAdjustementInput:' + baselineAdjustementInput);
// console.log('modeledEnergy:' + this.modeledEnergy);
// console.log('modelYearDataAdjustment:' + modelYearDataAdjustment);
// console.log('baselineActualEnergyUse:' + baselineActualEnergyUse);
// console.log('modelYearDataAdjustment:' + modelYearDataAdjustment);
// console.log(this.adjustedStar);
// console.log('=====');
}
}

setAdjustedStarStar(dataAdjustment: number) {
Expand Down Expand Up @@ -168,19 +150,9 @@ export class MonthlyAnalysisCalculatedValues {
}
}

// setAdjustmentForNormalization(baselineActualEnergyUse: number, baselineAdjustmentForOther: number) {
// this.adjustementForNormalization = this.adjustedStar - (baselineActualEnergyUse + baselineAdjustmentForOther);
// if ((this.adjustementForNormalization > 0 && this.adjustementForNormalization < 0.00001) || (this.adjustementForNormalization < 0 && this.adjustementForNormalization > -0.00001)) {
// this.adjustementForNormalization = 0;
// }
// }

setBaselineAdjustmentForNormalization(baselineActualEnergyUse: number, baselineAdjustementInput: number) {
if (this.summaryDataIndex >= 11) {
this.baselineAdjustmentForNormalization = this.adjustedStar - (baselineActualEnergyUse + baselineAdjustementInput);
// if ((this.baselineAdjustmentForNormalization > 0 && this.baselineAdjustmentForNormalization < 0.00001) || (this.baselineAdjustmentForNormalization < 0 && this.baselineAdjustmentForNormalization > -0.00001)) {
// this.baselineAdjustmentForNormalization = 0;
// }
} else {
this.baselineAdjustmentForNormalization = 0;
}
Expand All @@ -189,9 +161,6 @@ export class MonthlyAnalysisCalculatedValues {
setBaselineAdjustment() {
if (this.summaryDataIndex >= 11) {
this.baselineAdjustment = this.baselineAdjustmentForNormalization + this.baselineAdjustmentForOtherV2;
// if ((this.baselineAdjustment > 0 && this.baselineAdjustment < 0.00001) || (this.baselineAdjustment < 0 && this.baselineAdjustment > -0.00001)) {
// this.baselineAdjustment = 0;
// }
} else {
this.baselineAdjustment = 0;
}
Expand Down Expand Up @@ -219,6 +188,7 @@ export class MonthlyAnalysisCalculatedValues {
this.energyUse = new ConvertValue(this.energyUse, startingUnit, endingUnit).convertedValue;
this.modeledEnergy = new ConvertValue(this.modeledEnergy, startingUnit, endingUnit).convertedValue;
this.baselineAdjustmentForNormalization = new ConvertValue(this.baselineAdjustmentForNormalization, startingUnit, endingUnit).convertedValue;
this.baselineAdjustmentForOtherV2 = new ConvertValue(this.baselineAdjustmentForOtherV2, startingUnit, endingUnit).convertedValue;
this.adjusted = new ConvertValue(this.adjusted, startingUnit, endingUnit).convertedValue;
this.baselineAdjustment = new ConvertValue(this.baselineAdjustment, startingUnit, endingUnit).convertedValue;
this.savings = new ConvertValue(this.savings, startingUnit, endingUnit).convertedValue;
Expand Down
2 changes: 0 additions & 2 deletions src/app/calculations/analysis-calculations/monthlyAnalysisSummaryClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export class MonthlyAnalysisSummaryClass {
this.monthlyAnalysisSummaryData = new Array();
let baselineDate: Date = new Date(this.monthlyGroupAnalysisClass.baselineDate);
while (baselineDate < this.monthlyGroupAnalysisClass.endDate) {
// let monthlyanalysisSummaryDataCopy: Array<MonthlyAnalysisSummaryDataClass> = JSON.parse(JSON.stringify(this.monthlyAnalysisSummaryData))
let monthlyAnalysisSummaryDataClass: MonthlyAnalysisSummaryDataClass = new MonthlyAnalysisSummaryDataClass(this.monthlyGroupAnalysisClass, baselineDate, this.monthlyAnalysisSummaryData)
this.monthlyAnalysisSummaryData.push(monthlyAnalysisSummaryDataClass);
let currentMonth: number = baselineDate.getUTCMonth()
Expand All @@ -44,7 +43,6 @@ export class MonthlyAnalysisSummaryClass {
date: summaryDataItem.date,
energyUse: summaryDataItem.energyUse,
modeledEnergy: summaryDataItem.modeledEnergy,
// adjustementForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.adjustementForNormalization,
adjusted: summaryDataItem.monthlyAnalysisCalculatedValues.adjusted,
baselineAdjustmentForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForOtherV2,
Expand Down
1 change: 0 additions & 1 deletion src/app/calculations/analysis-calculations/monthlyFacilityAnalysisClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export class MonthlyFacilityAnalysisClass {
date: summaryDataItem.date,
energyUse: summaryDataItem.energyUse,
modeledEnergy: summaryDataItem.modeledEnergy,
// adjustementForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.adjustementForNormalization,
adjusted: summaryDataItem.monthlyAnalysisCalculatedValues.adjusted,
baselineAdjustmentForNormalization: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForNormalization,
baselineAdjustmentForOtherV2: summaryDataItem.monthlyAnalysisCalculatedValues.baselineAdjustmentForOtherV2,
Expand Down
2 changes: 1 addition & 1 deletion src/app/calculations/analysis-calculations/monthlyGroupAnalysisClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class MonthlyGroupAnalysisClass {

setAnnualMeterDataUsage() {
this.annualMeterDataUsage = new Array();
for (let year = this.baselineYear + 1; year <= this.endDate.getUTCFullYear(); year++) {
for (let year = this.baselineYear; year <= this.endDate.getUTCFullYear(); year++) {
let yearMeterData: Array<MonthlyData> = this.groupMonthlyData.filter(data => { return data.year == year });
if (this.analysisItem.analysisCategory == 'energy') {
let totalUsage: number = _.sumBy(yearMeterData, (data: MonthlyData) => { return data.energyUse });
Expand Down
1 change: 0 additions & 1 deletion src/app/facility/analysis/analysis.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export class AnalysisService {
energy: true,
actualEnergy: true,
modeledEnergy: true,
adjustedForNormalization: true,
adjusted: true,
baselineAdjustmentForNormalization: true,
baselineAdjustmentForOther: true,
Expand Down
3 changes: 1 addition & 2 deletions .../run-analysis/group-analysis/annual-analysis-summary/annual-analysis-summary.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class AnnualAnalysisSummaryComponent implements OnInit {
let facilityMeterData: Array<IdbUtilityMeterData> = this.utilityMeterDataDbService.facilityMeterData.getValue();
let accountPredictorEntries: Array<IdbPredictorEntry> = this.predictorDbService.accountPredictorEntries.getValue();

if (typeof Worker !== 'undefined' && false) {
if (typeof Worker !== 'undefined') {
this.worker = new Worker(new URL('src/app/web-workers/annual-group-analysis.worker', import.meta.url));
this.worker.onmessage = ({ data }) => {
if (!data.error) {
Expand All @@ -67,7 +67,6 @@ export class AnnualAnalysisSummaryComponent implements OnInit {
let calanderizedMeters: Array<CalanderizedMeter> = getCalanderizedMeterData(facilityMeters, facilityMeterData, this.facility, false, { energyIsSource: this.analysisItem.energyIsSource, neededUnits: getNeededUnits(this.analysisItem) });
let annualAnalysisSummaryClass: AnnualGroupAnalysisSummaryClass = new AnnualGroupAnalysisSummaryClass(this.group, this.analysisItem, this.facility, calanderizedMeters, accountPredictorEntries);
this.annualAnalysisSummary = annualAnalysisSummaryClass.getAnnualAnalysisSummaries();
console.log(this.annualAnalysisSummary);
this.calculating = false;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/app/models/analysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ export interface AnalysisTableColumns {
energy: boolean,
actualEnergy: boolean,
modeledEnergy: boolean,
adjustedForNormalization: boolean,
adjusted: boolean,
baselineAdjustmentForNormalization: boolean,
baselineAdjustmentForOther: boolean,
Expand Down
7 changes: 0 additions & 7 deletions ...hared-analysis/analysis-summary-table-filter/analysis-summary-table-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@
[(ngModel)]="analysisTableColumns.modeledEnergy" (change)="save()" id="modeledEnergy">
<label class="form-check-label" for="modeledEnergy">{{modeledUseLabel}}</label>
</div>
<!-- <div class="form-check">
<input class="form-check-input" type="checkbox" name="adjustedForNormalization"
[(ngModel)]="analysisTableColumns.adjustedForNormalization" (change)="save()"
id="adjustedForNormalization">
<label class="form-check-label" for="adjustedForNormalization">Adjusted for
Normalization</label>
</div> -->
<div class="form-check">
<input class="form-check-input" type="checkbox" name="adjusted"
[(ngModel)]="analysisTableColumns.adjusted" (change)="save()" id="adjusted">
Expand Down
4 changes: 0 additions & 4 deletions .../shared-analysis/analysis-summary-table-filter/analysis-summary-table-filter.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ export class AnalysisSummaryTableFilterComponent implements OnInit {
if (this.analysisTableColumns.energy == false) {
this.analysisTableColumns.actualEnergy = false;
this.analysisTableColumns.modeledEnergy = false;
this.analysisTableColumns.adjustedForNormalization = false;
this.analysisTableColumns.adjusted = false;
this.analysisTableColumns.baselineAdjustmentForNormalization = false;
this.analysisTableColumns.baselineAdjustmentForOther = false;
this.analysisTableColumns.baselineAdjustment = false;
} else {
this.analysisTableColumns.actualEnergy = true;
this.analysisTableColumns.modeledEnergy = true;
this.analysisTableColumns.adjustedForNormalization = true;
this.analysisTableColumns.adjusted = true;
this.analysisTableColumns.baselineAdjustmentForNormalization = true;
this.analysisTableColumns.baselineAdjustmentForOther = true;
Expand Down Expand Up @@ -101,7 +99,6 @@ export class AnalysisSummaryTableFilterComponent implements OnInit {
setEnergyColumns() {
this.analysisTableColumns.energy = (this.analysisTableColumns.actualEnergy
|| this.analysisTableColumns.modeledEnergy
|| this.analysisTableColumns.adjustedForNormalization
|| this.analysisTableColumns.adjusted
|| this.analysisTableColumns.baselineAdjustmentForNormalization
|| this.analysisTableColumns.baselineAdjustmentForOther
Expand Down Expand Up @@ -203,7 +200,6 @@ export class AnalysisSummaryTableFilterComponent implements OnInit {
this.analysisTableColumns.energy = true;
this.analysisTableColumns.actualEnergy = true;
this.analysisTableColumns.modeledEnergy = true;
this.analysisTableColumns.adjustedForNormalization = true;
this.analysisTableColumns.adjusted = true;
this.analysisTableColumns.baselineAdjustmentForNormalization = true;
this.analysisTableColumns.baselineAdjustmentForOther = true;
Expand Down
Loading
Loading