Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24481/src/java/net/sf/tail/report/xls
Modified Files:
ReportXlsGenerator.java CompleteXlsGenerator.java
TimeSeriesXlsGenerator.java SliceXlsGenerator.java
Log Message:
Refatoração nas classes de geração de report.
Index: CompleteXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CompleteXlsGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CompleteXlsGenerator.java 3 Oct 2007 17:47:00 -0000 1.12
--- CompleteXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.13
***************
*** 35,39 ****
criteria2.add(0,report.getApplyedCriterion());
! seriesXls.generate(report.getSlicer().getSeries());
reportXls.generate(report, criteria, period);
slicerXls.generate(report, criteria2, period);
--- 35,39 ----
criteria2.add(0,report.getApplyedCriterion());
! seriesXls.generate(report);
reportXls.generate(report, criteria, period);
slicerXls.generate(report, criteria2, period);
Index: TimeSeriesXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimeSeriesXlsGenerator.java 25 Sep 2007 00:04:22 -0000 1.1
--- TimeSeriesXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.2
***************
*** 3,8 ****
--- 3,10 ----
import java.io.IOException;
+ import net.sf.tail.ConstrainedTimeSeries;
import net.sf.tail.Tick;
import net.sf.tail.TimeSeries;
+ import net.sf.tail.report.Report;
import org.apache.poi.hssf.usermodel.HSSFCell;
***************
*** 28,34 ****
}
! public HSSFSheet generate(TimeSeries series) throws IOException {
! int row = INDEX_FIRST_ROW;
!
HSSFCellStyle style = stylist.createHeaderCellStyle();
row = generateHeader(row, style);
--- 30,39 ----
}
! public HSSFSheet generate(Report report) throws IOException {
! int row = INDEX_FIRST_ROW;
!
! TimeSeries series = new ConstrainedTimeSeries(report.getSlicer().getSeries(),
! report.getDecisions().get(0).getSeries().getBegin(), report.getSlicer().getSeries().getEnd() - 1);
!
HSSFCellStyle style = stylist.createHeaderCellStyle();
row = generateHeader(row, style);
***************
*** 61,65 ****
private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) {
int i;
! for (i = 0; i < series.getSize() - 1; i++) {
Tick tick = series.getTick(i);
int indexcolumn = INDEX_FIRST_COLUMN;
--- 66,70 ----
private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) {
int i;
! for (i = series.getBegin(); i < series.getEnd(); i++) {
Tick tick = series.getTick(i);
int indexcolumn = INDEX_FIRST_COLUMN;
Index: SliceXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SliceXlsGenerator.java 3 Oct 2007 17:47:00 -0000 1.7
--- SliceXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.8
***************
*** 71,75 ****
stylist.drawImage(reportPNG, sheet, 1, 7);
! stylist.rearrangeSheet(sheet, 10);
sheets.add(sheet);
--- 71,75 ----
stylist.drawImage(reportPNG, sheet, 1, 7);
! stylist.rearrangeSheet(sheet, criteria.size() + 6);
sheets.add(sheet);
Index: ReportXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ReportXlsGenerator.java 1 Oct 2007 23:54:36 -0000 1.7
--- ReportXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.8
***************
*** 71,75 ****
stylist.drawImage(reportPNG, sheet, 1, 5);
! stylist.rearrangeSheet(sheet, 10);
sheets.add(sheet);
--- 71,75 ----
stylist.drawImage(reportPNG, sheet, 1, 5);
! stylist.rearrangeSheet(sheet, criteria.size() + 5);
sheets.add(sheet);
***************
*** 87,92 ****
createCell(rowHeader, "Final Date", (short) columnIndex++, style);
createCell(rowHeader, "Strategy", (short) columnIndex++, style);
- createCell(rowHeader, report.getApplyedCriterion().getClass().getSimpleName(),
- (short) columnIndex++, style);
for (AnalysisCriterion criterium : criteria) {
createCell(rowHeader, criterium.getClass().getSimpleName(), (short) columnIndex++, style);
--- 87,90 ----
***************
*** 108,112 ****
.getDateName(), (short) indexcolumn++, style);
createCell(rowFirst, " - ", (short) indexcolumn++, style);
- createCell(rowFirst, " - ", (short) indexcolumn++, style);
for (int i=0; i < criteria.size(); i++)
--- 106,109 ----
***************
*** 133,138 ****
(short) indexcolumn++, style);
createCell(rowDecision, decision.getStrategy().getName(), (short) indexcolumn++, style);
- calculate = report.getApplyedCriterion().calculate(decision.getSeries(), decision.getTrades());
- createCell(rowDecision, calculate, (short) indexcolumn++, style);
for (AnalysisCriterion criterium : criteria) {
calculate = criterium.calculate(decision.getSeries(), decision.getTrades());
--- 130,133 ----
***************
*** 157,162 ****
.getDateName(), (short) indexcolumn++, style);
createCell(rowLast, " - ", (short) indexcolumn++, style);
- calculate = report.getApplyedCriterion().summarize(report.getSlicer().getSeries(), report.getDecisions());
- createCell(rowLast, calculate, (short) indexcolumn++, style);
for (AnalysisCriterion criterium : criteria) {
calculate = criterium.summarize(report.getSlicer().getSeries(), report.getDecisions());
--- 152,155 ----
|
