[Quantproject-developers] QuantProject/b4_Business/a1_Financial/a2_Accounting/h5_Reporting AccountReport.cs,1.15,1.16

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

Update of /cvsroot/quantproject/QuantProject/b4_Business/a1_Financial/a2_Accounting/h5_Reporting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13539/b4_Business/a1_Financial/a2_Accounting/h5_Reporting

Modified Files:
	AccountReport.cs 
Log Message:
An EquityLine is used instead of an equity history

Index: AccountReport.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b4_Business/a1_Financial/a2_Accounting/h5_Reporting/AccountReport.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AccountReport.cs	3 Sep 2005 23:58:31 -0000	1.15
--- AccountReport.cs	15 Oct 2005 17:58:03 -0000	1.16
***************
*** 55,59 ****
      private ReportTable roundTrades;
      private ReportTable equity;
! 		private History equityHistory;
      private Tables.Summary summary;
  
--- 55,59 ----
      private ReportTable roundTrades;
      private ReportTable equity;
! 		private EquityLine equityLine;
      private Tables.Summary summary;
  
***************
*** 98,114 ****
  			get { return equity; }
  		}
! 		public History EquityHistory
  		{
  			get
  			{
! 				if ( this.equityHistory == null )
  					// this.equityHistory has not been imported yet
  				{
! 					this.equityHistory = new History();
! 					this.equityHistory.Import( this.Equity.DataTable ,
  						QuantProject.Business.Financial.Accounting.Reporting.Tables.Equity.Date ,
  						QuantProject.Business.Financial.Accounting.Reporting.Tables.Equity.AccountValue );
  				}
! 				return this.equityHistory;
  			}
  		}
--- 98,114 ----
  			get { return equity; }
  		}
! 		public EquityLine EquityLine
  		{
  			get
  			{
! 				if ( this.equityLine == null )
  					// this.equityHistory has not been imported yet
  				{
! 					this.equityLine = new EquityLine();
! 					this.equityLine.Import( this.Equity.DataTable ,
  						QuantProject.Business.Financial.Accounting.Reporting.Tables.Equity.Date ,
  						QuantProject.Business.Financial.Accounting.Reporting.Tables.Equity.AccountValue );
  				}
! 				return this.equityLine;
  			}
  		}
***************
*** 248,255 ****
  		{
  			History benchmarkQuotes = HistoricalDataProvider.GetAdjustedCloseHistory(
! 				this.benchmark , (DateTime)this.EquityHistory.GetKey( 0 ) ,
! 				(DateTime)this.EquityHistory.GetKey( this.EquityHistory.Count - 1 ) );
! 			this.benchmarkEquityLine = benchmarkQuotes.Select( this.EquityHistory );
! 			this.benchmarkEquityLine.Interpolate( this.EquityHistory.Keys , new PreviousInterpolator() );
  		}
  		private void setDetailedDataTable( long numDaysForInterval )
--- 248,255 ----
  		{
  			History benchmarkQuotes = HistoricalDataProvider.GetAdjustedCloseHistory(
! 				this.benchmark , (DateTime)this.EquityLine.GetKey( 0 ) ,
! 				(DateTime)this.EquityLine.GetKey( this.EquityLine.Count - 1 ) );
! 			this.benchmarkEquityLine = benchmarkQuotes.Select( this.EquityLine );
! 			this.benchmarkEquityLine.Interpolate( this.EquityLine.Keys , new PreviousInterpolator() );
  		}
  		private void setDetailedDataTable( long numDaysForInterval )