Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieCollection.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieCollection.cs	(.../TimeSerieCollection.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieCollection.cs	(.../TimeSerieCollection.cs)	(revision 4000)
@@ -28,10 +28,9 @@
 {
     public class TimeSerieCollection
     {
-
         public TimeSerieCollection()
         {
-            this.Series = new List<TimeSerie>();
+            Series = new List<TimeSerie>();
         }
 
         public List<TimeSerie> Series { get; set; }
@@ -46,9 +45,9 @@
         /// <param name="function">The function to apply to each entry</param>
         public void UpdateAllEntryValues(string parameterId, Func<double, double> function)
         {
-            foreach (var timeSerie in this.GetSeriesByParameterId(parameterId))
+            foreach (TimeSerie timeSerie in GetSeriesByParameterId(parameterId))
             {
-                foreach (var sourceEntry in timeSerie.Entries)
+                foreach (TimeSerieEntry sourceEntry in timeSerie.Entries)
                 {
                     if (!sourceEntry.Value.AlmostEquals(timeSerie.MissVal))
                     {
@@ -63,9 +62,9 @@
         /// </summary>
         public IEnumerable<TimeSerie> Map(IEnumerable<string> locations, string parameterId, IEnumerable<Func<TimeSerie, TimeSerie>> functionList)
         {
-            return from locationId in locations 
-                   from timeSerie in this.GetSeriesByLocationId(locationId).Where(x => x.ParameterId.Equals(parameterId)) 
-                   from function in functionList 
+            return from locationId in locations
+                   from timeSerie in GetSeriesByLocationId(locationId).Where(x => x.ParameterId.Equals(parameterId))
+                   from function in functionList
                    select function(timeSerie);
         }
 
@@ -78,15 +77,21 @@
         /// <returns>A sequence of new time series with the applied function to its entries</returns>
         public IEnumerable<TimeSerie> Map(IEnumerable<string> locations, string parameterId, Func<TimeSerie, TimeSerie> function)
         {
-            return Map(locations, parameterId, new List<Func<TimeSerie, TimeSerie>> { function });
+            return Map(locations, parameterId, new List<Func<TimeSerie, TimeSerie>>
+            {
+                function
+            });
         }
 
         /// <summary>
         /// Creates a shallow copy of the current time serie collection and applies the map function to each of its entries
         /// </summary>
         public IEnumerable<TimeSerie> Map(string locationId, string parameterId, Func<TimeSerie, TimeSerie> function)
         {
-            return Map(new List<string> { locationId }, parameterId, function);
+            return Map(new List<string>
+            {
+                locationId
+            }, parameterId, function);
         }
 
         /// <summary>
@@ -97,7 +102,7 @@
         /// <returns>The time series matching the criterium</returns>
         public TimeSerie FindSerie(string parameterId, string locationId)
         {
-            return (from series in this.Series
+            return (from series in Series
                     where series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase) &&
                           series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase)
                     select series).SingleOrDefault();
@@ -110,7 +115,7 @@
         /// <returns>The time series matching the criteria</returns>
         public IEnumerable<TimeSerie> GetSeriesByParameterId(string parameterId)
         {
-            return from series in this.Series
+            return from series in Series
                    where series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase)
                    select series;
         }
@@ -122,12 +127,11 @@
         /// <returns>The time series matching the criteria</returns>
         public IEnumerable<TimeSerie> GetSeriesByLocationId(string locationId)
         {
-            return from series in this.Series
+            return from series in Series
                    where series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase)
                    select series;
         }
 
-
         /// <summary>
         /// Gets the series containing location id and parameter id.
         /// </summary>
@@ -136,8 +140,8 @@
         /// <returns>The time series matching the criteria</returns>
         public IEnumerable<TimeSerie> GetSeriesByLocationIdAndParameterId(string locationId, string parameterId)
         {
-            return from series in this.Series
-                   where series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase) && 
+            return from series in Series
+                   where series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase) &&
                          series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase)
                    select series;
         }
@@ -150,24 +154,25 @@
         public IEnumerable<TimeSerie> GetSeriesByGageIdAndLocationId(string combinedGageAndLocationId)
         {
             var resultSeries = new List<TimeSerie>();
-            foreach (var serie in this.Series)
+            foreach (TimeSerie serie in Series)
             {
                 string gaugeLocationId = serie.LocationId.Split('/')[0];
                 if (combinedGageAndLocationId.Equals(gaugeLocationId, StringComparison.InvariantCultureIgnoreCase))
                 {
                     resultSeries.Add(serie);
                 }
             }
+
             return resultSeries;
         }
 
         public TimeSerieCollection GetShallowCopy()
         {
             var copy = new TimeSerieCollection
-                           {
-                               Version = Version,
-                               TimeZone = TimeZone
-                           };
+            {
+                Version = Version,
+                TimeZone = TimeZone
+            };
 
             copy.Series.Clear();
             return copy;
@@ -184,7 +189,7 @@
         public TimeSerie AddNewSeries(string locationId)
         {
             var series = TimeSerie.CreateTimeSerie(locationId);
-            this.Series.Add(series);
+            Series.Add(series);
             return series;
         }
     }