[Quantproject-developers] QuantProject/b4_Business/a1_Financial/a2_Accounting Account.cs,1.13,1.14
Brought to you by:
glauco_1
|
From: Glauco S. <gla...@us...> - 2005-02-06 18:26:45
|
Update of /cvsroot/quantproject/QuantProject/b4_Business/a1_Financial/a2_Accounting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7934/b4_Business/a1_Financial/a2_Accounting Modified Files: Account.cs Log Message: - Commission concept has been introduced - EndOfDayTransaction(s) are used instead of TimedTransaction(s) Index: Account.cs =================================================================== RCS file: /cvsroot/quantproject/QuantProject/b4_Business/a1_Financial/a2_Accounting/Account.cs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Account.cs 9 Jan 2005 19:39:51 -0000 1.13 --- Account.cs 6 Feb 2005 18:26:32 -0000 1.14 *************** *** 35,38 **** --- 35,39 ---- using QuantProject.Business.Financial.Accounting.Reporting; using QuantProject.Business.Financial.Accounting.Transactions; + using QuantProject.Business.Financial.Accounting.Commissions; using QuantProject.Business.Financial.Instruments; using QuantProject.Business.Financial.Ordering; *************** *** 193,201 **** private void updateCash( Transaction transaction ) { ! cashAmount += transaction.CashFlow(); } ! public void Add( TimedTransaction transaction ) { this.Transactions.Add( transaction ); this.updateCash( transaction ); --- 194,207 ---- private void updateCash( Transaction transaction ) { ! cashAmount += transaction.CashFlow() - transaction.Commission.Value; } ! protected virtual Commission getCommission( Transaction transaction ) ! { ! return new Commission( transaction ); ! } ! public void Add( EndOfDayTransaction transaction ) { + transaction.Commission = this.getCommission( transaction ); this.Transactions.Add( transaction ); this.updateCash( transaction ); *************** *** 203,214 **** //this.accountReport.AddRecord( this ); } ! public void Add( EndOfDayTransaction transaction ) ! { ! this.Transactions.Add( transaction ); ! this.updateCash( transaction ); ! this.Portfolio.Update( transaction ); ! //this.accountReport.AddRecord( this ); ! } ! // public double GetMarketValue( EndOfDayDateTime endOfDayDateTime ) --- 209,220 ---- //this.accountReport.AddRecord( this ); } ! // public void Add( Transaction transaction ) ! // { ! // this.Transactions.Add( transaction ); ! // this.updateCash( transaction ); ! // this.Portfolio.Update( transaction ); ! // //this.accountReport.AddRecord( this ); ! // } ! // // public double GetMarketValue( EndOfDayDateTime endOfDayDateTime ) |