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: Carlos <ma...@us...> - 2007-09-26 20:39:15
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9681/src/java/net/sf/tails/swing/helper Modified Files: FrameHelper.java Log Message: metodos que criam o tablemodel para o JPanel Index: FrameHelper.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrameHelper.java 24 Sep 2007 23:42:26 -0000 1.3 --- FrameHelper.java 26 Sep 2007 20:39:16 -0000 1.4 *************** *** 16,21 **** --- 16,26 ---- import java.util.List; + import javax.swing.table.DefaultTableModel; + import javax.swing.table.TableModel; + import net.sf.tail.AnalysisCriterion; import net.sf.tail.TimeSeriesLoader; + import net.sf.tail.analysis.StockAnalysis; + import net.sf.tail.report.Report; import org.joda.time.DateTime; *************** *** 39,43 **** String fileName = files[i].getName(); if (fileName.endsWith(".java")) { ! criteria.add(fileName.substring(0, (fileName.length() - 5))); } } --- 44,48 ---- String fileName = files[i].getName(); if (fileName.endsWith(".java")) { ! criteria.add(fileName.split(".java")[0]); } } *************** *** 106,108 **** --- 111,147 ---- return str; } + + private static Object[][] getReportMatrix(StockAnalysis stockAnalysis) + { + Object[][] reportMatrix = new Object[stockAnalysis.getReports().size()][2+stockAnalysis.getAdditionalCriteria().size()]; + Report report; + int j; + for (int i = 0; i < stockAnalysis.getReports().size(); i++) { + report = stockAnalysis.getReports().get(i); + j = 0; + reportMatrix[i][j++] = report.getSlicePeriodName(); + reportMatrix[i][j++] = report.getCriterionValue(); + for (AnalysisCriterion criterion : stockAnalysis.getAdditionalCriteria()) { + reportMatrix[i][j++] = criterion.summarize(report.getSlicer().getSeries(), report.getDecisions()); + } + } + return reportMatrix; + } + + private static String[] getColumnNames(StockAnalysis stockAnalysis) + { + String[] columnNames = new String[2+stockAnalysis.getAdditionalCriteria().size()]; + int j = 0; + columnNames[j++] = "Report Name"; + columnNames[j++] = "Applyed Criterion"; + for (AnalysisCriterion criterion : stockAnalysis.getAdditionalCriteria()) { + columnNames[j++] = criterion.getClass().getSimpleName(); + } + return columnNames; + } + + public static TableModel getTableModel(StockAnalysis stockAnalysis) + { + return new DefaultTableModel(getReportMatrix(stockAnalysis), getColumnNames(stockAnalysis)); + } } |
|
From: Carlos <ma...@us...> - 2007-09-26 20:38:40
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9269/src/java/net/sf/tails/swing/frame Modified Files: OpenStockAnalysis.java Log Message: gerando table dos reports do stockanalysis... Index: OpenStockAnalysis.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/OpenStockAnalysis.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** OpenStockAnalysis.java 26 Sep 2007 20:19:02 -0000 1.12 --- OpenStockAnalysis.java 26 Sep 2007 20:38:42 -0000 1.13 *************** *** 16,19 **** --- 16,20 ---- import java.io.FileNotFoundException; import java.io.FileOutputStream; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; *************** *** 21,28 **** import javax.swing.JFileChooser; import javax.swing.JFrame; import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.io.StockAnalysisSerializer; import net.sf.tails.swing.frame.report.NewReportFrame; public class OpenStockAnalysis extends javax.swing.JFrame { --- 22,34 ---- import javax.swing.JFileChooser; import javax.swing.JFrame; + import javax.swing.JOptionPane; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.report.Report; ! import net.sf.tail.report.xls.CompleteXlsGenerator; ! import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tails.swing.frame.report.NewReportFrame; + import net.sf.tails.swing.helper.FrameHelper; public class OpenStockAnalysis extends javax.swing.JFrame { *************** *** 34,38 **** private javax.swing.JMenu fileMenu; private javax.swing.JButton htmlButton; - private javax.swing.JMenuItem indicatorMenuItem; private javax.swing.JMenuBar menuBar; private javax.swing.JMenu newMenu; --- 40,43 ---- *************** *** 75,79 **** newMenu = new javax.swing.JMenu(); stockAnalysisMenuItem = new javax.swing.JMenuItem(); - indicatorMenuItem = new javax.swing.JMenuItem(); saveMenuItem = new javax.swing.JMenuItem(); exitMenuItem = new javax.swing.JMenuItem(); --- 80,83 ---- *************** *** 91,127 **** reportScrollPane.setHorizontalScrollBar(null); reportTable.setAutoCreateRowSorter(true); ! reportTable.setModel(new javax.swing.table.DefaultTableModel( ! new Object [][] { ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null}, ! {null, null, null, null} ! }, ! new String [] { ! "TÃtulo 1", "TÃtulo 2", "TÃtulo 3", "TÃtulo 4" ! } ! )); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); - reportTable.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { - reportTableMouseClicked(evt); - } - }); reportScrollPane.setViewportView(reportTable); --- 95,101 ---- reportScrollPane.setHorizontalScrollBar(null); reportTable.setAutoCreateRowSorter(true); ! ! reportTable.setModel(FrameHelper.getTableModel(stockAnalysis)); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); reportScrollPane.setViewportView(reportTable); *************** *** 167,180 **** newMenu.add(stockAnalysisMenuItem); - indicatorMenuItem.setMnemonic('i'); - indicatorMenuItem.setText("Indicator"); - indicatorMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - indicatorMenuItemActionPerformed(evt); - } - }); - - newMenu.add(indicatorMenuItem); - fileMenu.add(newMenu); --- 141,144 ---- *************** *** 238,253 **** ); pack(); ! }// </editor-fold> ! ! private void reportTableMouseClicked(java.awt.event.MouseEvent evt) { ! // TODO adicione seu código de manipulação aqui: ! } private void xlsButtonActionPerformed(java.awt.event.ActionEvent evt) { ! // TODO adicione seu código de manipulação aqui: } private void htmlButtonActionPerformed(java.awt.event.ActionEvent evt) { ! // TODO adicione seu código de manipulação aqui: } --- 202,227 ---- ); pack(); ! }// </editor-fold> private void xlsButtonActionPerformed(java.awt.event.ActionEvent evt) { ! if (reportTable.getSelectedRow() == -1) ! { ! JOptionPane.showMessageDialog(null, "Please select the report you want to export to XLS.", "Error", 2); ! } ! else ! { ! CompleteXlsGenerator xlsGenerator = new CompleteXlsGenerator(); ! Report report = stockAnalysis.getReports().get(reportTable.getSelectedRow()); ! try { ! xlsGenerator.generate(report, stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod()); ! ! } catch (Exception e) { ! JOptionPane.showMessageDialog(null, ".", "Error", 0); ! } ! } } private void htmlButtonActionPerformed(java.awt.event.ActionEvent evt) { ! // TODO adicione seu código de manipulação aqui: } *************** *** 262,266 **** private void saveMenuItemActionPerformed(java.awt.event.ActionEvent evt) { ! int value = directoryFileChooser.showOpenDialog(this); switch(value) { --- 236,240 ---- private void saveMenuItemActionPerformed(java.awt.event.ActionEvent evt) { ! int value = directoryFileChooser.showSaveDialog(this); switch(value) { *************** *** 281,289 **** break; } ! } ! ! private void indicatorMenuItemActionPerformed(java.awt.event.ActionEvent evt) { ! // TODO adicione seu código de manipulação aqui: ! } private void stockAnalysisMenuItemActionPerformed(java.awt.event.ActionEvent evt) { --- 255,259 ---- break; } ! } private void stockAnalysisMenuItemActionPerformed(java.awt.event.ActionEvent evt) { |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:19:23
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv585/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NewReportFrame.java 24 Sep 2007 22:18:41 -0000 1.1 --- NewReportFrame.java 26 Sep 2007 20:19:03 -0000 1.2 *************** *** 10,15 **** import net.sf.tail.dsl.TailDSL; import net.sf.tail.dsl.ruby.RubyDSL; - import net.sf.tail.dsl.ruby.RubyDSLTest; - import net.sf.tail.report.Report; import net.sf.tails.swing.frame.OpenStockAnalysis; --- 10,13 ---- *************** *** 209,213 **** pack(); } ! private void defaultPanelCreateButtonActionPerformed(java.awt.event.ActionEvent evt) { // TODO adicione seu código de manipulação aqui: --- 207,211 ---- pack(); } ! private void defaultPanelCreateButtonActionPerformed(java.awt.event.ActionEvent evt) { // TODO adicione seu código de manipulação aqui: *************** *** 219,234 **** private void customStrategyCreateButtonActionPerformed(java.awt.event.ActionEvent evt) { ! TailDSL dsl = new RubyDSL(read("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries()); ! Set<Strategy> strategies; try { ! strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! Report report = stockAnalysis.createReport(strategies); ! new OpenStockAnalysis(stockAnalysis); ! this.dispose(); } catch (ScriptException e) { - // TODO Auto-generated catch block e.printStackTrace(); } ! } --- 217,232 ---- private void customStrategyCreateButtonActionPerformed(java.awt.event.ActionEvent evt) { ! try { ! TailDSL dsl = new RubyDSL(read("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries()); ! Set<Strategy> strategies; ! strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.createReport(strategies); ! new OpenStockAnalysis(stockAnalysis); ! this.dispose(); } catch (ScriptException e) { e.printStackTrace(); } ! } *************** *** 239,243 **** private static String read(String name) { String text = ""; ! Scanner scanner = new Scanner(RubyDSLTest.class.getResourceAsStream(name)); while (scanner.hasNextLine()) { text += scanner.nextLine() + "\n"; --- 237,241 ---- private static String read(String name) { String text = ""; ! Scanner scanner = new Scanner(NewReportFrame.class.getResourceAsStream(name)); while (scanner.hasNextLine()) { text += scanner.nextLine() + "\n"; *************** *** 245,249 **** return text; } ! public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { --- 243,247 ---- return text; } ! public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:19:23
|
Update of /cvsroot/tail/TailS In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv585 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/tail/TailS/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .classpath 26 Sep 2007 19:37:41 -0000 1.6 --- .classpath 26 Sep 2007 20:19:03 -0000 1.7 *************** *** 6,14 **** <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFX"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> - <classpathentry kind="lib" path="lib/Tail.jar" sourcepath="/Tail/src"/> <classpathentry kind="lib" path="lib/joda-time-1.4.jar" sourcepath="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> - <classpathentry kind="src" path="dsl"/> <classpathentry kind="lib" path="D:/workspace/Tail/tail-0.6-SNAPSHOT.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --- 6,13 ---- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFX"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="lib" path="lib/joda-time-1.4.jar" sourcepath="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="D:/workspace/Tail/tail-0.6-SNAPSHOT.jar"/> + <classpathentry kind="src" path="dsl"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:19:23
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv585/src/java/net/sf/tails/swing/frame Modified Files: OpenStockAnalysis.java NewStockAnalysis3.java Index.java NewStockAnalysis.java Log Message: Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Index.java 24 Sep 2007 23:43:40 -0000 1.9 --- Index.java 26 Sep 2007 20:19:02 -0000 1.10 *************** *** 13,17 **** import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.io.Serializer; import net.sf.tails.swing.helper.FrameHelper; --- 13,17 ---- import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.io.StockAnalysisSerializer; import net.sf.tails.swing.helper.FrameHelper; *************** *** 109,113 **** case JFileChooser.APPROVE_OPTION: String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath(); ! Serializer<StockAnalysis> serializer = new Serializer<StockAnalysis>(); try { String stringAnalysis = FrameHelper.readFile(filePath); --- 109,113 ---- case JFileChooser.APPROVE_OPTION: String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath(); ! StockAnalysisSerializer serializer = new StockAnalysisSerializer(); try { String stringAnalysis = FrameHelper.readFile(filePath); Index: NewStockAnalysis.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/NewStockAnalysis.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NewStockAnalysis.java 24 Sep 2007 22:27:47 -0000 1.9 --- NewStockAnalysis.java 26 Sep 2007 20:19:02 -0000 1.10 *************** *** 20,24 **** import net.sf.tail.analysis.Stock; ! import net.sf.tail.io.Serializer; import net.sf.tails.swing.helper.FrameHelper; --- 20,24 ---- import net.sf.tail.analysis.Stock; ! import net.sf.tail.io.StockSerializer; import net.sf.tails.swing.helper.FrameHelper; *************** *** 271,275 **** else { ! Serializer<Stock> stockSerializer = new Serializer<Stock>(); Stock stock = null; if (stockButtonGroup.isSelected(newRadioButton.getModel())) --- 271,275 ---- else { ! StockSerializer stockSerializer = new StockSerializer(); Stock stock = null; if (stockButtonGroup.isSelected(newRadioButton.getModel())) Index: NewStockAnalysis3.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/NewStockAnalysis3.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NewStockAnalysis3.java 24 Sep 2007 22:07:07 -0000 1.5 --- NewStockAnalysis3.java 26 Sep 2007 20:19:02 -0000 1.6 *************** *** 84,89 **** cancelButton = new javax.swing.JButton(); ! DateTime date = new DateTime(); ! date = stock.getSeries().getTick(stock.getSeries().getBegin()).getDate(); startDateField.setText(date.getDayOfMonth() + "/" + date.getMonthOfYear() + "/" + date.getYear()); --- 84,88 ---- cancelButton = new javax.swing.JButton(); ! DateTime date = stock.getSeries().getTick(stock.getSeries().getBegin()).getDate(); startDateField.setText(date.getDayOfMonth() + "/" + date.getMonthOfYear() + "/" + date.getYear()); Index: OpenStockAnalysis.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/OpenStockAnalysis.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** OpenStockAnalysis.java 26 Sep 2007 17:01:41 -0000 1.11 --- OpenStockAnalysis.java 26 Sep 2007 20:19:02 -0000 1.12 *************** *** 23,27 **** import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.io.Serializer; import net.sf.tails.swing.frame.report.NewReportFrame; --- 23,27 ---- import net.sf.tail.analysis.StockAnalysis; ! import net.sf.tail.io.StockAnalysisSerializer; import net.sf.tails.swing.frame.report.NewReportFrame; *************** *** 266,270 **** { case JFileChooser.APPROVE_OPTION: ! Serializer<StockAnalysis> serializer = new Serializer<StockAnalysis>(); String xmlFile = serializer.toXML(stockAnalysis); String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath(); --- 266,270 ---- { case JFileChooser.APPROVE_OPTION: ! StockAnalysisSerializer serializer = new StockAnalysisSerializer(); String xmlFile = serializer.toXML(stockAnalysis); String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:19:23
|
Update of /cvsroot/tail/TailS/javafxOld In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv585/javafxOld Modified Files: StockAnalisysFrame3.fx Log Message: Index: StockAnalisysFrame3.fx =================================================================== RCS file: /cvsroot/tail/TailS/javafxOld/StockAnalisysFrame3.fx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockAnalisysFrame3.fx 20 Sep 2007 23:06:00 -0000 1.1 --- StockAnalisysFrame3.fx 26 Sep 2007 20:19:02 -0000 1.2 *************** *** 16,20 **** import net.sf.tail.OperationType; import java.text.DecimalFormat; - import net.sf.tail.io.Serializer; import org.joda.time.DateTime; --- 16,19 ---- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:17:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32177/src/test/net/sf/tail/report Modified Files: ReportImageTest.java Log Message: Index: ReportImageTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportImageTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReportImageTest.java 26 Sep 2007 19:36:23 -0000 1.2 --- ReportImageTest.java 26 Sep 2007 20:16:48 -0000 1.3 *************** *** 31,37 **** private ReportImage image; ! protected static final String FM_REPORT_DIR = "reports/"; ! protected static final String FM_CHART_DIR = "PNGCharts/"; @Before --- 31,37 ---- private ReportImage image; ! protected static final String FM_REPORT_DIR = "reports\\"; ! protected static final String FM_CHART_DIR = "PNGCharts\\"; @Before |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 20:17:13
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32177/src/java/net/sf/tail/analysis Modified Files: Stock.java Log Message: Index: Stock.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/Stock.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Stock.java 25 Sep 2007 00:02:28 -0000 1.4 --- Stock.java 26 Sep 2007 20:16:48 -0000 1.5 *************** *** 33,40 **** } ! public TimeSeries getSeries() throws IOException { - if(series == null) - series = reloadSeries(); return series; } --- 33,38 ---- } ! public TimeSeries getSeries() { return series; } |
|
From: xanaot <xa...@us...> - 2007-09-26 20:06:21
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27814/src/java/net/sf/tail/report/xls Modified Files: CompleteXlsGenerator.java Log Message: tirando hardcoded do nome do report dentro do metodo generate. Index: CompleteXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CompleteXlsGenerator.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CompleteXlsGenerator.java 26 Sep 2007 18:25:47 -0000 1.8 --- CompleteXlsGenerator.java 26 Sep 2007 20:06:13 -0000 1.9 *************** *** 37,41 **** ! FileOutputStream fileOut = new FileOutputStream("report.xls"); workbook.write(fileOut); fileOut.close(); --- 37,41 ---- ! FileOutputStream fileOut = new FileOutputStream(report.getName()); workbook.write(fileOut); fileOut.close(); |
|
From: xanaot <xa...@us...> - 2007-09-26 19:55:55
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23083/src/java/net/sf/tail/report Modified Files: Report.java Log Message: ajeitando os metodos getName()... Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Report.java 26 Sep 2007 19:42:21 -0000 1.17 --- Report.java 26 Sep 2007 19:55:57 -0000 1.18 *************** *** 115,125 **** return true; } ! ! public String getName() { ! return name; } ! public void setName(String name) { ! this.name = name; } --- 115,125 ---- return true; } ! ! public String getSlicePeriodName() { ! return slicer.getSeries().getName() + ": " + slicer.getSeries().getPeriod(); } ! public String getName() { ! return name; } |
|
From: xanaot <xa...@us...> - 2007-09-26 19:42:42
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17451/src/java/net/sf/tail/report/xls Modified Files: ReportXlsGenerator.java Log Message: tirando um warning... Index: ReportXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReportXlsGenerator.java 26 Sep 2007 18:25:47 -0000 1.5 --- ReportXlsGenerator.java 26 Sep 2007 19:42:38 -0000 1.6 *************** *** 106,110 **** createCell(rowFirst, " - ", (short) indexcolumn++, style); ! for (AnalysisCriterion criterium : criteria) { createCell(rowFirst, " - ", (short) indexcolumn++, style); } --- 106,111 ---- createCell(rowFirst, " - ", (short) indexcolumn++, style); ! for (int i=0; i < criteria.size(); i++) ! { createCell(rowFirst, " - ", (short) indexcolumn++, style); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:42:19
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17440/src/java/net/sf/tail/report Modified Files: Report.java Log Message: Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Report.java 26 Sep 2007 19:36:22 -0000 1.16 --- Report.java 26 Sep 2007 19:42:21 -0000 1.17 *************** *** 15,19 **** private transient List<Decision> decisions; ! private transient TimeSeriesSlicer slicer; private AnalysisCriterion applyedCriterion; --- 15,19 ---- private transient List<Decision> decisions; ! private TimeSeriesSlicer slicer; private AnalysisCriterion applyedCriterion; *************** *** 65,68 **** --- 65,70 ---- + + @Override public int hashCode() { *************** *** 72,75 **** --- 74,79 ---- result = prime * result + ((applyedCriterion == null) ? 0 : applyedCriterion.hashCode()); result = prime * result + ((criterionValue == null) ? 0 : criterionValue.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((slicer == null) ? 0 : slicer.hashCode()); return result; } *************** *** 99,106 **** } else if (!criterionValue.equals(other.criterionValue)) return false; return true; } - public String getName() { return name; --- 103,119 ---- } else if (!criterionValue.equals(other.criterionValue)) return false; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (slicer == null) { + if (other.slicer != null) + return false; + } else if (!slicer.equals(other.slicer)) + return false; return true; } public String getName() { return name; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:37:39
|
Update of /cvsroot/tail/TailS In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15306 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/tail/TailS/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .classpath 25 Sep 2007 00:07:08 -0000 1.5 --- .classpath 26 Sep 2007 19:37:41 -0000 1.6 *************** *** 9,14 **** <classpathentry kind="lib" path="lib/joda-time-1.4.jar" sourcepath="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> - <classpathentry combineaccessrules="false" kind="src" path="/Tail"/> <classpathentry kind="src" path="dsl"/> <classpathentry kind="output" path="bin"/> </classpath> --- 9,14 ---- <classpathentry kind="lib" path="lib/joda-time-1.4.jar" sourcepath="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="src" path="dsl"/> + <classpathentry kind="lib" path="D:/workspace/Tail/tail-0.6-SNAPSHOT.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:37:39
|
Update of /cvsroot/tail/TailS/javafxOld In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15306/javafxOld Modified Files: TailSApp.fx Log Message: Index: TailSApp.fx =================================================================== RCS file: /cvsroot/tail/TailS/javafxOld/TailSApp.fx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TailSApp.fx 20 Sep 2007 23:06:00 -0000 1.1 --- TailSApp.fx 26 Sep 2007 19:37:41 -0000 1.2 *************** *** 5,9 **** import javafxdemoapplication.*; import java.awt.Toolkit; ! import StockAnalisysFrame1; class ButtonClickModel { --- 5,9 ---- import javafxdemoapplication.*; import java.awt.Toolkit; ! //import StockAnalisysFrame1; class ButtonClickModel { *************** *** 30,34 **** action: operation() { ! var newAnalysisFrame = new NewAnalysisFrame1(); } }; --- 30,34 ---- action: operation() { ! // var newAnalysisFrame = new NewAnalysisFrame1(); } }; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:54
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail/series Modified Files: SlicerByTimePeriodTest.java Log Message: Index: SlicerByTimePeriodTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/SlicerByTimePeriodTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SlicerByTimePeriodTest.java 4 Sep 2007 13:09:15 -0000 1.3 --- SlicerByTimePeriodTest.java 26 Sep 2007 19:36:21 -0000 1.4 *************** *** 21,24 **** --- 21,60 ---- this.date = new DateTime(0); } + + @Test + public void testApllyForSeries(){ + series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date + .withYear(2003), date.withYear(2004)); + Period period = new Period().withYears(1); + + TimeSeriesSlicer slicer = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); + + TimeSeriesSlicer newSlicer = slicer.applyForSeries(series); + + assertEquals(slicer, newSlicer); + + + + series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000), date + .withYear(2001), date.withYear(2001), date.withYear(2001), date.withYear(2002), date.withYear(2002), + date.withYear(2002), date.withYear(2002), date.withYear(2003)); + + + newSlicer = slicer.applyForSeries(series); + + assertEquals(4, newSlicer.getSlices()); + + assertEquals(0, newSlicer.getSlice(0).getBegin()); + assertEquals(2, newSlicer.getSlice(0).getEnd()); + + assertEquals(3, newSlicer.getSlice(1).getBegin()); + assertEquals(5, newSlicer.getSlice(1).getEnd()); + + assertEquals(6, newSlicer.getSlice(2).getBegin()); + assertEquals(9, newSlicer.getSlice(2).getEnd()); + + assertEquals(10, newSlicer.getSlice(3).getBegin()); + assertEquals(10, newSlicer.getSlice(3).getEnd()); + } @Test |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:49
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail/dsl/ruby Modified Files: EMAStrategies3.rb RubyDSLTest.java Log Message: Index: RubyDSLTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby/RubyDSLTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RubyDSLTest.java 20 Sep 2007 23:11:38 -0000 1.2 --- RubyDSLTest.java 26 Sep 2007 19:36:21 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertTrue; import java.util.ArrayList; *************** *** 36,42 **** String text = read("EMAStrategies3.rb"); ! List<Strategy> defaultStrategies = new ArrayList<Strategy>(); for (int i = 1; i <= 50; i++) { ! defaultStrategies.add(new IndicatorCrossedIndicatorStrategy(close,new EMAIndicator(close,i))); } --- 37,43 ---- String text = read("EMAStrategies3.rb"); ! List<String> defaultStrategies = new ArrayList<String>(); for (int i = 1; i <= 50; i++) { ! defaultStrategies.add(new IndicatorCrossedIndicatorStrategy(close,new EMAIndicator(close,i)).getName()); } *************** *** 44,50 **** Set<Strategy> dslStrategies = dsl.evalStrategies(text); - int index = 0; for (Strategy strategy : dslStrategies) { ! assertEquals(defaultStrategies.get(index++).getName(), strategy.getName()); } } --- 45,50 ---- Set<Strategy> dslStrategies = dsl.evalStrategies(text); for (Strategy strategy : dslStrategies) { ! assertTrue(defaultStrategies.contains(strategy.getName())); } } Index: EMAStrategies3.rb =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby/EMAStrategies3.rb,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EMAStrategies3.rb 20 Sep 2007 23:11:38 -0000 1.2 --- EMAStrategies3.rb 26 Sep 2007 19:36:20 -0000 1.3 *************** *** 1,5 **** (1..50).collect{|numero| ! cross($close, ema(numero)) } --- 1,5 ---- (1..50).collect{|numero| ! $strategies.add(cross($close, ema(numero))) } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:49
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail/analysis Modified Files: StockTest.java Log Message: Index: StockTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockTest.java 25 Sep 2007 00:09:47 -0000 1.3 --- StockTest.java 26 Sep 2007 19:36:21 -0000 1.4 *************** *** 1,5 **** package net.sf.tail.analysis; ! import static org.junit.Assert.*; import java.io.FileInputStream; --- 1,5 ---- package net.sf.tail.analysis; ! import static org.junit.Assert.assertEquals; import java.io.FileInputStream; *************** *** 7,11 **** import java.io.IOException; ! import net.sf.tail.io.Serializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.series.DefaultTimeSeries; --- 7,11 ---- import java.io.IOException; ! import net.sf.tail.io.StockSerializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.series.DefaultTimeSeries; *************** *** 42,46 **** @Test public void testReloadSeries() throws IOException{ ! Serializer<Stock> serializer = new Serializer<Stock>(); String serialized = serializer.toXML(stock); Stock afterSerializedStock = serializer.fromXML(serialized); --- 42,46 ---- @Test public void testReloadSeries() throws IOException{ ! StockSerializer serializer = new StockSerializer(); String serialized = serializer.toXML(stock); Stock afterSerializedStock = serializer.fromXML(serialized); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:30
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail Modified Files: ReportXmlSerializerTest.java StockAnalysisXmlSerializerTest.java Log Message: Index: StockAnalysisXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/StockAnalysisXmlSerializerTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StockAnalysisXmlSerializerTest.java 4 Sep 2007 13:09:15 -0000 1.4 --- StockAnalysisXmlSerializerTest.java 26 Sep 2007 19:36:21 -0000 1.5 *************** *** 20,24 **** import net.sf.tail.indicator.tracker.SMAIndicator; import net.sf.tail.indicator.tracker.WilliamsRIndicator; ! import net.sf.tail.io.Serializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; --- 20,24 ---- import net.sf.tail.indicator.tracker.SMAIndicator; import net.sf.tail.indicator.tracker.WilliamsRIndicator; ! import net.sf.tail.io.StockAnalysisSerializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; *************** *** 82,86 **** stockAnalysis.createReport(strategies); ! Serializer<StockAnalysis> serializer = new Serializer<StockAnalysis>(); String xml = serializer.toXML(stockAnalysis); --- 82,86 ---- stockAnalysis.createReport(strategies); ! StockAnalysisSerializer serializer = new StockAnalysisSerializer(); String xml = serializer.toXML(stockAnalysis); Index: ReportXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ReportXmlSerializerTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportXmlSerializerTest.java 4 Sep 2007 13:09:15 -0000 1.3 --- ReportXmlSerializerTest.java 26 Sep 2007 19:36:21 -0000 1.4 *************** *** 15,19 **** import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; ! import net.sf.tail.io.Serializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.report.Report; --- 15,19 ---- import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; ! import net.sf.tail.io.ReportSerializer; import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.report.Report; *************** *** 53,57 **** new SlicerByTimePeriod(timeSeries, new Period().withDays(1), SlicerType.MEMORIZED), new TotalProfitCriterion()); ! Serializer<Report> serializer = new Serializer<Report>(); String xml = serializer.toXML(r); --- 53,57 ---- new SlicerByTimePeriod(timeSeries, new Period().withDays(1), SlicerType.MEMORIZED), new TotalProfitCriterion()); ! ReportSerializer serializer = new ReportSerializer(); String xml = serializer.toXML(r); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:24
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/java/net/sf/tail/series Modified Files: SlicerByTimePeriod.java Log Message: Index: SlicerByTimePeriod.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/SlicerByTimePeriod.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SlicerByTimePeriod.java 26 Sep 2007 19:13:51 -0000 1.4 --- SlicerByTimePeriod.java 26 Sep 2007 19:36:21 -0000 1.5 *************** *** 41,44 **** --- 41,48 ---- } + public TimeSeriesSlicer applyForSeries(TimeSeries series) { + return new SlicerByTimePeriod(series,period,slicerType); + } + public TimeSeriesSlicer applyForType(SlicerType type) { if (type == this.slicerType) { *************** *** 47,51 **** return new SlicerByTimePeriod(this.series, this.period, this.periodBegin, type); } ! private void split() { LOG.debug(String.format("Spliting %s ", series)); --- 51,55 ---- return new SlicerByTimePeriod(this.series, this.period, this.periodBegin, type); } ! private void split() { LOG.debug(String.format("Spliting %s ", series)); *************** *** 135,139 **** } ! public String getPeriodName() { return this.periodBegin.toString("hh:mm dd/MM/yyyy - ") + series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); --- 139,143 ---- } ! public String getPeriodName() { return this.periodBegin.toString("hh:mm dd/MM/yyyy - ") + series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); *************** *** 184,186 **** --- 188,191 ---- return true; } + } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:21
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/java/net/sf/tail Modified Files: TimeSeriesSlicer.java Log Message: Index: TimeSeriesSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesSlicer.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TimeSeriesSlicer.java 26 Sep 2007 19:32:38 -0000 1.8 --- TimeSeriesSlicer.java 26 Sep 2007 19:36:22 -0000 1.9 *************** *** 14,17 **** --- 14,18 ---- String getName(); + String getPeriodName(); *************** *** 22,24 **** --- 23,27 ---- TimeSeriesSlicer applyForType(SlicerType type); + + TimeSeriesSlicer applyForSeries(TimeSeries series); } \ No newline at end of file |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:21
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail/report Modified Files: ReportImageTest.java Log Message: Index: ReportImageTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportImageTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReportImageTest.java 25 Sep 2007 00:04:23 -0000 1.1 --- ReportImageTest.java 26 Sep 2007 19:36:23 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.sf.tail.report; + import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.IOException; *************** *** 16,20 **** import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.FakeStrategy; - import static org.junit.Assert.*; import org.joda.time.Period; --- 18,21 ---- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:21
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/test/net/sf/tail/indicator/helper Modified Files: DirectionalMovementUpIndicatorTest.java DirectionalMovementDownIndicatorTest.java Log Message: Index: DirectionalMovementUpIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/helper/DirectionalMovementUpIndicatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectionalMovementUpIndicatorTest.java 17 Sep 2007 21:49:24 -0000 1.1 --- DirectionalMovementUpIndicatorTest.java 26 Sep 2007 19:36:22 -0000 1.2 *************** *** 1,5 **** package net.sf.tail.indicator.helper; ! import static org.junit.Assert.*; import java.util.ArrayList; --- 1,5 ---- package net.sf.tail.indicator.helper; ! import static org.junit.Assert.assertEquals; import java.util.ArrayList; Index: DirectionalMovementDownIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/helper/DirectionalMovementDownIndicatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectionalMovementDownIndicatorTest.java 17 Sep 2007 21:49:24 -0000 1.1 --- DirectionalMovementDownIndicatorTest.java 26 Sep 2007 19:36:22 -0000 1.2 *************** *** 1,5 **** package net.sf.tail.indicator.helper; ! import static org.junit.Assert.*; import java.util.ArrayList; --- 1,5 ---- package net.sf.tail.indicator.helper; ! import static org.junit.Assert.assertEquals; import java.util.ArrayList; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:21
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/java/net/sf/tail/io Added Files: ReportSerializer.java StockSerializer.java StockAnalysisSerializer.java Removed Files: Serializer.java Log Message: --- NEW FILE: StockSerializer.java --- package net.sf.tail.io; import java.io.IOException; import net.sf.tail.analysis.Stock; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; public class StockSerializer { public String toXML(Stock stock) { XStream xstream = new XStream(new DomDriver()); xstream.setMode(XStream.NO_REFERENCES); return xstream.toXML(stock); } @SuppressWarnings("unchecked") public Stock fromXML(String xml) throws IOException { XStream xstream = new XStream(new DomDriver()); Stock stock = (Stock) xstream.fromXML(xml); stock.reloadSeries(); return stock; } } --- NEW FILE: StockAnalysisSerializer.java --- package net.sf.tail.io; import java.io.IOException; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.Stock; import net.sf.tail.analysis.StockAnalysis; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; public class StockAnalysisSerializer { public String toXML(StockAnalysis analysis) { XStream xstream = new XStream(new DomDriver()); xstream.setMode(XStream.NO_REFERENCES); return xstream.toXML(analysis); } @SuppressWarnings("unchecked") public StockAnalysis fromXML(String xml) throws IOException { XStream xstream = new XStream(new DomDriver()); StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml); Stock newStock = analysis.getStock(); newStock.reloadSeries(); TimeSeriesSlicer newSlicer = analysis.getSlicer().applyForSeries(newStock.getSeries()); StockAnalysis newAnalysis = new StockAnalysis(newStock,analysis.getApplyedCriterion(),newSlicer, analysis.getEvaluator()); //TODO Arrebentamos com o encapsulamento ! newAnalysis.getReports().addAll(analysis.getReports()); return analysis; } } --- Serializer.java DELETED --- --- NEW FILE: ReportSerializer.java --- package net.sf.tail.io; import java.io.IOException; import net.sf.tail.report.Report; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; public class ReportSerializer { public String toXML(Report report) { XStream xstream = new XStream(new DomDriver()); xstream.setMode(XStream.NO_REFERENCES); return xstream.toXML(report); } @SuppressWarnings("unchecked") public Report fromXML(String xml) throws IOException { XStream xstream = new XStream(new DomDriver()); Report report = (Report) xstream.fromXML(xml); return report; } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:21
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/src/java/net/sf/tail/dsl/ruby Modified Files: RubyDSL.java Log Message: Index: RubyDSL.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby/RubyDSL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RubyDSL.java 20 Sep 2007 23:11:39 -0000 1.2 --- RubyDSL.java 26 Sep 2007 19:36:22 -0000 1.3 *************** *** 1,7 **** package net.sf.tail.dsl.ruby; ! import java.util.Arrays; ! import java.util.LinkedHashSet; ! import java.util.List; import java.util.Set; --- 1,5 ---- package net.sf.tail.dsl.ruby; ! import java.util.HashSet; import java.util.Set; *************** *** 17,22 **** import net.sf.tail.indicator.simple.ClosePriceIndicator; - import org.jruby.RubyArray; - public class RubyDSL implements TailDSL { --- 15,18 ---- *************** *** 49,60 **** ScriptEngine engine = factory.getEngineByName("jruby"); engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! Object o = engine.eval(header + code); ! RubyArray array = (RubyArray) o; ! List<Strategy> strategies = Arrays.asList((Strategy[]) array.toArray(new Strategy[0])); ! return new LinkedHashSet<Strategy>(strategies); } --- 45,57 ---- ScriptEngine engine = factory.getEngineByName("jruby"); + Set<Strategy> strategies = new HashSet<Strategy>(); + engine.put("strategies", strategies); engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! engine.eval(header + code); ! ! return strategies; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-09-26 19:36:20
|
Update of /cvsroot/tail/Tail/lib/dsl/ruby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14368/lib/dsl/ruby Modified Files: jruby.jar Log Message: Index: jruby.jar =================================================================== RCS file: /cvsroot/tail/Tail/lib/dsl/ruby/jruby.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsgYyWYl and /tmp/cvsH4YBqJ differ |
