[Tail-cvs] Tail/src/java/net/sf/tail/report/xls SliceXlsGenerator.java, 1.17 TimeSeriesXlsGenerator.java, 1.8 ReportXlsGenerator.java, 1.16

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

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

Modified Files:
	SliceXlsGenerator.java TimeSeriesXlsGenerator.java 
	ReportXlsGenerator.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: TimeSeriesXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TimeSeriesXlsGenerator.java	7 Nov 2007 23:40:47 -0000	1.7
--- TimeSeriesXlsGenerator.java	21 Nov 2007 21:55:20 -0000	1.8
***************
*** 40,44 ****
  		
  		TimeSeries series = new ConstrainedTimeSeries(report.getSlicer().getSeries(), 
! 				report.getDecisions().get(0).getSeries().getBegin(), report.getSlicer().getSeries().getEnd() - 1);
  		
  		HSSFCellStyle style = stylist.createTitleCellStyle();
--- 40,44 ----
  		
  		TimeSeries series = new ConstrainedTimeSeries(report.getSlicer().getSeries(), 
! 				report.getDecisions().get(0).getActualSlice().getBegin(), report.getSlicer().getSeries().getEnd() - 1);
  		
  		HSSFCellStyle style = stylist.createTitleCellStyle();

Index: SliceXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** SliceXlsGenerator.java	12 Nov 2007 19:26:01 -0000	1.16
--- SliceXlsGenerator.java	21 Nov 2007 21:55:20 -0000	1.17
***************
*** 69,75 ****
  		String[] subtitle = new String[4];
  		subtitle[0] = "Stock:";
! 		subtitle[1] = decision.getSeries().getName();
  		subtitle[2] = "for:";
! 		subtitle[3] = decision.getSeries().getPeriodName();
  		row = generateSubTitle(row, subtitle, style, sheet);
  		
--- 69,75 ----
  		String[] subtitle = new String[4];
  		subtitle[0] = "Stock:";
! 		subtitle[1] = decision.getActualSlice().getName();
  		subtitle[2] = "for:";
! 		subtitle[3] = decision.getActualSlice().getPeriodName();
  		row = generateSubTitle(row, subtitle, style, sheet);
  		
***************
*** 185,208 ****
  			createCell(rowDecision, index++, (short) indexcolumn++, style);
  			if (trade.getEntry().getType() == OperationType.BUY) {
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
  			} else {
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
  			}
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getSeries(), trade);
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}
--- 185,208 ----
  			createCell(rowDecision, index++, (short) indexcolumn++, style);
  			if (trade.getEntry().getType() == OperationType.BUY) {
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getEntry().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getEntry().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getExit().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getExit().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
  			} else {
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getExit().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getExit().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getEntry().getIndex()).getDateName(),
  						(short) indexcolumn++, style);
! 				createCell(rowDecision, decision.getActualSlice().getTick(trade.getEntry().getIndex()).getClosePrice(),
  						(short) indexcolumn++, style);
  			}
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getActualSlice(), trade);
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}
***************
*** 223,234 ****
  		HSSFRow rowLast = sheet.createRow((short) firtRow++);
  		createCell(rowLast, "TOTAL", (short) indexcolumn++, style);
! 		createCell(rowLast, decision.getSeries().getTick(decision.getSeries().getBegin()).getDateName(),
  				(short) indexcolumn++, style);
  		createCell(rowLast, " - ", (short) indexcolumn++, style);
! 		createCell(rowLast, decision.getSeries().getTick(decision.getSeries().getEnd()).getDateName(),
  				(short) indexcolumn++, style);
  		createCell(rowLast, " - ", (short) indexcolumn++, style);
  		for (AnalysisCriterion criterium : criteria) {
! 			calculate = criterium.calculate(decision.getSeries(), decision.getTrades());
  			createCell(rowLast, calculate, (short) indexcolumn++, style);
  		}
--- 223,234 ----
  		HSSFRow rowLast = sheet.createRow((short) firtRow++);
  		createCell(rowLast, "TOTAL", (short) indexcolumn++, style);
! 		createCell(rowLast, decision.getActualSlice().getTick(decision.getActualSlice().getBegin()).getDateName(),
  				(short) indexcolumn++, style);
  		createCell(rowLast, " - ", (short) indexcolumn++, style);
! 		createCell(rowLast, decision.getActualSlice().getTick(decision.getActualSlice().getEnd()).getDateName(),
  				(short) indexcolumn++, style);
  		createCell(rowLast, " - ", (short) indexcolumn++, style);
  		for (AnalysisCriterion criterium : criteria) {
! 			calculate = criterium.calculate(decision.getActualSlice(), decision.getTrades());
  			createCell(rowLast, calculate, (short) indexcolumn++, style);
  		}

Index: ReportXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ReportXlsGenerator.java	12 Nov 2007 19:26:01 -0000	1.15
--- ReportXlsGenerator.java	21 Nov 2007 21:55:20 -0000	1.16
***************
*** 191,201 ****
  
  			createCell(rowDecision, index++, (short) indexcolumn++, style);
! 			createCell(rowDecision, decision.getSeries().getTick(decision.getSeries().getBegin()).getDateName(),
  					(short) indexcolumn++, style);
! 			createCell(rowDecision, decision.getSeries().getTick(decision.getSeries().getEnd()).getDateName(),
  					(short) indexcolumn++, style);
  			createCell(rowDecision, decision.getStrategy().getName(), (short) indexcolumn++, style);
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getSeries(), decision.getTrades());
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}
--- 191,201 ----
  
  			createCell(rowDecision, index++, (short) indexcolumn++, style);
! 			createCell(rowDecision, decision.getActualSlice().getTick(decision.getActualSlice().getBegin()).getDateName(),
  					(short) indexcolumn++, style);
! 			createCell(rowDecision, decision.getActualSlice().getTick(decision.getActualSlice().getEnd()).getDateName(),
  					(short) indexcolumn++, style);
  			createCell(rowDecision, decision.getStrategy().getName(), (short) indexcolumn++, style);
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getActualSlice(), decision.getTrades());
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}