tail-cvs

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

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

Modified Files:
	ReportGenerator.java 
Log Message:
criada assinatura summarize e implementado o método em todos os critérios

Index: ReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/ReportGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReportGenerator.java	7 Aug 2007 18:54:41 -0000	1.4
--- ReportGenerator.java	9 Aug 2007 15:21:25 -0000	1.5
***************
*** 3,7 ****
  import java.io.File;
  import java.io.IOException;
! import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
--- 3,7 ----
  import java.io.File;
  import java.io.IOException;
! import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
***************
*** 9,16 ****
  
  import net.sf.tail.AnalysisCriterion;
- import net.sf.tail.analysis.criteria.AverageProfitCriterion;
- import net.sf.tail.analysis.criteria.MaximumDrawDownCriterion;
- import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion;
- import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import freemarker.ext.beans.BeansWrapper;
  import freemarker.template.Configuration;
--- 9,12 ----
***************
*** 20,24 ****
  	static final String FM_TEMPLATE_DIR = "src/templates";
  
! 	public StringBuffer generate(Report report) throws IOException {
  		Configuration cfg = new Configuration();
  		cfg.setDirectoryForTemplateLoading(new File(FM_TEMPLATE_DIR));
--- 16,24 ----
  	static final String FM_TEMPLATE_DIR = "src/templates";
  
! 	public StringBuffer generate(Report report) throws IOException{
! 		return generate(report,Collections.<AnalysisCriterion>emptyList());
! 	}
! 	
! 	public StringBuffer generate(Report report,List<AnalysisCriterion> criterion) throws IOException {
  		Configuration cfg = new Configuration();
  		cfg.setDirectoryForTemplateLoading(new File(FM_TEMPLATE_DIR));
***************
*** 29,39 ****
  		map.put("report", report);
  		
! 		// talvez tenha de colocar outros criterions
! 		List<AnalysisCriterion> criterions = new ArrayList<AnalysisCriterion>();
! 		criterions.add(new TotalProfitCriterion());
! 		criterions.add(new AverageProfitCriterion());
! 		criterions.add(new MaximumDrawDownCriterion());
! 		criterions.add(new RewardRiskRatioCriterion());		
! 		map.put("criterions", criterions);
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
--- 29,35 ----
  		map.put("report", report);
  		
! 		map.put("criterions", criterion);
! 		
! 	
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);