Menu
▾
▴
tail-cvs — cvs commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(148) |
Jun
(48) |
Jul
(107) |
Aug
(292) |
Sep
(301) |
Oct
(530) |
Nov
(142) |
Dec
(37) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: xanaot <xa...@us...> - 2007-11-07 22:22:05
|
Update of /cvsroot/tail/Tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20871 Modified Files: build.xml Log Message: Classes que não eram testes foram retiradas da pasta teste Index: build.xml =================================================================== RCS file: /cvsroot/tail/Tail/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 10 Jun 2007 21:03:12 -0000 1.2 --- build.xml 7 Nov 2007 22:22:08 -0000 1.3 *************** *** 2,6 **** <project name="tail" default="jar"> ! <property name="src" value="src/java" /> <property name="build" value="bin" /> <property name="version" value="0.6-SNAPSHOT" /> --- 2,6 ---- <project name="tail" default="jar"> ! <property name="src" value="src/" /> <property name="build" value="bin" /> <property name="version" value="0.6-SNAPSHOT" /> *************** *** 10,14 **** <mkdir dir="${build}" /> </target> ! <target name="compile" depends="clean"> <javac srcdir="${src}" destdir="${build}" debug="true"> --- 10,14 ---- <mkdir dir="${build}" /> </target> ! <target name="compile" depends="clean"> <javac srcdir="${src}" destdir="${build}" debug="true"> *************** *** 26,28 **** </jar> </target> ! </project> --- 26,29 ---- </jar> </target> ! ! </project> \ No newline at end of file |
|
From: xanaot <xa...@us...> - 2007-11-07 22:21:59
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/sample In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20640/src/java/net/sf/tail/sample Log Message: Directory /cvsroot/tail/Tail/src/java/net/sf/tail/sample added to the repository |
|
From: xanaot <xa...@us...> - 2007-11-07 22:20:10
|
Update of /cvsroot/tail/TailS In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19642 Modified Files: .classpath Added Files: build.xml Log Message: Tirando as dependencias do Tail Index: .classpath =================================================================== RCS file: /cvsroot/tail/TailS/.classpath,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** .classpath 31 Oct 2007 17:47:57 -0000 1.16 --- .classpath 7 Nov 2007 22:20:11 -0000 1.17 *************** *** 8,15 **** <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/> <classpathentry kind="src" path="dsl"/> <classpathentry combineaccessrules="false" kind="src" path="/Tail"/> - <classpathentry kind="lib" path="/Tail/lib/jfreechart-1.0.5.jar"/> - <classpathentry kind="lib" path="/Tail/lib/log4j-1.2.12.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --- 8,17 ---- <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/> + <classpathentry kind="lib" path="lib/jfreechart-1.0.5.jar"/> + <classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/> + <classpathentry kind="lib" path="lib/jeditsyntaxpackage.jar"/> + <classpathentry kind="lib" path="lib/jcommon-1.0.9.jar"/> <classpathentry kind="src" path="dsl"/> <classpathentry combineaccessrules="false" kind="src" path="/Tail"/> <classpathentry kind="output" path="bin"/> </classpath> --- NEW FILE: build.xml --- <?xml version="1.0"?> <project name="tails" default="jar"> <property name="src" value="src/java" /> <property name="build" value="bin" /> <property name="version" value="0.6-SNAPSHOT" /> <property name="lib.dir" value="lib" /> <path id="classpath"> <fileset dir="${lib.dir}" includes="**/*.jar" /> </path> <target name="clean"> <delete dir="${build}" /> <mkdir dir="${build}" /> </target> <target name="compile" depends="clean"> <javac srcdir="${src}" destdir="${build}" debug="true" classpathref="classpath" /> </target> <target name="jar" depends="compile"> <delete file="tails-${version}.jar" /> <delete file="MANIFEST.MF"/> <manifest file="MANIFEST.MF"> <attribute name="Main-Class" value="net/sf/tails/swing/Main"/> <attribute name="Class-Path" value="${lib.dir}/jfreechart-1.0.5.jar ${lib.dir}/tail-${version}.jar"/> </manifest> <jar destfile="tails-${version}.jar" basedir="${build}" manifest="MANIFEST.MF"> <fileset dir="src/java" includes="net/sf/tails/i18n/*.properties" /> </jar> </target> <target name="run" depends="jar"> <java classname="net.sf.tails.swing.Main" classpath="tails-${version}.jar" fork="true"> <classpath> <path refid="classpath" /> <path location="tails-${version}.jar" /> </classpath> </java> </target> </project> |
|
From: xanaot <xa...@us...> - 2007-11-07 22:20:09
|
Update of /cvsroot/tail/TailS/lib In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19642/lib Added Files: log4j-1.2.12.jar jfreechart-1.0.5.jar jcommon-1.0.9.jar Log Message: Tirando as dependencias do Tail --- NEW FILE: jcommon-1.0.9.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: log4j-1.2.12.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jfreechart-1.0.5.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Carlos <ma...@us...> - 2007-11-07 21:40:01
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3033/src/test/net/sf/tail/report/xls Modified Files: SliceXlsGeneratorTest.java ReportXlsGeneratorTest.java TImeSeriesXlsGeneratorTest.java Log Message: Ajuste de teste. Index: SliceXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/SliceXlsGeneratorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SliceXlsGeneratorTest.java 24 Oct 2007 22:57:13 -0000 1.3 --- SliceXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.4 *************** *** 96,100 **** @Test public void testGenerateSlicer() throws IOException { ! assertEquals(21, sheet.get(0).getLastRowNum()); } --- 96,100 ---- @Test public void testGenerateSlicer() throws IOException { ! assertEquals(27, sheet.get(0).getLastRowNum()); } Index: ReportXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/ReportXlsGeneratorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportXlsGeneratorTest.java 24 Oct 2007 22:57:13 -0000 1.3 --- ReportXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.4 *************** *** 95,99 **** @Test public void testGenerateReport() throws IOException { ! assertEquals(21, sheet.get(0).getLastRowNum()); } --- 95,99 ---- @Test public void testGenerateReport() throws IOException { ! assertEquals(27, sheet.get(0).getLastRowNum()); } Index: TImeSeriesXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/TImeSeriesXlsGeneratorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TImeSeriesXlsGeneratorTest.java 17 Oct 2007 17:37:28 -0000 1.1 --- TImeSeriesXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.2 *************** *** 64,68 **** HSSFSheet sheet = XLStimeSeries.generate(report); ! assertEquals(10, sheet.getPhysicalNumberOfRows()); } } --- 64,68 ---- HSSFSheet sheet = XLStimeSeries.generate(report); ! assertEquals(12, sheet.getPhysicalNumberOfRows()); } } |
|
From: Thies <tg...@us...> - 2007-11-06 14:10:29
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16764/src/java/net/sf/tail/report/xls Modified Files: SliceXlsGenerator.java Log Message: Acerto na exportação Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SliceXlsGenerator.java 5 Nov 2007 23:25:59 -0000 1.13 --- SliceXlsGenerator.java 6 Nov 2007 14:10:31 -0000 1.14 *************** *** 204,210 **** } for (AnalysisCriterion criterium : criteria) { ! calculate = criterium.calculate(decision.getSeries(), decision.getTrades().get(i++)); createCell(rowDecision, calculate, (short) indexcolumn++, style); } even = !even; } --- 204,211 ---- } for (AnalysisCriterion criterium : criteria) { ! calculate = criterium.calculate(decision.getSeries(), decision.getTrades().get(i)); createCell(rowDecision, calculate, (short) indexcolumn++, style); } + i++; even = !even; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-05 23:25:58
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3595/src/java/net/sf/tail/report/xls Modified Files: ReportXlsGenerator.java CellStylist.java TimeSeriesXlsGenerator.java SliceXlsGenerator.java Log Message: Mudança no estilo do xls para ficar mais proximo do html. Index: CellStylist.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CellStylist.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CellStylist.java 5 Nov 2007 21:32:56 -0000 1.8 --- CellStylist.java 5 Nov 2007 23:25:59 -0000 1.9 *************** *** 150,154 **** protected void drawImage(File reportPNG, HSSFSheet sheet, int columnStart, int columnEnd) throws IOException { HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); ! HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 523, 0, (short) columnStart, 1, (short) columnEnd, 17); anchor.setAnchorType(3); --- 150,154 ---- protected void drawImage(File reportPNG, HSSFSheet sheet, int columnStart, int columnEnd) throws IOException { HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); ! HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 240, 0, (short) columnStart, 5, (short) columnEnd, 23); anchor.setAnchorType(3); *************** *** 184,186 **** --- 184,229 ---- } + public HSSFCellStyle createTitleCellStyle() { + HSSFCellStyle style = workbook.createCellStyle(); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + + HSSFFont font = workbook.createFont(); + font.setFontName("Arial"); + font.setFontHeightInPoints((short) 16); + font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setUnderline(HSSFFont.U_SINGLE); + font.setColor(HSSFColor.GREY_80_PERCENT.index); + style.setFont(font); + return style; + } + + public HSSFCellStyle createSubTitleCellStyle() { + HSSFCellStyle style = workbook.createCellStyle(); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); + style.setFillBackgroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); + style.setFillForegroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); + + HSSFFont font = workbook.createFont(); + font.setFontName("Arial"); + font.setFontHeightInPoints((short) 14); + font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setColor(HSSFColor.DARK_BLUE.index); + style.setFont(font); + return style; + } + + public HSSFCellStyle createInfoCellStyle() { + HSSFCellStyle style = workbook.createCellStyle(); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + + HSSFFont font = workbook.createFont(); + font.setFontName("Arial"); + font.setFontHeightInPoints((short) 12); + font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setColor(HSSFColor.BLACK.index); + style.setFont(font); + return style; + } + } \ No newline at end of file Index: TimeSeriesXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TimeSeriesXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.5 --- TimeSeriesXlsGenerator.java 5 Nov 2007 23:25:59 -0000 1.6 *************** *** 41,53 **** report.getDecisions().get(0).getSeries().getBegin(), report.getSlicer().getSeries().getEnd() - 1); ! HSSFCellStyle style = stylist.createHeaderCellStyle(); row = generateHeader(row, style); ! HSSFCellStyle style3 = stylist.createInternalCellStyle(); HSSFCellStyle style2 = stylist.createInternal2CellStyle(); ! generateInternalRow(row, series, style3, style2); stylist.rearrangeSheet(sheet, 11); - LOG.info("Time Series generated (" + (System.currentTimeMillis() - time )+ " miliseconds)"); --- 41,64 ---- report.getDecisions().get(0).getSeries().getBegin(), report.getSlicer().getSeries().getEnd() - 1); ! HSSFCellStyle style = stylist.createTitleCellStyle(); ! String title = "Time Series"; ! row = generateTitle(row, title, style); ! ! style = stylist.createSubTitleCellStyle(); ! String[] subtitle = new String[4]; ! subtitle[0] = "Stock:"; ! subtitle[1] = report.getSlicer().getSeries().getName(); ! subtitle[2] = "for:"; ! subtitle[3] = report.getSlicer().getSeries().getPeriodName(); ! row = generateSubTitle(row, subtitle, style); ! ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, style); ! style = stylist.createInternalCellStyle(); HSSFCellStyle style2 = stylist.createInternal2CellStyle(); ! generateInternalRow(row, series, style, style2); stylist.rearrangeSheet(sheet, 11); LOG.info("Time Series generated (" + (System.currentTimeMillis() - time )+ " miliseconds)"); *************** *** 56,61 **** } ! private int generateHeader(int firtRow, HSSFCellStyle style) { ! HSSFRow rowHeader = sheet.createRow((short) firtRow++); int columnIndex = INDEX_FIRST_COLUMN; --- 67,95 ---- } ! private int generateTitle(int firstRow, String title, HSSFCellStyle style) { ! HSSFRow rowHeader = sheet.createRow((short) firstRow++); ! int columnIndex = INDEX_FIRST_COLUMN; ! ! createCell(rowHeader, title, (short) columnIndex++, style); ! ! LOG.info("Title created"); ! return firstRow; ! } ! ! private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style) { ! HSSFRow rowHeader = sheet.createRow((short) firstRow); ! int columnIndex = INDEX_FIRST_COLUMN; ! ! createCell(rowHeader, title[0], (short) columnIndex++, style); ! createCell(rowHeader, title[1], (short) columnIndex++, style); ! createCell(rowHeader, title[2], (short) columnIndex++, style); ! createCell(rowHeader, title[3], (short) columnIndex++, style); ! ! LOG.info("Subtitle created"); ! return firstRow+2; ! } ! ! private int generateHeader(int firstRow, HSSFCellStyle style) { ! HSSFRow rowHeader = sheet.createRow((short) firstRow++); int columnIndex = INDEX_FIRST_COLUMN; *************** *** 71,75 **** LOG.info("Header created"); ! return firtRow; } --- 105,109 ---- LOG.info("Header created"); ! return firstRow; } Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SliceXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.12 --- SliceXlsGenerator.java 5 Nov 2007 23:25:59 -0000 1.13 *************** *** 27,31 **** protected static final int INDEX_FIRST_COLUMN = 1; ! protected static final int INDEX_FIRST_ROW = 18; protected static final String FM_REPORT_DIR = "reports" + File.separatorChar; --- 27,31 ---- protected static final int INDEX_FIRST_COLUMN = 1; ! protected static final int INDEX_FIRST_ROW = 1; protected static final String FM_REPORT_DIR = "reports" + File.separatorChar; *************** *** 62,66 **** HSSFSheet sheet = workbook.createSheet(decision.getFileName()); ! HSSFCellStyle style = stylist.createHeaderCellStyle(); row = generateHeader(row, workbook, sheet, criteria, style); --- 62,88 ---- HSSFSheet sheet = workbook.createSheet(decision.getFileName()); ! HSSFCellStyle style = stylist.createTitleCellStyle(); ! String title = "Slice Report"; ! row = generateTitle(row, title, style, sheet); ! ! style = stylist.createSubTitleCellStyle(); ! 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); ! ! style = stylist.createInfoCellStyle(); ! String[] info = new String[4]; ! info[0] = "Strategy:"; ! info[1] = decision.getStrategy().getClass().getSimpleName(); ! info[2] = "Criteria:"; ! info[3] = decision.getCriterion().getName(); ! row = generateInfo(row, info, style, sheet); ! ! row = 24; ! ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, workbook, sheet, criteria, style); *************** *** 90,93 **** --- 112,151 ---- } + private int generateTitle(int firstRow, String title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow++); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title, (short) columnIndex++, style); + + LOG.info("Title created"); + return firstRow; + } + + private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow++); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title[0], (short) columnIndex++, style); + createCell(rowHeader, title[1], (short) columnIndex++, style); + createCell(rowHeader, title[2], (short) columnIndex++, style); + createCell(rowHeader, title[3], (short) columnIndex++, style); + + LOG.info("Subtitle created"); + return firstRow; + } + + private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title[0], (short) columnIndex++, style); + createCell(rowHeader, title[1], (short) columnIndex++, style); + createCell(rowHeader, title[2], (short) columnIndex++, style); + createCell(rowHeader, title[3], (short) columnIndex++, style); + + LOG.info("Info created"); + return firstRow+2; + } + private int generateHeader(int firtRow, HSSFWorkbook workbook, HSSFSheet sheet, List<AnalysisCriterion> criteria, HSSFCellStyle style) { *************** *** 116,119 **** --- 174,178 ---- int index = firtRow - INDEX_FIRST_ROW; for (Trade trade : decision.getTrades()) { + int i = 0; if (even){ style = style2; *************** *** 145,149 **** } for (AnalysisCriterion criterium : criteria) { ! calculate = criterium.calculate(decision.getSeries(), decision.getTrades().get(index - 2)); createCell(rowDecision, calculate, (short) indexcolumn++, style); } --- 204,208 ---- } for (AnalysisCriterion criterium : criteria) { ! calculate = criterium.calculate(decision.getSeries(), decision.getTrades().get(i++)); createCell(rowDecision, 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.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ReportXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.12 --- ReportXlsGenerator.java 5 Nov 2007 23:25:59 -0000 1.13 *************** *** 25,29 **** private static final int INDEX_FIRST_COLUMN = 1; ! private static final int INDEX_FIRST_ROW = 18; private HSSFWorkbook workbook; --- 25,29 ---- private static final int INDEX_FIRST_COLUMN = 1; ! private static final int INDEX_FIRST_ROW = 1; private HSSFWorkbook workbook; *************** *** 56,60 **** HSSFSheet sheet = workbook.createSheet("Complete Report"); ! HSSFCellStyle style = stylist.createHeaderCellStyle(); row = generateHeader(row, sheet, report, criteria, style); --- 56,82 ---- HSSFSheet sheet = workbook.createSheet("Complete Report"); ! HSSFCellStyle style = stylist.createTitleCellStyle(); ! String title = "WalkForward Report"; ! row = generateTitle(row, title, style, sheet); ! ! style = stylist.createSubTitleCellStyle(); ! String[] subtitle = new String[4]; ! subtitle[0] = "Stock:"; ! subtitle[1] = report.getSlicer().getSeries().getName(); ! subtitle[2] = "for:"; ! subtitle[3] = report.getSlicer().getSeries().getPeriodName(); ! row = generateSubTitle(row, subtitle, style, sheet); ! ! style = stylist.createInfoCellStyle(); ! String[] info = new String[4]; ! info[0] = "Slicer:"; ! info[1] = report.getSlicer().getName(); ! info[2] = "Strategy:"; ! info[3] = report.getDecisions().get(0).getStrategy().getClass().getSimpleName() + " Criteria: " + report.getApplyedCriterion().getName(); ! row = generateInfo(row, info, style, sheet); ! ! row = 24; ! ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, sheet, report, criteria, style); *************** *** 78,81 **** --- 100,139 ---- } + private int generateTitle(int firstRow, String title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow++); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title, (short) columnIndex++, style); + + LOG.info("Title created"); + return firstRow; + } + + private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow++); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title[0], (short) columnIndex++, style); + createCell(rowHeader, title[1], (short) columnIndex++, style); + createCell(rowHeader, title[2], (short) columnIndex++, style); + createCell(rowHeader, title[3], (short) columnIndex++, style); + + LOG.info("Subtitle created"); + return firstRow; + } + + private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { + HSSFRow rowHeader = sheet.createRow((short) firstRow); + int columnIndex = INDEX_FIRST_COLUMN; + + createCell(rowHeader, title[0], (short) columnIndex++, style); + createCell(rowHeader, title[1], (short) columnIndex++, style); + createCell(rowHeader, title[2], (short) columnIndex++, style); + createCell(rowHeader, title[3], (short) columnIndex++, style); + + LOG.info("Info created"); + return firstRow+2; + } + private int generateHeader(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, HSSFCellStyle style) { |
|
From: Thies <tg...@us...> - 2007-11-05 23:20:14
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/help In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2498/src/java/net/sf/tails/swing/help Removed Files: HelpFrame.java Log Message: Refatoração --- HelpFrame.java DELETED --- |
|
From: Thies <tg...@us...> - 2007-11-05 23:20:14
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2498/src/java/net/sf/tails/swing/helper Added Files: HelpFrame.java Log Message: Refatoração --- NEW FILE: HelpFrame.java --- /* * helpFrame.java * * Created on 22 de Outubro de 2007, 19:00 */ package net.sf.tails.swing.helper; import java.awt.Toolkit; import java.net.URL; import java.util.ResourceBundle; import javax.swing.GroupLayout; import javax.swing.ImageIcon; import javax.swing.JEditorPane; import javax.swing.JScrollPane; import javax.swing.WindowConstants; /** * * @author Marcio */ public class HelpFrame extends javax.swing.JFrame { private static final ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons"); private JEditorPane jEditorPane1; private JScrollPane jScrollPane1; /** * */ private static final long serialVersionUID = 4602119139785751108L; public HelpFrame() { //ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.Files"); initComponents(); try{ //File file = new File(bundle.getString("HELP_FILE")); //jEditorPane1.setPage("file:////"+file.getAbsolutePath()); this.setIconImage(new ImageIcon(iconBundle.getString("TAILS_ICON")).getImage()); jEditorPane1.setPage(new URL("http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner")); }catch(Exception e){ e.printStackTrace(); } setSize(Toolkit.getDefaultToolkit().getScreenSize()); } /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ // <editor-fold defaultstate="collapsed" desc=" C�digo Gerado "> private void initComponents() { jScrollPane1 = new JScrollPane(); jEditorPane1 = new JEditorPane(); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); jScrollPane1.setViewportView(jEditorPane1); GroupLayout layout = new GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE) ); pack(); }// </editor-fold> } |
|
From: Thies <tg...@us...> - 2007-11-05 23:20:14
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2498/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Refatoração Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Index.java 5 Nov 2007 21:33:01 -0000 1.47 --- Index.java 5 Nov 2007 23:20:11 -0000 1.48 *************** *** 60,66 **** import net.sf.tails.swing.frame.report.NewReportFrame; import net.sf.tails.swing.frame.stockAnalysis.NewStockAnalysis; - import net.sf.tails.swing.help.HelpFrame; import net.sf.tails.swing.helper.CompleteReportGenerator; import net.sf.tails.swing.helper.FrameHelper; import org.jfree.chart.ChartPanel; --- 60,66 ---- import net.sf.tails.swing.frame.report.NewReportFrame; import net.sf.tails.swing.frame.stockAnalysis.NewStockAnalysis; import net.sf.tails.swing.helper.CompleteReportGenerator; import net.sf.tails.swing.helper.FrameHelper; + import net.sf.tails.swing.helper.HelpFrame; import org.jfree.chart.ChartPanel; |
|
From: Thies <tg...@us...> - 2007-11-05 23:18:25
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1677/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Mudancas na serelização Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** NewReportFrame.java 5 Nov 2007 17:30:51 -0000 1.38 --- NewReportFrame.java 5 Nov 2007 23:18:28 -0000 1.39 *************** *** 11,24 **** import java.io.BufferedOutputStream; import java.io.File; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; import java.io.PrintWriter; import java.util.ResourceBundle; - import java.util.Scanner; - import java.util.Set; ! import javax.script.ScriptException; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; --- 11,22 ---- import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; import java.io.PrintWriter; + import java.util.Enumeration; import java.util.ResourceBundle; ! import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; *************** *** 40,52 **** import javax.swing.SwingConstants; - import net.sf.tail.Strategy; import net.sf.tail.analysis.StockAnalysis; - import net.sf.tail.dsl.TailDSL; - import net.sf.tail.dsl.ruby.RubyDSL; import net.sf.tail.report.Report; import net.sf.tails.dsl.TailSTokenMarker; import net.sf.tails.swing.component.TailButton; import net.sf.tails.swing.frame.Index; - import net.sf.tails.swing.helper.DefaultStrategiesGenerator; import net.sf.tails.swing.helper.EnumIndicator; import net.sf.tails.swing.helper.FrameHelper; --- 38,47 ---- import javax.swing.SwingConstants; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.report.Report; + import net.sf.tails.dsl.CodeSnippetLoader; import net.sf.tails.dsl.TailSTokenMarker; import net.sf.tails.swing.component.TailButton; import net.sf.tails.swing.frame.Index; import net.sf.tails.swing.helper.EnumIndicator; import net.sf.tails.swing.helper.FrameHelper; *************** *** 60,64 **** public class NewReportFrame extends JFrame { private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages"); - private static final ResourceBundle fileBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Files"); private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders"); private static final ResourceBundle indicatorBundle = ResourceBundle.getBundle("net.sf.tails.i18n.IndicatorDescription"); --- 55,58 ---- *************** *** 185,188 **** --- 179,183 ---- radioButtonSMA.setToolTipText(indicatorBundle.getString("SMAIndicator")); radioButtonSMA.setText("SMA"); + radioButtonSMA.setName("Default_SMA"); radioButtonSMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 193,196 **** --- 188,192 ---- radioButtonEMA.setToolTipText(indicatorBundle.getString("EMAIndicator")); radioButtonEMA.setText("EMA"); + radioButtonEMA.setName("Default_EMA"); radioButtonEMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 201,204 **** --- 197,201 ---- radioButtonRSI.setToolTipText(indicatorBundle.getString("RSIIndicator")); radioButtonRSI.setText("RSI"); + radioButtonRSI.setName("Default_RSI"); radioButtonRSI.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 217,220 **** --- 214,218 ---- radioButtonParabolicSAR.setToolTipText(indicatorBundle.getString("ParabolicSarIndicator")); radioButtonParabolicSAR.setText("Parabolic SAR"); + radioButtonParabolicSAR.setName("Default_ParabolicSAR"); radioButtonParabolicSAR.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 225,228 **** --- 223,227 ---- radioButtonWMA.setToolTipText(indicatorBundle.getString("WMAIndicator")); radioButtonWMA.setText("WMA"); + radioButtonWMA.setName("Default_WMA"); radioButtonWMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 406,413 **** setCursor( cursor ); ! DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); --- 405,428 ---- setCursor( cursor ); ! ! AbstractButton selectedButton = null; ! Enumeration<AbstractButton> buttons = indicatorsButtonGroup.getElements(); ! while(buttons.hasMoreElements()) { ! AbstractButton button = buttons.nextElement(); ! if(button.isSelected()) { ! selectedButton = button; ! break; ! } ! ! } ! String value = selectedButton.getName(); ! if(notSoFastCheckBox.isSelected()) ! value += "_NotSoFast.rb"; ! else ! value += ".rb"; ! CodeSnippetLoader loader = new CodeSnippetLoader(); ! String script = loader.loadFileByName(value); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.addReport(reportNameField.getText(), script); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); *************** *** 439,456 **** try { ! TailDSL dsl = null; ! try { ! String dslHeader = read(fileBundle.getString("RUBY_UTILS_FILE")); ! dsl = new RubyDSL(dslHeader, stockAnalysis.getStock()); ! } catch (Exception e) { ! JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2); ! } ! Set<Strategy> strategies; ! strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); ! } catch (ScriptException e) { JOptionPane.showMessageDialog(null, messageBundle.getString("INVALID_CUSTOM"), "Error", 2); e.printStackTrace(); --- 454,463 ---- try { ! ! stockAnalysis.addReport(reportNameField.getText(), customStrategyTextArea.getText()); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); ! } catch (Exception e) { JOptionPane.showMessageDialog(null, messageBundle.getString("INVALID_CUSTOM"), "Error", 2); e.printStackTrace(); *************** *** 461,478 **** } ! private static String read(String name) { ! String text = ""; ! Scanner scanner; ! try { ! scanner = new Scanner(new FileInputStream(name)); ! while (scanner.hasNextLine()) { ! text += scanner.nextLine() + "\n"; ! } ! } catch (FileNotFoundException e) { ! e.printStackTrace(); ! } ! ! return text; ! } private void customStrategyCancelButtonActionPerformed(ActionEvent evt) { --- 468,472 ---- } ! private void customStrategyCancelButtonActionPerformed(ActionEvent evt) { |
|
From: Thies <tg...@us...> - 2007-11-05 23:18:25
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1677/src/java/net/sf/tails/swing/helper Removed Files: DefaultStrategiesGenerator.java Log Message: Mudancas na serelização --- DefaultStrategiesGenerator.java DELETED --- |
|
From: Thies <tg...@us...> - 2007-11-05 23:18:25
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/dsl In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1677/src/java/net/sf/tails/dsl Modified Files: CodeSnippetLoader.java Log Message: Mudancas na serelização Index: CodeSnippetLoader.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/dsl/CodeSnippetLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CodeSnippetLoader.java 2 Nov 2007 01:21:38 -0000 1.1 --- CodeSnippetLoader.java 5 Nov 2007 23:18:28 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- private Map<String, String> snippets; + private File file; public CodeSnippetLoader(){ *************** *** 23,33 **** private void loadFiles(String path) { ! File file = new File(path); File[] files = file.listFiles(); for (int i = 0; i < files.length; i++) { ! readStream(files[i]); } } private void readStream(File file){ try { --- 24,44 ---- private void loadFiles(String path) { ! file = new File(path); File[] files = file.listFiles(); for (int i = 0; i < files.length; i++) { ! if(!files[i].getName().equals("CVS")) ! readStream(files[i]); } } + public String loadFileByName(String fileName) { + File[] files = file.listFiles(); + + for (int i = 0; i < files.length; i++) { + if(files[i].getName().equals(fileName)) + return readSnippet(files[i]); + } + return null; + } private void readStream(File file){ try { *************** *** 49,52 **** --- 60,82 ---- } } + + private String readSnippet(File file) { + try { + InputStream is = new FileInputStream(file); + Scanner s = new Scanner(is); + String snippet = ""; + + while(s.hasNextLine()){ + String line = s.nextLine(); + if(!line.startsWith("#!")){ + snippet += line + "\n"; + } + } + return snippet; + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + return null; + } |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:08
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/java/net/sf/tail/i18n Added Files: Files.properties Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies --- NEW FILE: Files.properties --- RUBY_UTILS_FILE=dsl/rubyDSLutils.rb |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:08
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/test/net/sf/tail/io Modified Files: SerializerTest.java Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies Index: SerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SerializerTest.java 17 Oct 2007 16:51:44 -0000 1.12 --- SerializerTest.java 5 Nov 2007 23:16:10 -0000 1.13 *************** *** 5,14 **** import java.io.FileNotFoundException; import java.io.IOException; - import java.util.HashSet; - import java.util.Set; - import net.sf.tail.Indicator; import net.sf.tail.OperationType; - import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.StockAnalysis; --- 5,10 ---- *************** *** 18,30 **** import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.HigherValueEvaluator; - import net.sf.tail.indicator.simple.ClosePriceIndicator; - import net.sf.tail.indicator.tracker.EMAIndicator; - import net.sf.tail.indicator.tracker.SMAIndicator; - import net.sf.tail.indicator.tracker.WilliamsRIndicator; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.series.SerializableTimeSeries; - import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; import org.joda.time.Period; --- 14,21 ---- *************** *** 74,109 **** stockAnalysis.addCriterion(new NumberOfTicksCriterion()); ! Set<Strategy> strategies = new HashSet<Strategy>(); ! ! for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock); ! Indicator<Double> tracker = new EMAIndicator(close, i); ! Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); ! strategies.add(strategy); ! } ! ! stockAnalysis.addReport("", strategies); ! ! strategies = new HashSet<Strategy>(); ! ! for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock); ! Indicator<Double> tracker = new SMAIndicator(close, i); ! Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); ! strategies.add(strategy); ! } ! stockAnalysis.addReport("", strategies); ! strategies = new HashSet<Strategy>(); ! for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock); ! Indicator<Double> tracker = new WilliamsRIndicator(stock, i); ! Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); ! strategies.add(strategy); ! } ! stockAnalysis.addReport("", strategies); StockAnalysisSerializer serializer = new StockAnalysisSerializer(); --- 65,80 ---- stockAnalysis.addCriterion(new NumberOfTicksCriterion()); ! ! String script = "(4..10).each{|numero| strategies.add(cross(ema(numero), close))}"; ! stockAnalysis.addReport("", script); ! script = "(4..10).each{|numero|strategies.add(notSoFast(cross( parabolicSAR(numero), close), 3))}"; ! ! stockAnalysis.addReport("", script); ! script = "(4..10).each{|numero| strategies.add(notSoFast(cross(sma(numero), close), 3))}"; ! stockAnalysis.addReport("", script); StockAnalysisSerializer serializer = new StockAnalysisSerializer(); |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:07
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/java/net/sf/tail/analysis Modified Files: StockAnalysis.java Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies Index: StockAnalysis.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** StockAnalysis.java 31 Oct 2007 19:53:07 -0000 1.14 --- StockAnalysis.java 5 Nov 2007 23:16:10 -0000 1.15 *************** *** 1,22 **** package net.sf.tail.analysis; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Set; import net.sf.tail.AnalysisCriterion; - import net.sf.tail.StrategyEvaluator; import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.report.Report; import net.sf.tail.series.SerializableTimeSeries; public class StockAnalysis implements Serializable { ! private static final long serialVersionUID = 8039932898223937322L; private TimeSeriesSlicer slicer; --- 1,34 ---- package net.sf.tail.analysis; + import java.io.FileInputStream; + import java.io.FileNotFoundException; import java.io.Serializable; import java.util.ArrayList; import java.util.List; + import java.util.ResourceBundle; + import java.util.Scanner; 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.StrategyEvaluator; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.walk.WalkForward; + import net.sf.tail.dsl.ruby.RubyDSL; import net.sf.tail.report.Report; 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; *************** *** 34,37 **** --- 46,51 ---- private WalkForward walker; + private transient RubyDSL dsl; + public StockAnalysis(SerializableTimeSeries stock, AnalysisCriterion applyedCriterion, TimeSeriesSlicer slicer, StrategyEvaluator evaluator) { this.stock = stock; *************** *** 43,46 **** --- 57,97 ---- reports = new ArrayList<Report>(); additionalCriteria = new ArrayList<AnalysisCriterion>(); + + createDSL(); + } + + private void createDSL() { + try { + String dslHeader = 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; } *************** *** 98,102 **** List<Report> newReports = new ArrayList<Report>(); for (int i = 0; i < reports.size(); i++) { ! Report newReport = createReport(reports.get(i).getName(), reports.get(i).getStrategies()); newReports.add(newReport); } --- 149,153 ---- 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); } *************** *** 159,163 **** } ! } --- 210,227 ---- } ! private static String read(String name) { ! String text = ""; ! Scanner scanner; ! try { ! scanner = new Scanner(new FileInputStream(name)); ! while (scanner.hasNextLine()) { ! text += scanner.nextLine() + "\n"; ! } ! } catch (FileNotFoundException e) { ! e.printStackTrace(); ! } ! ! return text; ! } } |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:07
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/test/net/sf/tail Modified Files: ConstrainedTimeSeriesTest.java Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies Index: ConstrainedTimeSeriesTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ConstrainedTimeSeriesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstrainedTimeSeriesTest.java 22 Oct 2007 17:48:19 -0000 1.1 --- ConstrainedTimeSeriesTest.java 5 Nov 2007 23:16:09 -0000 1.2 *************** *** 62,66 **** public void getName() { assertTrue(constrained.getName().endsWith(series.getName())); - assertTrue(constrained.getName().startsWith("Constrained")); } --- 62,65 ---- |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:07
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/java/net/sf/tail/report Modified Files: Report.java Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Report.java 5 Nov 2007 19:48:52 -0000 1.25 --- Report.java 5 Nov 2007 23:16:10 -0000 1.26 *************** *** 31,38 **** private transient List<Trade> trades; ! private Set<Strategy> strategies; public Report(Set<Strategy> strategies, AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) { - this.strategies = strategies; this.applyedCriterion = criterion; this.decisions = decisions; --- 31,37 ---- private transient List<Trade> trades; ! private String strategiesScript; public Report(Set<Strategy> strategies, AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) { this.applyedCriterion = criterion; this.decisions = decisions; *************** *** 43,50 **** } - public Set<Strategy> getStrategies() { - return strategies; - } - public Number addSummarizedCriteria(AnalysisCriterion criterion) { Number result = criterion.summarize(slicer.getSeries(), decisions); --- 42,45 ---- *************** *** 186,188 **** --- 181,191 ---- this.name = name; } + + public String getStrategiesScript() { + return strategiesScript; + } + + public void setStrategiesScript(String strategiesScript) { + this.strategiesScript = strategiesScript; + } } |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:07
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv714/src/test/net/sf/tail/report Modified Files: ReportTest.java Log Message: Alterado a sereliziação, agora o script é salvo ao inves de set de strategies Index: ReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReportTest.java 31 Oct 2007 19:53:07 -0000 1.6 --- ReportTest.java 5 Nov 2007 23:16:09 -0000 1.7 *************** *** 64,68 **** Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); ! assertEquals("Constrained for: SampleTimeSeries: 09:00 31/12/1969 - 09:00 31/12/1969", report.getSlicePeriodName()); } --- 64,68 ---- Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); ! assertEquals("SampleTimeSeries: 09:00 31/12/1969 - 09:00 31/12/1969", report.getSlicePeriodName()); } |
|
From: Thies <tg...@us...> - 2007-11-05 23:16:03
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv386/src/java/net/sf/tail/i18n Log Message: Directory /cvsroot/tail/Tail/src/java/net/sf/tail/i18n added to the repository |
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-05 21:35:25
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19850/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Colocada ampulheta na geracao dos reports, e ajeitado o excel para parecer mais com o html. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Index.java 5 Nov 2007 17:19:39 -0000 1.46 --- Index.java 5 Nov 2007 21:33:01 -0000 1.47 *************** *** 792,795 **** --- 792,796 ---- fileName += ".xls"; } + this.updateReportProgress(0); CompleteReportGenerator complete = new CompleteReportGenerator(this); complete.generateXLSFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), *************** *** 814,817 **** --- 815,819 ---- directoryPath = directoryPath.substring(0, directoryPath.length() - (1 + directoryName.length())); this.appendConsoleArea("Generating report in HTML."); + this.updateReportProgress(0); CompleteReportGenerator complete = new CompleteReportGenerator(this); try { *************** *** 1039,1046 **** --- 1041,1052 ---- reportProgress.setVisible(false); reportProgress.setValue(value); + Cursor cursor = Cursor.getDefaultCursor(); + setCursor( cursor ); this.appendConsoleArea("Report exported succesfully."); } else { + Cursor cursor = Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR ); + setCursor( cursor ); reportProgress.setVisible(true); reportProgress.setValue(value); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-05 21:35:25
|
Update of /cvsroot/tail/TailS/Data/icons In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19850/Data/icons Modified Files: tails.gif Removed Files: tails.GIF Log Message: Colocada ampulheta na geracao dos reports, e ajeitado o excel para parecer mais com o html. --- tails.GIF DELETED --- Index: tails.gif =================================================================== RCS file: /cvsroot/tail/TailS/Data/icons/tails.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs8EpiCE and /tmp/cvsqqSf6m differ |
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-05 21:35:21
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19833/src/java/net/sf/tail/report/xls Modified Files: ReportXlsGenerator.java CellStylist.java TimeSeriesXlsGenerator.java SliceXlsGenerator.java Log Message: Colocada ampulheta na geracao dos reports, e ajeitado o excel para parecer mais com o html. Index: CellStylist.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CellStylist.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CellStylist.java 17 Oct 2007 17:37:28 -0000 1.7 --- CellStylist.java 5 Nov 2007 21:32:56 -0000 1.8 *************** *** 50,62 **** protected HSSFCellStyle createHeaderCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderTop(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderBottom(HSSFCellStyle.BORDER_MEDIUM); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); HSSFFont font = workbook.createFont(); font.setFontName("Arial"); font.setFontHeightInPoints((short) 12); ! font.setColor(HSSFColor.RED.index); style.setFont(font); return style; --- 50,69 ---- protected HSSFCellStyle createHeaderCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_THIN); ! style.setBorderLeft(HSSFCellStyle.BORDER_THIN); ! style.setBorderTop(HSSFCellStyle.BORDER_THIN); ! style.setBorderBottom(HSSFCellStyle.BORDER_THIN); ! style.setRightBorderColor(HSSFColor.DARK_BLUE.index); ! style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); ! style.setTopBorderColor(HSSFColor.DARK_BLUE.index); ! style.setBottomBorderColor(HSSFColor.DARK_BLUE.index); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); + style.setFillBackgroundColor(HSSFColor.DARK_BLUE.index); + style.setFillForegroundColor(HSSFColor.DARK_BLUE.index); HSSFFont font = workbook.createFont(); font.setFontName("Arial"); font.setFontHeightInPoints((short) 12); ! font.setColor(HSSFColor.WHITE.index); style.setFont(font); return style; *************** *** 65,72 **** protected HSSFCellStyle createFirstCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillBackgroundColor(HSSFColor.AQUA.index); HSSFFont font = workbook.createFont(); --- 72,83 ---- protected HSSFCellStyle createFirstCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_THIN); ! style.setBorderLeft(HSSFCellStyle.BORDER_THIN); ! style.setRightBorderColor(HSSFColor.DARK_BLUE.index); ! style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); ! style.setFillBackgroundColor(HSSFColor.WHITE.index); ! style.setFillForegroundColor(HSSFColor.WHITE.index); HSSFFont font = workbook.createFont(); *************** *** 79,85 **** protected HSSFCellStyle createInternalCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); HSSFFont font = workbook.createFont(); --- 90,119 ---- protected HSSFCellStyle createInternalCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderRight(HSSFCellStyle.BORDER_THIN); ! style.setBorderLeft(HSSFCellStyle.BORDER_THIN); ! style.setRightBorderColor(HSSFColor.DARK_BLUE.index); ! style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); + style.setFillBackgroundColor(HSSFColor.WHITE.index); + style.setFillForegroundColor(HSSFColor.WHITE.index); + + HSSFFont font = workbook.createFont(); + font.setFontName("Arial"); + font.setFontHeightInPoints((short) 12); + style.setFont(font); + return style; + } + + protected HSSFCellStyle createInternal2CellStyle() { + HSSFCellStyle style = workbook.createCellStyle(); + style.setBorderRight(HSSFCellStyle.BORDER_THIN); + style.setBorderLeft(HSSFCellStyle.BORDER_THIN); + style.setRightBorderColor(HSSFColor.DARK_BLUE.index); + style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); + style.setFillBackgroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); + style.setFillForegroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); HSSFFont font = workbook.createFont(); *************** *** 93,108 **** HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderBottom(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderRight(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderTop(HSSFCellStyle.BORDER_MEDIUM); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillBackgroundColor(HSSFColor.BLUE_GREY.index); HSSFFont font = workbook.createFont(); font.setFontName("Courier New"); font.setFontHeightInPoints((short) 15); ! font.setColor(HSSFColor.BLUE.index); ! font.setItalic(true); style.setFont(font); return style; --- 127,147 ---- HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderBottom(HSSFCellStyle.BORDER_THIN); ! style.setBorderRight(HSSFCellStyle.BORDER_THIN); ! style.setBorderLeft(HSSFCellStyle.BORDER_THIN); ! style.setBorderTop(HSSFCellStyle.BORDER_THIN); ! style.setRightBorderColor(HSSFColor.DARK_BLUE.index); ! style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); ! style.setTopBorderColor(HSSFColor.DARK_BLUE.index); ! style.setBottomBorderColor(HSSFColor.DARK_BLUE.index); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); ! style.setFillBackgroundColor(HSSFColor.GREY_25_PERCENT.index); ! style.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); HSSFFont font = workbook.createFont(); font.setFontName("Courier New"); font.setFontHeightInPoints((short) 15); ! font.setColor(HSSFColor.BLACK.index); style.setFont(font); return style; *************** *** 111,115 **** protected void drawImage(File reportPNG, HSSFSheet sheet, int columnStart, int columnEnd) throws IOException { HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); ! HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 1, columnStart, (short) columnEnd, 17); anchor.setAnchorType(3); --- 150,154 ---- protected void drawImage(File reportPNG, HSSFSheet sheet, int columnStart, int columnEnd) throws IOException { HSSFPatriarch patriarch = sheet.createDrawingPatriarch(); ! HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 523, 0, (short) columnStart, 1, (short) columnEnd, 17); anchor.setAnchorType(3); *************** *** 117,128 **** } ! public HSSFCellStyle createLastCellStyle() { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderBottom(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM); ! style.setBorderRight(HSSFCellStyle.BORDER_MEDIUM); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillBackgroundColor(HSSFColor.AQUA.index); HSSFFont font = workbook.createFont(); --- 156,179 ---- } ! public HSSFCellStyle createLastCellStyle(boolean white) { HSSFCellStyle style = workbook.createCellStyle(); ! style.setBorderBottom(HSSFCellStyle.BORDER_THIN); ! style.setBorderLeft(HSSFCellStyle.BORDER_THIN); ! style.setBorderRight(HSSFCellStyle.BORDER_THIN); ! style.setRightBorderColor(HSSFColor.DARK_BLUE.index); ! style.setLeftBorderColor(HSSFColor.DARK_BLUE.index); ! style.setBottomBorderColor(HSSFColor.DARK_BLUE.index); style.setAlignment(HSSFCellStyle.ALIGN_CENTER); ! style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); ! if (white){ ! style.setFillBackgroundColor(HSSFColor.WHITE.index); ! style.setFillForegroundColor(HSSFColor.WHITE.index); ! } ! else ! { ! style.setFillBackgroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); ! style.setFillForegroundColor(HSSFColor.LIGHT_CORNFLOWER_BLUE.index); ! } HSSFFont font = workbook.createFont(); Index: TimeSeriesXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TimeSeriesXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.4 --- TimeSeriesXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.5 *************** *** 44,49 **** row = generateHeader(row, style); ! style = stylist.createInternalCellStyle(); ! generateInternalRow(row, series, style); stylist.rearrangeSheet(sheet, 11); --- 44,50 ---- row = generateHeader(row, style); ! HSSFCellStyle style3 = stylist.createInternalCellStyle(); ! HSSFCellStyle style2 = stylist.createInternal2CellStyle(); ! generateInternalRow(row, series, style3, style2); stylist.rearrangeSheet(sheet, 11); *************** *** 73,77 **** } ! private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) { int i; LOG.info("Initializing Internal rows of the Time Series"); --- 74,79 ---- } ! private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style, HSSFCellStyle style2) { ! boolean even = true; int i; LOG.info("Initializing Internal rows of the Time Series"); *************** *** 81,109 **** int indexcolumn = INDEX_FIRST_COLUMN; HSSFRow row = sheet.createRow((short) firtRow++); ! ! createCell(row, tick.getDate().toString("hh:mm dd/MM/yyyy"), (short) indexcolumn++, style); ! createCell(row, tick.getOpenPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getClosePrice(), (short) indexcolumn++, style); ! createCell(row, tick.getMaxPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getVariation(), (short) indexcolumn++, style); ! createCell(row, tick.getPreviousPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getAmount(), (short) indexcolumn++, style); ! createCell(row, tick.getVolume(), (short) indexcolumn++, style); ! createCell(row, tick.getTrades(), (short) indexcolumn++, style); } ! style = stylist.createLastCellStyle(); Tick tick = series.getTick(i); int indexcolumn = INDEX_FIRST_COLUMN; HSSFRow row = sheet.createRow((short) firtRow++); ! createCell(row, tick.getDate().toString("hh:mm dd/MM/yyyy"), (short) indexcolumn++, style); ! createCell(row, tick.getOpenPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getClosePrice(), (short) indexcolumn++, style); ! createCell(row, tick.getMaxPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getVariation(), (short) indexcolumn++, style); ! createCell(row, tick.getPreviousPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getAmount(), (short) indexcolumn++, style); ! createCell(row, tick.getVolume(), (short) indexcolumn++, style); ! createCell(row, tick.getTrades(), (short) indexcolumn++, style); LOG.info("Ending Internal of the Time Series (" + (System.currentTimeMillis() - time) + " miliseconds)"); --- 83,124 ---- int indexcolumn = INDEX_FIRST_COLUMN; HSSFRow row = sheet.createRow((short) firtRow++); ! if (even){ ! createCell(row, tick.getDate().toString("hh:mm dd/MM/yyyy"), (short) indexcolumn++, style); ! createCell(row, tick.getOpenPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getClosePrice(), (short) indexcolumn++, style); ! createCell(row, tick.getMaxPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getVariation(), (short) indexcolumn++, style); ! createCell(row, tick.getPreviousPrice(), (short) indexcolumn++, style); ! createCell(row, tick.getAmount(), (short) indexcolumn++, style); ! createCell(row, tick.getVolume(), (short) indexcolumn++, style); ! createCell(row, tick.getTrades(), (short) indexcolumn++, style); ! } ! else { ! createCell(row, tick.getDate().toString("hh:mm dd/MM/yyyy"), (short) indexcolumn++, style2); ! createCell(row, tick.getOpenPrice(), (short) indexcolumn++, style2); ! createCell(row, tick.getClosePrice(), (short) indexcolumn++, style2); ! createCell(row, tick.getMaxPrice(), (short) indexcolumn++, style2); ! createCell(row, tick.getVariation(), (short) indexcolumn++, style2); ! createCell(row, tick.getPreviousPrice(), (short) indexcolumn++, style2); ! createCell(row, tick.getAmount(), (short) indexcolumn++, style2); ! createCell(row, tick.getVolume(), (short) indexcolumn++, style2); ! createCell(row, tick.getTrades(), (short) indexcolumn++, style2); ! } ! even = !even; } ! HSSFCellStyle style3 = stylist.createLastCellStyle(even); Tick tick = series.getTick(i); int indexcolumn = INDEX_FIRST_COLUMN; HSSFRow row = sheet.createRow((short) firtRow++); ! createCell(row, tick.getDate().toString("hh:mm dd/MM/yyyy"), (short) indexcolumn++, style3); ! createCell(row, tick.getOpenPrice(), (short) indexcolumn++, style3); ! createCell(row, tick.getClosePrice(), (short) indexcolumn++, style3); ! createCell(row, tick.getMaxPrice(), (short) indexcolumn++, style3); ! createCell(row, tick.getVariation(), (short) indexcolumn++, style3); ! createCell(row, tick.getPreviousPrice(), (short) indexcolumn++, style3); ! createCell(row, tick.getAmount(), (short) indexcolumn++, style3); ! createCell(row, tick.getVolume(), (short) indexcolumn++, style3); ! createCell(row, tick.getTrades(), (short) indexcolumn++, style3); LOG.info("Ending Internal of the Time Series (" + (System.currentTimeMillis() - time) + " miliseconds)"); Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SliceXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.11 --- SliceXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.12 *************** *** 66,70 **** style = stylist.createInternalCellStyle(); ! row = generateInternalRow(row, workbook, sheet, decision, criteria, style); style = stylist.createSummaryCellStyle(); --- 66,71 ---- style = stylist.createInternalCellStyle(); ! HSSFCellStyle style2 = stylist.createInternal2CellStyle(); ! row = generateInternalRow(row, workbook, sheet, decision, criteria, style, style2); style = stylist.createSummaryCellStyle(); *************** *** 107,111 **** private int generateInternalRow(int firtRow, HSSFWorkbook wb, HSSFSheet sheet, Decision decision, ! List<AnalysisCriterion> criteria, HSSFCellStyle style) { LOG.info("Initializing Internal rows of the Decision " + decision.getFileName()); long time = System.currentTimeMillis(); --- 108,114 ---- private int generateInternalRow(int firtRow, HSSFWorkbook wb, HSSFSheet sheet, Decision decision, ! List<AnalysisCriterion> criteria, HSSFCellStyle style2, HSSFCellStyle style3) { ! boolean even = true; ! HSSFCellStyle style = null; LOG.info("Initializing Internal rows of the Decision " + decision.getFileName()); long time = System.currentTimeMillis(); *************** *** 113,116 **** --- 116,125 ---- int index = firtRow - INDEX_FIRST_ROW; for (Trade trade : decision.getTrades()) { + if (even){ + style = style2; + } + else { + style = style3; + } int indexcolumn = 1; HSSFRow rowDecision = sheet.createRow((short) firtRow++); *************** *** 139,142 **** --- 148,152 ---- createCell(rowDecision, calculate, (short) indexcolumn++, style); } + even = !even; } Index: ReportXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ReportXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.11 --- ReportXlsGenerator.java 5 Nov 2007 21:32:56 -0000 1.12 *************** *** 63,72 **** style = stylist.createInternalCellStyle(); ! row = generateInternalRow(row, sheet, report, criteria, style); style = stylist.createSummaryCellStyle(); generateSummaryRow(row, sheet, report, criteria, style); ! stylist.drawImage(charts.get(0), sheet, 1, 5); stylist.rearrangeSheet(sheet, criteria.size() + 5); --- 63,73 ---- style = stylist.createInternalCellStyle(); ! HSSFCellStyle style2 = stylist.createInternal2CellStyle(); ! row = generateInternalRow(row, sheet, report, criteria, style, style2); style = stylist.createSummaryCellStyle(); generateSummaryRow(row, sheet, report, criteria, style); ! stylist.drawImage(charts.get(0), sheet, 1, 4); stylist.rearrangeSheet(sheet, criteria.size() + 5); *************** *** 114,118 **** private int generateInternalRow(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, ! HSSFCellStyle style) { LOG.info("Initializing Internal rows of the Report"); long time = System.currentTimeMillis(); --- 115,121 ---- private int generateInternalRow(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, ! HSSFCellStyle style2, HSSFCellStyle style3) { ! boolean even = false; ! HSSFCellStyle style = null; LOG.info("Initializing Internal rows of the Report"); long time = System.currentTimeMillis(); *************** *** 120,123 **** --- 123,132 ---- int index = firtRow - INDEX_FIRST_ROW; for (Decision decision : report.getDecisions()) { + if (even) { + style = style2; + } + else { + style = style3; + } int indexcolumn = 1; HSSFRow rowDecision = sheet.createRow((short) firtRow++); *************** *** 133,136 **** --- 142,146 ---- createCell(rowDecision, calculate, (short) indexcolumn++, style); } + even = !even; } LOG.info("Ending Internal rows of the Report (" + (System.currentTimeMillis() - time) + " miliseconds)"); |
|
From: Carlos <ma...@us...> - 2007-11-05 19:48:51
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4769/src/java/net/sf/tail/report Modified Files: Report.java Log Message: Lista de trades transformada em transiente Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Report.java 31 Oct 2007 17:51:55 -0000 1.24 --- Report.java 5 Nov 2007 19:48:52 -0000 1.25 *************** *** 29,33 **** private String name; ! private List<Trade> trades; private Set<Strategy> strategies; --- 29,33 ---- private String name; ! private transient List<Trade> trades; private Set<Strategy> strategies; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-05 19:04:44
|
Update of /cvsroot/tail/Tail/Data/templates/slice In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17412/Data/templates/slice Modified Files: chart.ftl Log Message: Atualizando ftl. Index: chart.ftl =================================================================== RCS file: /cvsroot/tail/Tail/Data/templates/slice/chart.ftl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** chart.ftl 5 Nov 2007 18:59:47 -0000 1.2 --- chart.ftl 5 Nov 2007 19:04:47 -0000 1.3 *************** *** 4,9 **** </tr> </table> ! <table align="left"> ! <tr></tr> ! <tr></tr> ! </table> --- 4,7 ---- </tr> </table> ! <br> ! <br> |
