[Tail-cvs] Tail/src/java/net/sf/tail/report Report.java,1.22

[Carlos <ma...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2952/src/java/net/sf/tail/report

Modified Files:
	Report.java 
Log Message:
Commit do novo chart que será usado no TailS.

Index: Report.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Report.java	15 Oct 2007 20:23:24 -0000	1.21
--- Report.java	17 Oct 2007 19:06:43 -0000	1.22
***************
*** 6,9 ****
--- 6,11 ----
  
  import net.sf.tail.AnalysisCriterion;
+ import net.sf.tail.Operation;
+ import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
***************
*** 26,29 ****
--- 28,33 ----
  	
  	private String name;
+ 	
+ 	private List<Trade> trades;
  
  	private Set<Strategy> strategies;
***************
*** 67,80 ****
  
  	public List<Trade> getAllTrades() {
! 		List<Trade> trades = new ArrayList<Trade>();
! 		for (Decision decision : decisions) {
! 			trades.addAll(decision.getTrades());
  		}
  		return trades;
  	}
  
! 	
! 
! 
  
  	@Override
--- 71,108 ----
  
  	public List<Trade> getAllTrades() {
! 		if (trades == null)
! 		{
! 			List<Trade> trades = new ArrayList<Trade>();
! 			for (Decision decision : decisions) {
! 				trades.addAll(decision.getTrades());
! 			}
! 			this.trades = trades;
  		}
  		return trades;
  	}
  
! 	public List<Trade> getTradesUntilIndex(int index) {
! 		List<Trade> trades = getAllTrades();
! 		List<Trade> partialTrades = new ArrayList<Trade>();
! 		for (Trade trade : trades) {
! 			if (trade.getExit().getIndex() <= index)
! 				partialTrades.add(trade);
! 			else if (trade.getEntry().getIndex() <= index)
! 			{
! 				Trade artificialTrade;
! 				if(trade.getEntry().getType() == OperationType.BUY)
! 				{
! 					artificialTrade = new Trade(trade.getEntry(), new Operation(index, OperationType.SELL));
! 				}
! 				else
! 				{
! 					artificialTrade = new Trade(trade.getEntry(), new Operation(index, OperationType.BUY));
! 				}
! 				partialTrades.add(artificialTrade);
! 				break;
! 			}
! 		}
! 		return partialTrades;
! 	}
  
  	@Override