[Quantproject-developers] QuantProject/b4_Business/a05_Timing HistoricalEndOfDayTimer.cs, 1.12, 1.1
Brought to you by:
glauco_1
|
From: Glauco S. <gla...@us...> - 2009-02-28 18:33:47
|
Update of /cvsroot/quantproject/QuantProject/b4_Business/a05_Timing In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20860/b4_Business/a05_Timing Modified Files: HistoricalEndOfDayTimer.cs Log Message: - some important properties and method's return value have been changed from DateTime to Time Index: HistoricalEndOfDayTimer.cs =================================================================== RCS file: /cvsroot/quantproject/QuantProject/b4_Business/a05_Timing/HistoricalEndOfDayTimer.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** HistoricalEndOfDayTimer.cs 10 Dec 2008 19:31:16 -0000 1.12 --- HistoricalEndOfDayTimer.cs 28 Feb 2009 18:33:41 -0000 1.13 *************** *** 24,27 **** --- 24,28 ---- using QuantProject.ADT; + using QuantProject.ADT.Timing; namespace QuantProject.Business.Timing *************** *** 38,50 **** // private EndOfDayDateTime endDateTime; ! private static DateTime timeForMarketOpen = ! new DateTime( 1900 , 1 , 1 , 9 , 30 , 00 ); ! private static DateTime timeForMarketClose = ! new DateTime( 1900 , 1 , 1 , 16 , 00 , 00 ); /// <summary> /// time when the market opens /// </summary> ! public static DateTime TimeForMarketOpen { get { return HistoricalEndOfDayTimer.timeForMarketOpen; } } --- 39,51 ---- // private EndOfDayDateTime endDateTime; ! private static Time timeForMarketOpen = ! new Time( 9 , 30 , 00 ); ! private static Time timeForMarketClose = ! new Time( 16 , 00 , 00 ); /// <summary> /// time when the market opens /// </summary> ! public static Time TimeForMarketOpen { get { return HistoricalEndOfDayTimer.timeForMarketOpen; } } *************** *** 53,57 **** /// time when the market closes /// </summary> ! public static DateTime TimeForMarketClose { get { return HistoricalEndOfDayTimer.timeForMarketClose; } } --- 54,58 ---- /// time when the market closes /// </summary> ! public static Time TimeForMarketClose { get { return HistoricalEndOfDayTimer.timeForMarketClose; } } *************** *** 60,64 **** /// time for one hour after market closes /// </summary> ! public static DateTime TimeForOneHourAfterMarketClose { get { return HistoricalEndOfDayTimer.TimeForMarketClose.AddHours( 1 ); } } --- 61,65 ---- /// time for one hour after market closes /// </summary> ! public static Time TimeForOneHourAfterMarketClose { get { return HistoricalEndOfDayTimer.TimeForMarketClose.AddHours( 1 ); } } *************** *** 133,140 **** public static bool IsMarketOpen( DateTime dateTime ) { ! bool returnValue = ! ExtendedDateTime.HaveTheSameTime( ! dateTime , HistoricalEndOfDayTimer.TimeForMarketOpen ); ! return returnValue; } --- 134,140 ---- public static bool IsMarketOpen( DateTime dateTime ) { ! Time time = new Time( dateTime ); ! bool isMarketOpen = ( time == HistoricalEndOfDayTimer.TimeForMarketOpen ); ! return isMarketOpen; } *************** *** 146,153 **** public static bool IsMarketClose( DateTime dateTime ) { ! bool returnValue = ! ExtendedDateTime.HaveTheSameTime( ! dateTime , HistoricalEndOfDayTimer.TimeForMarketClose ); ! return returnValue; } --- 146,152 ---- public static bool IsMarketClose( DateTime dateTime ) { ! Time time = new Time( dateTime ); ! bool isMarketClose = ( time == HistoricalEndOfDayTimer.TimeForMarketClose ); ! return isMarketClose; } *************** *** 159,167 **** public static bool IsOneHourAfterMarketClose( DateTime dateTime ) { ! bool returnValue = ! ExtendedDateTime.HaveTheSameTime( ! dateTime , ! HistoricalEndOfDayTimer.TimeForOneHourAfterMarketClose ); ! return returnValue; } --- 158,165 ---- public static bool IsOneHourAfterMarketClose( DateTime dateTime ) { ! Time time = new Time( dateTime ); ! bool isOneHourAfterMarketClose = ! ( time == HistoricalEndOfDayTimer.TimeForOneHourAfterMarketClose ); ! return isOneHourAfterMarketClose; } *************** *** 210,220 **** #region GetNextMarketStatusSwitch - // private void getNextMarketStatusSwitch_checkParameters( - // DateTime dateTime) - // { - // if ( !HistoricalEndOfDayTimer.IsMarketOpen( dateTime ) && - // !HistoricalEndOfDayTimer.IsMarketClose( dateTime ) ) - // throw new Exception( "dateTime must be a - // } /// <summary> /// Returns either the next market close or the next market open, --- 208,211 ---- *************** *** 228,236 **** DateTime dateTime) { ! // this.getNextMarketStatusSwitch_checkParameters( ! // dateTime ); DateTime nextMarketStatusSwitch; ! if ( ExtendedDateTime.IsFirstTimeLessThenSecondTime( ! dateTime , HistoricalEndOfDayTimer.TimeForMarketOpen ) ) // dateTime's time is before market open nextMarketStatusSwitch = new DateTime( --- 219,225 ---- DateTime dateTime) { ! Time time = new Time( dateTime ); DateTime nextMarketStatusSwitch; ! if ( time < HistoricalEndOfDayTimer.TimeForMarketOpen ) // dateTime's time is before market open nextMarketStatusSwitch = new DateTime( *************** *** 242,247 **** { // dateTime's time is equal or after the market open ! if ( ExtendedDateTime.IsFirstTimeLessThenSecondTime( ! dateTime , HistoricalEndOfDayTimer.TimeForMarketClose ) ) // dateTime's time is equal or after the market open // AND dateTime's time is before market close --- 231,235 ---- { // dateTime's time is equal or after the market open ! if ( time < HistoricalEndOfDayTimer.TimeForMarketClose ) // dateTime's time is equal or after the market open // AND dateTime's time is before market close *************** *** 262,284 **** HistoricalEndOfDayTimer.TimeForMarketOpen.Second ); } ! } ! ! // ! // if ( this.EndOfDaySpecificTime < EndOfDaySpecificTime.MarketOpen ) ! // nextMarketStatusSwitch = new EndOfDayDateTime( ! // this.DateTime , EndOfDaySpecificTime.MarketOpen ); ! // else ! // { ! // // this.EndOfDaySpecificTime >= EndOfDaySpecificTime.MarketOpen ! // if ( this.EndOfDaySpecificTime < EndOfDaySpecificTime.MarketClose ) ! // // ( this.EndOfDaySpecificTime >= EndOfDaySpecificTime.MarketOpen ) ! // // AND ( this.EndOfDaySpecificTime < EndOfDaySpecificTime.MarketClose ) ! // nextMarketStatusSwitch = new EndOfDayDateTime( ! // this.DateTime , EndOfDaySpecificTime.MarketClose ); ! // else ! // // ( this.EndOfDaySpecificTime >= EndOfDaySpecificTime.MarketClose ) ! // nextMarketStatusSwitch = new EndOfDayDateTime( ! // this.DateTime.AddDays( 1 ) , EndOfDaySpecificTime.MarketOpen ); ! // } return nextMarketStatusSwitch; } --- 250,254 ---- HistoricalEndOfDayTimer.TimeForMarketOpen.Second ); } ! } return nextMarketStatusSwitch; } |