Skip to content

Commit bbc95a3

Browse files
alexembreyalexembrey
authored
Merge V4.4.0 - New OMIT output options for Stocks and Flows
V4.4.0 - New OMIT output options for Stocks and Flows
2 parents e50d2eb + b9121c2 commit bbc95a3

15 files changed

+667
-160
lines changed

‎src/DataFeedViews/StockFlowOutputOptionsDataFeedView.Designer.cs‎

Lines changed: 196 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DataFeedViews/StockFlowOutputOptionsDataFeedView.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,20 @@ public override void LoadDataFeed(DataFeed dataFeed)
2424

2525
this.SetCheckBoxBinding(this.CheckBoxSummaryST, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_COLUMN_NAME);
2626
this.SetTextBoxBinding(this.TextBoxSummarySTTimesteps, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_TIMESTEPS_COLUMN_NAME);
27+
this.SetCheckBoxBinding(this.CheckBoxSTOmitSS, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_SS_COLUMN_NAME);
28+
this.SetCheckBoxBinding(this.CheckBoxSTOmitTS, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_TS_COLUMN_NAME);
29+
this.SetCheckBoxBinding(this.CheckBoxSTOmitSC, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_SC_COLUMN_NAME);
30+
2731
this.SetCheckBoxBinding(this.CheckBoxSummaryFL, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_COLUMN_NAME);
2832
this.SetTextBoxBinding(this.TextBoxSummaryFLTimesteps, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_TIMESTEPS_COLUMN_NAME);
33+
this.SetCheckBoxBinding(this.CheckBoxFLOmitSS, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_SS_COLUMN_NAME);
34+
this.SetCheckBoxBinding(this.CheckBoxFLOmitTS, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TS_COLUMN_NAME);
35+
this.SetCheckBoxBinding(this.CheckBoxFLOmitFromSC, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_FROM_SC_COLUMN_NAME);
36+
this.SetCheckBoxBinding(this.CheckBoxFLOmitFromST, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_FROM_ST_COLUMN_NAME);
37+
this.SetCheckBoxBinding(this.CheckBoxFLOmitTT, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TT_COLUMN_NAME);
38+
this.SetCheckBoxBinding(this.CheckBoxFLOmitToSC, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TO_SC_COLUMN_NAME);
39+
this.SetCheckBoxBinding(this.CheckBoxFLOmitToST, Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TO_ST_COLUMN_NAME);
40+
2941
this.SetCheckBoxBinding(this.CheckBoxSpatialST, Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_ST_COLUMN_NAME);
3042
this.SetTextBoxBinding(this.TextBoxSpatialSTTimesteps, Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_ST_TIMESTEPS_COLUMN_NAME);
3143
this.SetCheckBoxBinding(this.CheckBoxSpatialFL, Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_FL_COLUMN_NAME);
@@ -129,7 +141,6 @@ protected override void OnBoundCheckBoxChanged(System.Windows.Forms.CheckBox che
129141
this.SetTextBoxData(this.TextBoxAvgSpatialLFLTimesteps, DEFAULT_TIMESTEP_VALUE);
130142
}
131143

132-
133144
this.EnableControls();
134145
}
135146

@@ -159,6 +170,9 @@ private void EnableControls()
159170
this.CheckBoxAvgSpatialSTCumulative.Enabled = this.CheckBoxAvgSpatialST.Checked;
160171
this.CheckBoxAvgSpatialFLCumulative.Enabled = this.CheckBoxAvgSpatialFL.Checked;
161172
this.CheckBoxAvgSpatialLFLCumulative.Enabled = this.CheckBoxAvgSpatialLFL.Checked;
173+
this.CheckBoxSTOmitSS.Enabled = this.CheckBoxSummaryST.Checked;
174+
this.CheckBoxSTOmitTS.Enabled = this.CheckBoxSummaryST.Checked;
175+
this.CheckBoxSTOmitSC.Enabled = this.CheckBoxSummaryST.Checked;
162176
}
163177
}
164178
}

‎src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// by using the '*' as shown below:
3333
// <Assembly: AssemblyVersion("1.0.*")>
3434

35-
[assembly: AssemblyVersion("4.3.7.0")]
36-
[assembly: AssemblyFileVersion("4.3.7.0")]
35+
[assembly: AssemblyVersion("4.4.0.0")]
36+
[assembly: AssemblyFileVersion("4.4.0.0")]
3737
[assembly: NeutralResourcesLanguage("en-US")]
3838

3939

‎src/Reports/SummaryFlowReport.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ private string CreateReportQuery(bool isCSV)
117117
"LEFT JOIN stsim_SecondaryStratum AS SS2 ON SS2.SecondaryStratumId = stsim_OutputFlow.EndSecondaryStratumId " +
118118
"LEFT JOIN stsim_TertiaryStratum AS TS1 ON TS1.TertiaryStratumId = stsim_OutputFlow.FromTertiaryStratumId " +
119119
"LEFT JOIN stsim_TertiaryStratum AS TS2 ON TS2.TertiaryStratumId = stsim_OutputFlow.EndTertiaryStratumId " +
120-
"INNER JOIN stsim_StateClass AS SC1 ON SC1.StateClassId = stsim_OutputFlow.FromStateClassId " +
121-
"INNER JOIN stsim_StateClass AS SC2 ON SC2.StateClassId = stsim_OutputFlow.ToStateClassId " +
120+
"LEFT JOIN stsim_StateClass AS SC1 ON SC1.StateClassId = stsim_OutputFlow.FromStateClassId " +
121+
"LEFT JOIN stsim_StateClass AS SC2 ON SC2.StateClassId = stsim_OutputFlow.ToStateClassId " +
122122
"LEFT JOIN stsim_StateClass AS SC3 ON SC3.StateClassId = stsim_OutputFlow.EndStateClassId " +
123-
"INNER JOIN stsim_StockType AS STK1 ON STK1.StockTypeId = stsim_OutputFlow.FromStockTypeId " +
124-
"INNER JOIN stsim_StockType AS STK2 ON STK2.StockTypeId = stsim_OutputFlow.ToStockTypeId " +
123+
"LEFT JOIN stsim_StockType AS STK1 ON STK1.StockTypeId = stsim_OutputFlow.FromStockTypeId " +
124+
"LEFT JOIN stsim_StockType AS STK2 ON STK2.StockTypeId = stsim_OutputFlow.ToStockTypeId " +
125125
"INNER JOIN stsim_FlowGroup ON stsim_FlowGroup.FlowGroupId = stsim_OutputFlow.FlowGroupId " +
126126
"LEFT JOIN stsim_TransitionType ON stsim_TransitionType.TransitionTypeId = stsim_OutputFlow.TransitionTypeId " +
127127
"WHERE stsim_OutputFlow.ScenarioId IN ({0}) " +

‎src/Reports/SummaryStockReport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private string CreateReportQuery(bool isCSV)
9292
"INNER JOIN stsim_Stratum AS ST1 ON ST1.StratumId = stsim_OutputStock.StratumId " +
9393
"LEFT JOIN stsim_SecondaryStratum AS ST2 ON ST2.SecondaryStratumId = stsim_OutputStock.SecondaryStratumId " +
9494
"LEFT JOIN stsim_TertiaryStratum AS ST3 ON ST3.TertiaryStratumId = stsim_OutputStock.TertiaryStratumId " +
95-
"INNER JOIN stsim_StateClass AS SC1 ON SC1.StateClassId = stsim_OutputStock.StateClassId " +
95+
"LEFT JOIN stsim_StateClass AS SC1 ON SC1.StateClassId = stsim_OutputStock.StateClassId " +
9696
"INNER JOIN stsim_StockGroup ON stsim_StockGroup.StockGroupId = stsim_OutputStock.StockGroupId " +
9797
"WHERE stsim_OutputStock.ScenarioId IN ({0}) " +
9898
"ORDER BY " +

‎src/RuntimeSF/OutputFlow.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ internal class OutputFlow
88
private readonly int m_FromStratumId;
99
private readonly int? m_FromSecondaryStratumId;
1010
private readonly int? m_FromTertiaryStratumId;
11-
private readonly int m_FromStateClassId;
11+
private readonly int? m_FromStateClassId;
1212
private readonly int? m_FromStockTypeId;
1313
private readonly int? m_transitionTypeId;
1414
private readonly int m_ToStratumId;
15-
private readonly int m_ToStateClassId;
15+
private readonly int? m_ToStateClassId;
1616
private readonly int? m_ToStockTypeId;
1717
private readonly int m_FlowGroupId;
1818
private readonly int? m_TransferToStratumId;
@@ -26,11 +26,11 @@ public OutputFlow(
2626
int fromStratumId,
2727
int? fromSecondaryStratumId,
2828
int? fromTertiaryStratumId,
29-
int fromStateClassId,
29+
int? fromStateClassId,
3030
int? fromStockTypeId,
3131
int? transitionTypeId,
3232
int toStratumId,
33-
int toStateClassId,
33+
int? toStateClassId,
3434
int? toStockTypeId,
3535
int flowGroupId,
3636
int? transferToStratumId,
@@ -83,7 +83,7 @@ public int? FromTertiaryStratumId
8383
}
8484
}
8585

86-
public int FromStateClassId
86+
public int? FromStateClassId
8787
{
8888
get
8989
{
@@ -115,7 +115,7 @@ public int ToStratumId
115115
}
116116
}
117117

118-
public int ToStateClassId
118+
public int? ToStateClassId
119119
{
120120
get
121121
{

‎src/RuntimeSF/OutputFlowCollection.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ protected override FifteenIntegerLookupKey GetKeyForItem(OutputFlow item)
1818
item.FromStratumId,
1919
LookupKeyUtils.GetOutputCollectionKey(item.FromSecondaryStratumId),
2020
LookupKeyUtils.GetOutputCollectionKey(item.FromTertiaryStratumId),
21-
item.FromStateClassId,
21+
LookupKeyUtils.GetOutputCollectionKey(item.FromStateClassId),
2222
LookupKeyUtils.GetOutputCollectionKey(item.FromStockTypeId),
2323
LookupKeyUtils.GetOutputCollectionKey(item.TransitionTypeId),
24-
item.ToStratumId,
25-
item.ToStateClassId,
24+
item.ToStratumId,
25+
LookupKeyUtils.GetOutputCollectionKey(item.ToStateClassId),
2626
LookupKeyUtils.GetOutputCollectionKey(item.ToStockTypeId),
2727
item.FlowGroupId,
2828
LookupKeyUtils.GetOutputCollectionKey(item.TransferToStratumId),

‎src/RuntimeSF/OutputStock.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ internal class OutputStock
88
private readonly int m_StratumId;
99
private readonly int? m_SecondaryStratumId;
1010
private readonly int? m_TertiaryStratumId;
11-
private readonly int m_StateClassId;
11+
private readonly int? m_StateClassId;
1212
private readonly int m_StockGroupId;
1313
private double m_Amount;
1414

1515
public OutputStock(
1616
int stratumId,
1717
int? secondaryStratumId,
1818
int? tertiaryStratumId,
19-
int stateClassId,
19+
int? stateClassId,
2020
int stockGroupId,
2121
double amount)
2222
{
@@ -52,7 +52,7 @@ public int? TertiaryStratumId
5252
}
5353
}
5454

55-
public int StateClassId
55+
public int? StateClassId
5656
{
5757
get
5858
{

‎src/RuntimeSF/OutputStockCollection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ protected override FiveIntegerLookupKey GetKeyForItem(OutputStock item)
1616
return new FiveIntegerLookupKey(
1717
item.StratumId,
1818
LookupKeyUtils.GetOutputCollectionKey(item.SecondaryStratumId),
19-
LookupKeyUtils.GetOutputCollectionKey(item.TertiaryStratumId),
20-
item.StateClassId,
19+
LookupKeyUtils.GetOutputCollectionKey(item.TertiaryStratumId),
20+
LookupKeyUtils.GetOutputCollectionKey(item.StateClassId),
2121
item.StockGroupId);
2222
}
2323
}

‎src/RuntimeSF/StockFlowTransformer.Initialize.cs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,7 @@ internal partial class StockFlowTransformer
1919
private void InitializeSpatialRunFlag()
2020
{
2121
DataRow drrc = this.ResultScenario.GetDataSheet(Strings.DATASHEET_RUN_CONTROL_NAME).GetDataRow();
22-
this.m_IsSpatial = DataTableUtilities.GetDataBool(drrc["IsSpatial"]);
23-
}
24-
25-
/// <summary>
26-
/// Initializes the flags for controlling SecondaryStratum and TertiaryStratum output
27-
/// </summary>
28-
private void Initialize_SS_TS_Flags()
29-
{
30-
DataRow dr = this.ResultScenario.GetDataSheet(Strings.DATASHEET_OO_TABULAR_NAME).GetDataRow();
31-
32-
if (dr != null)
33-
{
34-
this.m_SummaryOmitSecondaryStrata = DataTableUtilities.GetDataBool(dr, "SummaryOutputOmitSS");
35-
this.m_SummaryOmitTertiaryStrata = DataTableUtilities.GetDataBool(dr, "SummaryOutputOmitTS");
36-
}
22+
this.m_IsSpatial = DataTableUtilities.GetDataBool(drrc[Strings.RUN_CONTROL_IS_SPATIAL_COLUMN_NAME]);
3723
}
3824

3925
/// <summary>
@@ -46,8 +32,8 @@ private void InitializeFlowOrderOptions()
4632

4733
if (dr != null)
4834
{
49-
this.m_ApplyBeforeTransitions = DataTableUtilities.GetDataBool(dr, "ApplyBeforeTransitions");
50-
this.m_ApplyEquallyRankedSimultaneously = DataTableUtilities.GetDataBool(dr, "ApplyEquallyRankedSimultaneously");
35+
this.m_ApplyBeforeTransitions = DataTableUtilities.GetDataBool(dr, Strings.DATASHEET_FLOW_ORDER_OPTIONS_ABT_COLUMN_NAME);
36+
this.m_ApplyEquallyRankedSimultaneously = DataTableUtilities.GetDataBool(dr, Strings.DATASHEET_FLOW_ORDER_OPTIONS_AERS_COLUMN_NAME);
5137
}
5238
}
5339

@@ -73,8 +59,20 @@ private void InitializeOutputOptions()
7359

7460
this.m_CreateSummaryStockOutput = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_COLUMN_NAME]);
7561
this.m_SummaryStockOutputTimesteps = SafeInt(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_TIMESTEPS_COLUMN_NAME]);
62+
this.m_STSummaryOmitSecondaryStrata = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_SS_COLUMN_NAME]);
63+
this.m_STSummaryOmitTertiaryStrata = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_TS_COLUMN_NAME]);
64+
this.m_STSummaryOmitStateClass = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_ST_OMIT_SC_COLUMN_NAME]);
65+
7666
this.m_CreateSummaryFlowOutput = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_COLUMN_NAME]);
7767
this.m_SummaryFlowOutputTimesteps = SafeInt(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_TIMESTEPS_COLUMN_NAME]);
68+
this.m_FLSummaryOmitSecondaryStrata = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_SS_COLUMN_NAME]);
69+
this.m_FLSummaryOmitTertiaryStrata = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TS_COLUMN_NAME]);
70+
this.m_FLSummaryOmitFromStateClass = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_FROM_SC_COLUMN_NAME]);
71+
this.m_FLSummaryOmitFromStockType = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_FROM_ST_COLUMN_NAME]);
72+
this.m_FLSummaryOmitTransitionType = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TT_COLUMN_NAME]);
73+
this.m_FLSummaryOmitToStateClass = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TO_SC_COLUMN_NAME]);
74+
this.m_FLSummaryOmitToStockType = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SUMMARY_OUTPUT_FL_OMIT_TO_ST_COLUMN_NAME]);
75+
7876
this.m_CreateSpatialStockOutput = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_ST_COLUMN_NAME]);
7977
this.m_SpatialStockOutputTimesteps = SafeInt(droo[Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_ST_TIMESTEPS_COLUMN_NAME]);
8078
this.m_CreateSpatialFlowOutput = DataTableUtilities.GetDataBool(droo[Strings.DATASHEET_STOCKFLOW_OO_SPATIAL_OUTPUT_FL_COLUMN_NAME]);

0 commit comments

Comments
 (0)