Skip to content

Commit

Permalink
Enable output for total damage
Browse files Browse the repository at this point in the history 
The output code for total damages was non functional and disabled.
  • Loading branch information
@davidanthoff
davidanthoff committed Sep 17, 2012
1 parent 0c49f36 commit 0a16134
Showing 1 changed file with 37 additions and 34 deletions.
71 changes: 37 additions & 34 deletions Fund/TotalDamage.cs
View file
Expand Up @@ -60,31 +60,31 @@ public void WriteAggregateDamage(int RunId, int WeightingschemeId, double Damage

}

//public void WriteDamage(int RunId, Damage i_Damage, int WeightingschemeId, double Weight, WeightingCombination[] WeightingCombinations)
//{
// if (m_YearRegionSectorWeightingSchemeCsv != null)
// {
// m_YearRegionSectorWeightingSchemeCsv.WriteLine(
// (_run.OutputVerbal ? _run.Scenario.Name : _run.Scenario.Id.ToString()) +
// ";" +
// (_run.OutputVerbal ? (RunId == 0 ? "Best guess" : RunId == -1 ? "Mean" : RunId.ToString()) : RunId.ToString()) +
// ";" +
// "" +
// ";" +
// "" +
// ";" +
// (i_Damage.Year + 1950).ToString() +
// ";" +
// (_run.OutputVerbal ? LegacyRegionNames.GetName(i_Damage.Region) : i_Damage.Region.ToString()) +
// ";" +
// (_run.OutputVerbal ? Enum.GetName(typeof(Sector), i_Damage.Sector) : ((int)i_Damage.Sector).ToString()) +
// ";" +
// (_run.OutputVerbal ? WeightingCombinations[WeightingschemeId].Name : WeightingschemeId.ToString()) +
// ";" +
// (i_Damage.DamageValue * Weight).ToString("f15")
// );
// }
//}
public void WriteDamage(int RunId, Damage i_Damage, int WeightingschemeId, double Weight, WeightingCombination[] WeightingCombinations)
{
if (m_YearRegionSectorWeightingSchemeCsv != null)
{
m_YearRegionSectorWeightingSchemeCsv.WriteLine(
(_run.OutputVerbal ? _run.Scenario.Name : _run.Scenario.Id.ToString()) +
";" +
(_run.OutputVerbal ? (RunId == 0 ? "Best guess" : RunId == -1 ? "Mean" : RunId.ToString()) : RunId.ToString()) +
";" +
"" +
";" +
"" +
";" +
(i_Damage.Year + 1950).ToString() +
";" +
(_run.OutputVerbal ? i_Damage.Region.ToString() : i_Damage.Region.ToString()) +
";" +
(_run.OutputVerbal ? Enum.GetName(typeof(Sector), i_Damage.Sector) : ((int)i_Damage.Sector).ToString()) +
";" +
(_run.OutputVerbal ? WeightingCombinations[WeightingschemeId].Name : WeightingschemeId.ToString()) +
";" +
(i_Damage.DamageValue * Weight).ToString("f15")
);
}
}

public TotalDamage(Run runData, string outputPath, Parameters parameters, Timestep emissionYear, Random rand = null)
{
Expand Down Expand Up @@ -158,15 +158,18 @@ public void DoOneRun(int RunId, WeightingCombination[] i_weightingCombinations,

}

//for (int l = 0; l < i_output1.Damages.Count; l++)
//{
// i_Damage = i_output1.Damages[l];
// if ((i_Damage.Year >= _emissionYear.Value) && (i_Damage.Year < _emissionYear.Value + _run.YearsToAggregate))
// {
// for (int k = 0; k < i_weightingCombinations.Length; k++)
// WriteDamage(RunId, i_Damage, k, i_weightingCombinations[k][i_Damage.Year, i_Damage.Region], i_weightingCombinations);
// }
//}
if (m_YearRegionSectorWeightingSchemeCsv != null)
{

foreach (var i_Damage in i_output1.Damages)
{
if ((i_Damage.Year >= _emissionYear.Value) && (i_Damage.Year < _emissionYear.Value + _run.YearsToAggregate))
{
for (int k = 0; k < i_weightingCombinations.Length; k++)
WriteDamage(RunId, i_Damage, k, i_weightingCombinations[k][i_Damage.Year, i_Damage.Region], i_weightingCombinations);
}
}
}
}

}
Expand Down

0 comments on commit 0a16134

Please sign in to comment.