[Tail-cvs] Tail/src/java/net/sf/tail/report ReportGenerator.java, 1.6 Report.java, 1.8

[xanaot <xa...@us...>]

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

Modified Files:
	ReportGenerator.java Report.java 
Log Message:
commitando o report com chart

Index: ReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/ReportGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReportGenerator.java	9 Aug 2007 15:21:25 -0000	1.5
--- ReportGenerator.java	20 Aug 2007 22:25:40 -0000	1.6
***************
*** 27,32 ****
  
  		Map<String, Object> map = new HashMap<String, Object>();
- 		map.put("report", report);
  		
  		map.put("criterions", criterion);
  		
--- 27,32 ----
  
  		Map<String, Object> map = new HashMap<String, Object>();
  		
+ 		map.put("report", report);		
  		map.put("criterions", criterion);
  		

Index: Report.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Report.java	20 Aug 2007 21:31:20 -0000	1.7
--- Report.java	20 Aug 2007 22:25:40 -0000	1.8
***************
*** 1,4 ****
--- 1,5 ----
  package net.sf.tail.report;
  
+ import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
***************
*** 7,10 ****
--- 8,12 ----
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.TimeSeriesSlicer;
+ import net.sf.tail.Trade;
  import net.sf.tail.analysis.evaluator.Decision;
  
***************
*** 50,55 ****
  	}
  
! 	public Map<Number,AnalysisCriterion> getAdditionalCriteria() {
! 		return additionalCriteria;
  	}
  }
--- 52,63 ----
  	}
  
! 	public List<Trade> getAllTrades(){
! 		List<Trade> trades = new ArrayList<Trade>();
! 		for (Decision decision : decisions) {
! 			for (Trade trade : decision.getTrades()) {
! 				trades.add(trade);
! 			}
! 		}
! 		return trades;
  	}
  }