[Tail-cvs] Tail/src/java/net/sf/tail/graphics CriteriaDataset.java, 1.4 FasterCriteriaDataset.java, 1.3

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

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

Modified Files:
	CriteriaDataset.java FasterCriteriaDataset.java 
Log Message:
refatoração

Index: CriteriaDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaDataset.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CriteriaDataset.java	22 Oct 2007 22:36:31 -0000	1.3
--- CriteriaDataset.java	29 Oct 2007 21:11:10 -0000	1.4
***************
*** 3,7 ****
--- 3,9 ----
  import java.util.List;
  
+ import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.TimeSeries;
+ import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.report.Report;
  
***************
*** 26,29 ****
--- 28,33 ----
  
  	private TimeSeries series;
+ 	
+ 	private final AnalysisCriterion totalProfit;
  
  	public CriteriaDataset(List<Report> reports, TimeSeries series, int datasetSize) {
***************
*** 34,37 ****
--- 38,42 ----
  		this.firstIndex = series.getBegin();
  		this.lastIndex = series.getBegin() + DATASET_SIZE - 1;
+ 		this.totalProfit = new TotalProfitCriterion();
  
  		loadValues(firstIndex, lastIndex);
***************
*** 42,46 ****
  		for (int i = 0; i < reports.size(); i++) {
  			for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(reports.get(i).getApplyedCriterion().calculate(series, reports.get(i).getTradesUntilIndex(j)), reports.get(i).getName(), series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
--- 47,51 ----
  		for (int i = 0; i < reports.size(); i++) {
  			for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(totalProfit.calculate(series, reports.get(i).getTradesUntilIndex(j)), reports.get(i).getName(), series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
***************
*** 101,105 ****
  				lastIndex ++;
  				for (Report report : reports) {
! 					data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
  							.toString("hh:mm d/M/yyyy"));
  				}
--- 106,110 ----
  				lastIndex ++;
  				for (Report report : reports) {
! 					data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
  							.toString("hh:mm d/M/yyyy"));
  				}

Index: FasterCriteriaDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/FasterCriteriaDataset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FasterCriteriaDataset.java	24 Oct 2007 23:35:38 -0000	1.2
--- FasterCriteriaDataset.java	29 Oct 2007 21:11:10 -0000	1.3
***************
*** 4,8 ****
--- 4,10 ----
  import java.util.List;
  
+ import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.TimeSeries;
+ import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.report.Report;
  
***************
*** 21,24 ****
--- 23,28 ----
  
  	private TimeSeries series;
+ 	
+ 	private final AnalysisCriterion totalProfit;	
  
  	public FasterCriteriaDataset(TimeSeries series, List<Report> reports) {
***************
*** 26,29 ****
--- 30,34 ----
  		this.reports = reports;
  		this.series = series;
+ 		this.totalProfit = new TotalProfitCriterion();
  				
  		if(series.getSize() > 800)
***************
*** 37,41 ****
  		for (Report report : reports) {
  		 	for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j)), report.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
--- 42,46 ----
  		for (Report report : reports) {
  		 	for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j)), report.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
***************
*** 51,55 ****
  		for (Report report : reports){
  			for (j = firstIndex; j <= firstIndex + 2; j++) {
! 				data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j)), report.getName() , series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
--- 56,60 ----
  		for (Report report : reports){
  			for (j = firstIndex; j <= firstIndex + 2; j++) {
! 				data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j)), report.getName() , series.getTick(j).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
***************
*** 58,64 ****
  		for (j = firstIndex + 3; j < lastIndex; j++) {
  			for (Report report : reports) {
! 				firstValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 2));
! 				secondValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 1));;
! 				thirdValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j));;
  				if((firstValue > secondValue && thirdValue > secondValue) || (firstValue < secondValue && thirdValue < secondValue) || counter > 10){
  					drawPoint = true;
--- 63,69 ----
  		for (j = firstIndex + 3; j < lastIndex; j++) {
  			for (Report report : reports) {
! 				firstValue = totalProfit.calculate(series, report.getTradesUntilIndex(j - 2));
! 				secondValue = totalProfit.calculate(series, report.getTradesUntilIndex(j - 1));;
! 				thirdValue = totalProfit.calculate(series, report.getTradesUntilIndex(j));;
  				if((firstValue > secondValue && thirdValue > secondValue) || (firstValue < secondValue && thirdValue < secondValue) || counter > 10){
  					drawPoint = true;
***************
*** 69,73 ****
  			if(drawPoint) {
  				for (Report report : reports) {
! 					data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 1)), report.getName(), series.getTick(j-1).getDate()
  							.toString("hh:mm d/M/yyyy"));
  				}
--- 74,78 ----
  			if(drawPoint) {
  				for (Report report : reports) {
! 					data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j - 1)), report.getName(), series.getTick(j-1).getDate()
  							.toString("hh:mm d/M/yyyy"));
  				}
***************
*** 78,82 ****
  				
  		for (Report report : reports) {
! 			data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
  					.toString("hh:mm d/M/yyyy"));
  		}
--- 83,87 ----
  				
  		for (Report report : reports) {
! 			data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
  					.toString("hh:mm d/M/yyyy"));
  		}