Skip to content

Commit

Permalink
Upgrading version and fixing small bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielaServidone committed Feb 13, 2023
1 parent cda40b1 commit d8e175e
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DemandForecasting.aimms
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<References AIMMS_Version="4.88.5.1 (x64)">
<References AIMMS_Version="4.91.5.4 (x64)">
<MainProject Path="MainProject" />
<Library System="true" Path="AimmsPro" />
<Library System="true" Path="AimmsWebUI" />
Expand Down
25 changes: 19 additions & 6 deletions MainProject/DemandForecasting.ams
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ Model Main_DemandForecasting {
Parameter p_estimateExponentialSmoothing {
IndexDomain: i_day;
}
Parameter p_alphaExponentialSmoothing;
Parameter p_alphaExponentialSmoothing {
InitialData: 0;
}
Parameter p_bin_useAutomaticTrendExponentialSmoothing {
Range: binary;
InitialData: 1;
Expand Down Expand Up @@ -125,8 +127,12 @@ Model Main_DemandForecasting {
Parameter p_estimateExponentialSmoothingTrend {
IndexDomain: i_day;
}
Parameter p_alphaExponentialSmoothingTrend;
Parameter p_betaExponentialSmoothingTrend;
Parameter p_alphaExponentialSmoothingTrend {
InitialData: 0;
}
Parameter p_betaExponentialSmoothingTrend {
InitialData: 0;
}
Parameter p_bin_useAutomaticTrendExponentialSmoothingTrend {
Range: binary;
InitialData: 1;
Expand Down Expand Up @@ -172,9 +178,15 @@ Model Main_DemandForecasting {
Parameter p_estimateExponentialSmoothingTrendSeasonality {
IndexDomain: i_day;
}
Parameter p_alphaExponentialSmoothingTrendSeasonality;
Parameter p_betaExponentialSmoothingTrendSeasonality;
Parameter p_gammaExponentialSmoothingTrendSeasonality;
Parameter p_alphaExponentialSmoothingTrendSeasonality {
InitialData: 0;
}
Parameter p_betaExponentialSmoothingTrendSeasonality {
InitialData: 0;
}
Parameter p_gammaExponentialSmoothingTrendSeasonality {
InitialData: 0;
}
Parameter p_bin_useAutomaticTrendExponentialSmoothingTrendSeasonality {
Range: binary;
InitialData: 1;
Expand Down Expand Up @@ -243,6 +255,7 @@ Model Main_DemandForecasting {
IndexDomain: i_day;
}
Set s_def_weights {
SubsetOf: Integers;
Index: i_wg;
Definition: {
{1..p_numberOfWeights}
Expand Down
1 change: 0 additions & 1 deletion MainProject/DemandForecasting.nch
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
* The timestamps in this namechange file are stored in Coordinated universal time (UTC).
"Main_KnapsackWebUIApp" "Main_CarSelection" "2022-05-20 15:56:00"
"Section_1" "Data_Model" "2022-05-20 18:35:17"
"Main_CarSelection" "Main_ContractAllocation" "2022-05-30 15:46:13"
"d" "i_day" "2022-09-15 18:04:59"
Expand Down
2 changes: 1 addition & 1 deletion MainProject/Project.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<Project AimmsVersion="4.88.5.1 unicode x64" ProjectUUID="F8A29558-2CFD-43C6-BD03-CB304C7E812C">
<Project AimmsVersion="4.91.5.4 unicode x64" ProjectUUID="F8A29558-2CFD-43C6-BD03-CB304C7E812C">
<ModelFileName>DemandForecasting.ams</ModelFileName>
<AutoSaveAndBackup>
<DataBackup AtRegularInterval="true" EveryNMinutes="15" NumBackupsDatedToday="3" NumDaysBeforeToday="3" />
Expand Down
2 changes: 1 addition & 1 deletion MainProject/WebUI/webui.json
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@
"action": {
"literal": {
"type": "procedure",
"value": "pr_exampleExponentialSmoothingTrendSeasonality"
"value": "pr_exampleMovingAverage"
}
},
"aimms.widget.type": {
Expand Down

0 comments on commit d8e175e

Please sign in to comment.