[Quantproject-developers] QuantProject/b3_Data/DataProviders/Bars/Caching DailyBarCache.cs, 1.1, 1.2

[Glauco S. <gla...@us...>]

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders/Bars/Caching
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13498/b3_Data/DataProviders/Bars/Caching

Modified Files:
	DailyBarCache.cs 
Log Message:
private DateTime[] dailyTimes;
is now
private List< Time > dailyTimes;

Index: DailyBarCache.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/DataProviders/Bars/Caching/DailyBarCache.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DailyBarCache.cs	8 Nov 2008 20:19:44 -0000	1.1
--- DailyBarCache.cs	12 Nov 2008 20:38:21 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  using QuantProject.ADT;
  using QuantProject.ADT.Histories;
+ using QuantProject.ADT.Timing;
  using QuantProject.DataAccess;
  
***************
*** 36,40 ****
  	{
  		private int barInterval;
! 		private DateTime[] dailyTimes;
  		
  		private int roughNumberOfItemsToBeCachedWithASingleQuery;
--- 37,41 ----
  	{
  		private int barInterval;
! 		private List< Time > dailyTimes;
  		
  		private int roughNumberOfItemsToBeCachedWithASingleQuery;
***************
*** 57,61 ****
  		public DailyBarCache(
  			int barInterval ,
! 			DateTime[] dailyTimes )
  		{
  			this.checkParameters( dailyTimes );
--- 58,62 ----
  		public DailyBarCache(
  			int barInterval ,
! 			List< Time > dailyTimes )
  		{
  			this.checkParameters( dailyTimes );
***************
*** 89,113 ****
  		
  		#region checkDailyTimesAreActuallyTimes
! 		private void checkIfItActuallyIsATime( DateTime dateTime )
! 		{
! 			if ( !ExtendedDateTime.IsTime( dateTime ) )
! 				throw new Exception(
! 					"dailyTimes have to be times: use the method " +
! 					"QuantProject.ADT.ExtendedDateTime.GetTime() " +
! 					"to build them" );
! 		}
! 		private void checkDailyTimesAreActuallyTimes( DateTime[] dailyTimes )
! 		{
! 			foreach ( DateTime dateTime in dailyTimes )
! 				this.checkIfItActuallyIsATime( dateTime );
! 		}
  		#endregion checkDailyTimesAreActuallyTimes
  		
  		#region checkIfDailyTimesAreInStrictAscendingOrder
  		private void checkIfDailyTimesAreInStrictAscendingOrder(
! 			int indexForCurrentDailyTime , DateTime[] dailyTimes )
  		{
! 			DateTime currentDailyTime = dailyTimes[ indexForCurrentDailyTime ];
! 			DateTime nextDailyTime = dailyTimes[ indexForCurrentDailyTime + 1 ];
  			if ( currentDailyTime >= nextDailyTime )
  				throw new Exception(
--- 90,116 ----
  		
  		#region checkDailyTimesAreActuallyTimes
! //		private void checkIfItActuallyIsATime( DateTime dateTime )
! //		{
! //			if ( !ExtendedDateTime.IsTime( dateTime ) )
! //				throw new Exception(
! //					"dailyTimes have to be times: use the method " +
! //					"QuantProject.ADT.ExtendedDateTime.GetTime() " +
! //					"to build them" );
! //		}
! //		private void checkDailyTimesAreActuallyTimes( DateTime[] dailyTimes )
! //		{
! //			foreach ( DateTime dateTime in dailyTimes )
! //				this.checkIfItActuallyIsATime( dateTime );
! //		}
  		#endregion checkDailyTimesAreActuallyTimes
  		
  		#region checkIfDailyTimesAreInStrictAscendingOrder
  		private void checkIfDailyTimesAreInStrictAscendingOrder(
! 			int indexForCurrentDailyTime , List< Time > dailyTimes )
  		{
! 			Time currentDailyTime =
! 				dailyTimes[ indexForCurrentDailyTime ];
! 			Time nextDailyTime =
! 				dailyTimes[ indexForCurrentDailyTime + 1 ];
  			if ( currentDailyTime >= nextDailyTime )
  				throw new Exception(
***************
*** 119,125 ****
  					" while it should <" );
  		}
! 		private void checkIfDailyTimesAreInStrictAscendingOrder( DateTime[] dailyTimes )
  		{
! 			for ( int index = 0 ; index < dailyTimes.Length - 1 ; index++ )
  				this.checkIfDailyTimesAreInStrictAscendingOrder(
  					index , dailyTimes );
--- 122,128 ----
  					" while it should <" );
  		}
! 		private void checkIfDailyTimesAreInStrictAscendingOrder( List< Time > dailyTimes )
  		{
! 			for ( int index = 0 ; index < dailyTimes.Count - 1 ; index++ )
  				this.checkIfDailyTimesAreInStrictAscendingOrder(
  					index , dailyTimes );
***************
*** 127,133 ****
  		#endregion checkIfDailyTimesAreInStrictAscendingOrder
  		
! 		private void checkParameters( DateTime[] dailyTimes )
  		{
! 			this.checkDailyTimesAreActuallyTimes( dailyTimes );
  			this.checkIfDailyTimesAreInStrictAscendingOrder( dailyTimes );
  		}
--- 130,136 ----
  		#endregion checkIfDailyTimesAreInStrictAscendingOrder
  		
! 		private void checkParameters( List< Time > dailyTimes )
  		{
! //			this.checkDailyTimesAreActuallyTimes( dailyTimes );
  			this.checkIfDailyTimesAreInStrictAscendingOrder( dailyTimes );
  		}
***************
*** 170,174 ****
  			int numberOfDaysToBeCachedForASingleQuery =
  				this.roughNumberOfItemsToBeCachedWithASingleQuery /
! 				this.dailyTimes.Length;
  			return numberOfDaysToBeCachedForASingleQuery;
  		}
--- 173,177 ----
  			int numberOfDaysToBeCachedForASingleQuery =
  				this.roughNumberOfItemsToBeCachedWithASingleQuery /
! 				this.dailyTimes.Count;
  			return numberOfDaysToBeCachedForASingleQuery;
  		}