[Tail-cvs] Tail/src/java/net/sf/tail/flow CashFlow.java,1.10

[Márcio V. d. S. <mv...@us...>]

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

Modified Files:
	CashFlow.java 
Log Message:
problemas com o cvs

Index: CashFlow.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/flow/CashFlow.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CashFlow.java	20 Aug 2007 19:02:00 -0000	1.9
--- CashFlow.java	25 Aug 2007 12:30:01 -0000	1.10
***************
*** 24,28 ****
  		calculate();
  	}
! 	
  	public CashFlow(TimeSeries timeSeries, List<Trade> trades, double initialValue) {
  		this.timeSeries = timeSeries;
--- 24,28 ----
  		calculate();
  	}
! 
  	public CashFlow(TimeSeries timeSeries, List<Trade> trades, double initialValue) {
  		this.timeSeries = timeSeries;
***************
*** 46,61 ****
  			}
  			int end = trade.getExit().getIndex();
! 			for (int i = Math.max(begin, 1) ; i <= end; i++) {
  				double ratio;
  				if (trade.getEntry().getType().equals(OperationType.BUY)) {
! 					ratio = timeSeries.getTick(i).getClosePrice() / timeSeries.getTick( trade.getEntry().getIndex()).getClosePrice();
  				} else {
! 					ratio = timeSeries.getTick(trade.getEntry().getIndex()).getClosePrice() / timeSeries.getTick(i).getClosePrice();
  				}
  				values.add(values.get(trade.getEntry().getIndex()) * ratio);
  			}
  		}
! 		if(timeSeries.getSize() - values.size() > 0)
! 			values.addAll(Collections.nCopies(timeSeries.getSize() - values.size(), values.get(values.size() - 1 )));
  	}
  
--- 46,63 ----
  			}
  			int end = trade.getExit().getIndex();
! 			for (int i = Math.max(begin, 1); i <= end; i++) {
  				double ratio;
  				if (trade.getEntry().getType().equals(OperationType.BUY)) {
! 					ratio = timeSeries.getTick(i).getClosePrice()
! 							/ timeSeries.getTick(trade.getEntry().getIndex()).getClosePrice();
  				} else {
! 					ratio = timeSeries.getTick(trade.getEntry().getIndex()).getClosePrice()
! 							/ timeSeries.getTick(i).getClosePrice();
  				}
  				values.add(values.get(trade.getEntry().getIndex()) * ratio);
  			}
  		}
! 		if (timeSeries.getSize() - values.size() > 0)
! 			values.addAll(Collections.nCopies(timeSeries.getSize() - values.size(), values.get(values.size() - 1)));
  	}