tail-cvs

[Thies <tg...@us...>]

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

Modified Files:
	StockAnalysis.java 
Log Message:
Refatoração nos scripts

Index: StockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** StockAnalysis.java	26 Nov 2007 22:23:36 -0000	1.17
--- StockAnalysis.java	5 Dec 2007 23:22:46 -0000	1.18
***************
*** 4,32 ****
  import java.util.ArrayList;
  import java.util.List;
- import java.util.ResourceBundle;
- import java.util.Set;
- 
- import javax.script.ScriptException;
- import javax.swing.JOptionPane;
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.evaluator.StrategyEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
- import net.sf.tail.dsl.ruby.RubyDSL;
  import net.sf.tail.report.Report;
  import net.sf.tail.runner.RunnerFactory;
  import net.sf.tail.series.SerializableTimeSeries;
  
- import org.apache.log4j.Logger;
- 
  public class StockAnalysis implements Serializable {
  
- 	private static final ResourceBundle fileBundle = ResourceBundle.getBundle("net.sf.tail.i18n.Files");
- 	
  	private static final long serialVersionUID = 8039932898223937322L;
- 	
- 	private transient static Logger LOG = Logger.getLogger(StockAnalysis.class);
  
  	private TimeSeriesSlicer slicer;
--- 4,20 ----
  import java.util.ArrayList;
  import java.util.List;
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.StrategiesSet;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.evaluator.StrategyEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.report.Report;
  import net.sf.tail.runner.RunnerFactory;
  import net.sf.tail.series.SerializableTimeSeries;
  
  public class StockAnalysis implements Serializable {
  
  	private static final long serialVersionUID = 8039932898223937322L;
  
  	private TimeSeriesSlicer slicer;
***************
*** 42,47 ****
  	private WalkForward walker;
  
- 	private transient RubyDSL dsl;
- 
  	private StrategyEvaluatorFactory evaluatorFactory;
  
--- 30,33 ----
***************
*** 58,111 ****
  		reports = new ArrayList<Report>();
  		additionalCriteria = new ArrayList<AnalysisCriterion>();
- 		
- 		createDSL();
- 	}
  
- 	private void createDSL() {
- 		try {
- 			String dslHeader = RubyDSL.read(fileBundle.getString("RUBY_UTILS_FILE"));
- 			dsl = new RubyDSL(dslHeader, this.getStock());
- 		} catch (Exception e) {
- 			JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
- 		}
  	}
  
! 	public Report addReport(String reportName, String strategiesScript) {
! 		Report report = createReport(reportName, strategiesScript);
! 		
! 		reports.add(report);
! 		return report;
! 	}
! 
! 	private Report createReport(String reportName, String strategiesScript) {
! 		
! 		Set<Strategy> strategies = null;
! 		try {
! 			strategies = dsl.evalStrategies(strategiesScript);
! 		} catch (ScriptException e) {
! 			LOG.error(e.getMessage());
! 			throw new RuntimeException(e);
! 		}
! 		Report report = walker.walk(strategies, slicer, applyedCriterion);
! 		report.setName(reportName);
! 		report.setStrategiesScript(strategiesScript);
! 		
! 		for (AnalysisCriterion criterion : additionalCriteria) {
! 			report.addSummarizedCriteria(criterion);
! 		}
! 		return report;
! 	}
  
- 	public Report addReport(String reportName, Set<Strategy> strategies) {
- 		Report report = createReport(reportName, strategies);
- 		
  		reports.add(report);
  		return report;
  	}
  
! 	private Report createReport(String reportName, Set<Strategy> strategies) {
! 		Report report = walker.walk(strategies, slicer, applyedCriterion);
  		report.setName(reportName);
! 		
  		for (AnalysisCriterion criterion : additionalCriteria) {
  			report.addSummarizedCriteria(criterion);
--- 44,62 ----
  		reports = new ArrayList<Report>();
  		additionalCriteria = new ArrayList<AnalysisCriterion>();
  
  	}
  
! 	public Report addReport(String reportName, StrategiesSet strategiesSet) {
! 		Report report = createReport(reportName, strategiesSet);
  
  		reports.add(report);
  		return report;
  	}
  
! 	private Report createReport(String reportName, StrategiesSet strategiesSet) {
! 
! 		Report report = walker.walk(strategiesSet, slicer, applyedCriterion);
  		report.setName(reportName);
! 
  		for (AnalysisCriterion criterion : additionalCriteria) {
  			report.addSummarizedCriteria(criterion);
***************
*** 150,154 ****
  		List<Report> newReports = new ArrayList<Report>();
  		for (int i = 0; i < reports.size(); i++) {
! 			Report newReport = createReport(reports.get(i).getName(), reports.get(i).getStrategiesScript());
  			newReports.add(newReport);
  		}
--- 101,105 ----
  		List<Report> newReports = new ArrayList<Report>();
  		for (int i = 0; i < reports.size(); i++) {
! 			Report newReport = createReport(reports.get(i).getName(), reports.get(i).getTechnic().getStrategiesSet());
  			newReports.add(newReport);
  		}
***************
*** 164,168 ****
  		return additionalCriteria;
  	}
! 	
  	@Override
  	public int hashCode() {
--- 115,119 ----
  		return additionalCriteria;
  	}
! 
  	@Override
  	public int hashCode() {