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: Márcio V. d. S. <mv...@us...> - 2007-10-15 23:36:43
|
Update of /cvsroot/tail/Tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6913 Modified Files: .classpath Log Message: otimizando Xs Index: .classpath =================================================================== RCS file: /cvsroot/tail/Tail/.classpath,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** .classpath 8 Oct 2007 21:02:31 -0000 1.22 --- .classpath 15 Oct 2007 23:36:45 -0000 1.23 *************** *** 27,30 **** --- 27,31 ---- <classpathentry kind="lib" path="lib/jython.jar"/> <classpathentry kind="lib" path="lib/jython-engine-1.0-jdk14.jar"/> + <classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFX"/> <classpathentry kind="output" path="bin"/> |
|
From: Carlos <ma...@us...> - 2007-10-15 23:13:04
|
Update of /cvsroot/tail/TailS/Data/Xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29478/Data/Xls Removed Files: commitThisDirectory Log Message: csv menor para teste e apagando os arquivos inúteis. --- commitThisDirectory DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-15 23:13:04
|
Update of /cvsroot/tail/TailS/Data/Html In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29478/Data/Html Removed Files: commitThisDirectory Log Message: csv menor para teste e apagando os arquivos inúteis. --- commitThisDirectory DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-15 23:13:04
|
Update of /cvsroot/tail/TailS/Data/Bovespa/diario In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29478/Data/Bovespa/diario Added Files: dia.csv Log Message: csv menor para teste e apagando os arquivos inúteis. --- NEW FILE: dia.csv --- (This appears to be a binary file; contents omitted.) |
|
From: Carlos <ma...@us...> - 2007-10-15 23:05:37
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26325/src/java/net/sf/tails/swing/helper Modified Files: CompleteReportGenerator.java Log Message: Update... Correcao na porcentagem do progress bar. Index: CompleteReportGenerator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CompleteReportGenerator.java 15 Oct 2007 20:09:35 -0000 1.3 --- CompleteReportGenerator.java 15 Oct 2007 23:05:39 -0000 1.4 *************** *** 57,64 **** try { index.updateReportProgress(0); ! int percent = 44 / report.getDecisions().size(); for (Decision decision : report.getDecisions()) { charts.add(generateImage(decision, filePath)); ! index.updateReportProgress(charts.size() * percent); } charts.add(0, generateImage(report, period, filePath)); --- 57,64 ---- try { index.updateReportProgress(0); ! double percent = 44 / report.getDecisions().size(); for (Decision decision : report.getDecisions()) { charts.add(generateImage(decision, filePath)); ! index.updateReportProgress((int)(charts.size() * percent)); } charts.add(0, generateImage(report, period, filePath)); *************** *** 90,94 **** public void run() { index.updateReportProgress(0); ! int percent = 43 / report.getDecisions().size(); new File(reportDir).mkdir(); new File(styleDir).mkdir(); --- 90,94 ---- public void run() { index.updateReportProgress(0); ! double percent = 43 / report.getDecisions().size(); new File(reportDir).mkdir(); new File(styleDir).mkdir(); *************** *** 104,112 **** StringBuffer decisionHtml = generator.generate(decision, criteria, chartFile.getAbsolutePath()); - index.updateReportProgress((urls.size() + 1) * percent); File decisionFile = createHTML(decision.getFileName() + ".html", decisionHtml, decisionDir); urls.add(decisionFile.getAbsolutePath()); ! index.updateReportProgress(urls.size() * percent + 1); } File reportChartFile = generateImage(report, period, chartDir); --- 104,111 ---- StringBuffer decisionHtml = generator.generate(decision, criteria, chartFile.getAbsolutePath()); File decisionFile = createHTML(decision.getFileName() + ".html", decisionHtml, decisionDir); urls.add(decisionFile.getAbsolutePath()); ! index.updateReportProgress((int)(urls.size() * percent)); } File reportChartFile = generateImage(report, period, chartDir); |
|
From: xanaot <xa...@us...> - 2007-10-15 22:14:56
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/strategy In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4080/src/test/net/sf/tail/strategy Added Files: NotSoFastStrategyTest.java Log Message: NotSoFastStrategy --- NEW FILE: NotSoFastStrategyTest.java --- package net.sf.tail.strategy; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import net.sf.tail.Operation; import net.sf.tail.OperationType; import org.junit.Before; import org.junit.Test; public class NotSoFastStrategyTest { private NotSoFastStrategy strategy; private Operation[] enter; private Operation[] exit; private FakeStrategy fakeStrategy; @Before public void setUp() { enter = new Operation[] { new Operation(0, OperationType.BUY), null, null, null, null, null }; exit = new Operation[] { null, new Operation(1, OperationType.SELL), null, new Operation(3, OperationType.SELL), new Operation(4, OperationType.SELL), new Operation(5, OperationType.SELL), }; fakeStrategy = new FakeStrategy(enter, exit); } @Test public void testWith3Ticks() { strategy = new NotSoFastStrategy(fakeStrategy, 3); assertTrue(strategy.shouldEnter(0)); assertFalse(strategy.shouldExit(0)); assertFalse(strategy.shouldExit(1)); assertFalse(strategy.shouldExit(2)); assertFalse(strategy.shouldExit(3)); assertTrue(strategy.shouldExit(4)); assertTrue(strategy.shouldExit(5)); } @Test public void testWith0Ticks() { strategy = new NotSoFastStrategy(fakeStrategy, 0); assertTrue(strategy.shouldEnter(0)); assertFalse(strategy.shouldExit(0)); assertTrue(strategy.shouldExit(1)); assertFalse(strategy.shouldExit(2)); assertTrue(strategy.shouldExit(3)); assertTrue(strategy.shouldExit(4)); assertTrue(strategy.shouldExit(5)); } } |
|
From: xanaot <xa...@us...> - 2007-10-15 22:14:53
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/strategy In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4080/src/java/net/sf/tail/strategy Added Files: NotSoFastStrategy.java Log Message: NotSoFastStrategy --- NEW FILE: NotSoFastStrategy.java --- package net.sf.tail.strategy; import net.sf.tail.Strategy; public class NotSoFastStrategy extends AbstractStrategy { private Strategy strategy; private int numberOfTicks; private int tickIndex; public NotSoFastStrategy(Strategy strategy, int numberOfTicks) { this.strategy = strategy; this.numberOfTicks = numberOfTicks; this.tickIndex = 0; } public String getName() { return getClass().getSimpleName() + " over strategy: " + strategy.getName() + " number of ticks: " + numberOfTicks; } public boolean shouldEnter(int index) { if(strategy.shouldEnter(index)) { tickIndex = index; return true; } return false; } public boolean shouldExit(int index) { if(strategy.shouldExit(index) && (index - tickIndex) > numberOfTicks) return true; return false; } } |
|
From: Carlos <ma...@us...> - 2007-10-15 21:22:44
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14260/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Update. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** NewReportFrame.java 15 Oct 2007 21:07:44 -0000 1.21 --- NewReportFrame.java 15 Oct 2007 21:22:47 -0000 1.22 *************** *** 423,428 **** // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); - index.appendConsoleArea(reportNameField.getText() + " added succesfully."); index.loadStockAnalysis(stockAnalysis); this.dispose(); } --- 423,428 ---- // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); + index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); } *************** *** 448,453 **** strategies = dsl.evalStrategies(customStrategyTextArea.getText()); stockAnalysis.addReport(reportNameField.getText(), strategies); - index.appendConsoleArea(reportNameField.getText() + " added succesfully."); index.loadStockAnalysis(stockAnalysis); this.dispose(); } catch (ScriptException e) { --- 448,453 ---- strategies = dsl.evalStrategies(customStrategyTextArea.getText()); stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); + index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); } catch (ScriptException e) { |
|
From: Carlos <ma...@us...> - 2007-10-15 21:22:44
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14260/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Update. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Index.java 15 Oct 2007 21:04:42 -0000 1.22 --- Index.java 15 Oct 2007 21:22:47 -0000 1.23 *************** *** 345,348 **** --- 345,350 ---- String filePath = xlsFileChooser.getSelectedFile().getAbsolutePath(); filePath = filePath.substring(0, filePath.length() - (1 + fileName.length())); + this.appendConsoleArea("Generating report in XLS."); + if(!fileName.endsWith(".xls")) { *************** *** 352,356 **** complete.generateXLSFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), filePath, fileName); - } } --- 354,357 ---- *************** *** 371,375 **** String directoryPath = htmlFileChooser.getSelectedFile().getAbsolutePath(); directoryPath = directoryPath.substring(0, directoryPath.length() - (1 + directoryName.length())); ! CompleteReportGenerator complete = new CompleteReportGenerator(this); try { --- 372,376 ---- String directoryPath = htmlFileChooser.getSelectedFile().getAbsolutePath(); directoryPath = directoryPath.substring(0, directoryPath.length() - (1 + directoryName.length())); ! this.appendConsoleArea("Generating report in HTML."); CompleteReportGenerator complete = new CompleteReportGenerator(this); try { *************** *** 409,413 **** StockAnalysis analysis = serializer.fromXML(stringAnalysis); loadStockAnalysis(analysis); ! this.appendConsoleArea("Stock Analysis loaded succesfully."); } catch (Exception e) { --- 410,414 ---- StockAnalysis analysis = serializer.fromXML(stringAnalysis); loadStockAnalysis(analysis); ! this.appendConsoleArea("Stock Analysis " + directoryFileChooser.getSelectedFile().getName() + " loaded succesfully."); } catch (Exception e) { *************** *** 461,465 **** write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); ! this.appendConsoleArea(stockAnalysisXML.getName() + " saved succesfully."); } --- 462,466 ---- write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); ! this.appendConsoleArea("Stock Analysis " + stockAnalysisXML.getName() + " saved succesfully."); } *************** *** 487,491 **** write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); ! this.appendConsoleArea(stockAnalysisXML.getName() + " saved succesfully."); break; } --- 488,492 ---- write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); ! this.appendConsoleArea("Stock Analysis " + stockAnalysisXML.getName() + " saved succesfully."); break; } *************** *** 507,510 **** --- 508,512 ---- reportProgress.setVisible(false); reportProgress.setValue(value); + this.appendConsoleArea("Report exported succesfully."); } else |
|
From: Carlos <ma...@us...> - 2007-10-15 21:07:43
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7851/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Update. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** NewReportFrame.java 15 Oct 2007 20:23:58 -0000 1.20 --- NewReportFrame.java 15 Oct 2007 21:07:44 -0000 1.21 *************** *** 423,426 **** --- 423,427 ---- // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); + index.appendConsoleArea(reportNameField.getText() + " added succesfully."); index.loadStockAnalysis(stockAnalysis); this.dispose(); *************** *** 447,450 **** --- 448,452 ---- strategies = dsl.evalStrategies(customStrategyTextArea.getText()); stockAnalysis.addReport(reportNameField.getText(), strategies); + index.appendConsoleArea(reportNameField.getText() + " added succesfully."); index.loadStockAnalysis(stockAnalysis); this.dispose(); |
|
From: Carlos <ma...@us...> - 2007-10-15 21:04:58
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6574/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Update. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Index.java 15 Oct 2007 20:15:12 -0000 1.21 --- Index.java 15 Oct 2007 21:04:42 -0000 1.22 *************** *** 409,412 **** --- 409,413 ---- StockAnalysis analysis = serializer.fromXML(stringAnalysis); loadStockAnalysis(analysis); + this.appendConsoleArea("Stock Analysis loaded succesfully."); } catch (Exception e) { *************** *** 460,463 **** --- 461,465 ---- write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); + this.appendConsoleArea(stockAnalysisXML.getName() + " saved succesfully."); } *************** *** 485,488 **** --- 487,491 ---- write.close(); this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); + this.appendConsoleArea(stockAnalysisXML.getName() + " saved succesfully."); break; } |
|
From: Carlos <ma...@us...> - 2007-10-15 21:04:58
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6574/src/java/net/sf/tails/swing/helper Modified Files: TailSTabelModel.java FrameHelper.java Log Message: Update. Index: TailSTabelModel.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/TailSTabelModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TailSTabelModel.java 15 Oct 2007 20:15:11 -0000 1.1 --- TailSTabelModel.java 15 Oct 2007 21:04:42 -0000 1.2 *************** *** 3,7 **** import javax.swing.table.AbstractTableModel; ! class MyTableModel extends AbstractTableModel { private static final long serialVersionUID = 3617540321014880366L; --- 3,7 ---- import javax.swing.table.AbstractTableModel; ! class TailSTableModel extends AbstractTableModel { private static final long serialVersionUID = 3617540321014880366L; *************** *** 10,14 **** private String[] columnNames; ! public MyTableModel(Object [][] data, String[] columnNames) { this.data = data; --- 10,14 ---- private String[] columnNames; ! public TailSTableModel(Object [][] data, String[] columnNames) { this.data = data; *************** *** 23,58 **** return data.length; } ! public String getColumnName(int col) { ! return columnNames[col]; } public Object getValueAt(int row, int col) { return data[row][col]; ! } ! ! public Class<?> getColumnClass(int c) { ! return getValueAt(0, c).getClass(); ! } public boolean isCellEditable(int row, int col) { return false; } - - public void setValueAt(Object value, int row, int col) { - data[row][col] = value; - } - - @SuppressWarnings("unused") - private void printDebugData() { - int numRows = getRowCount(); - int numCols = getColumnCount(); - - for (int i=0; i < numRows; i++) { - System.out.print(" row " + i + ":"); - for (int j=0; j < numCols; j++) { - System.out.print(" " + data[i][j]); - } - } - } } --- 23,37 ---- return data.length; } ! public String getColumnName(int col) { ! return columnNames[col]; } public Object getValueAt(int row, int col) { return data[row][col]; ! } public boolean isCellEditable(int row, int col) { return false; } } Index: FrameHelper.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FrameHelper.java 15 Oct 2007 20:09:35 -0000 1.18 --- FrameHelper.java 15 Oct 2007 21:04:42 -0000 1.19 *************** *** 147,151 **** public TableModel getTableModel(StockAnalysis stockAnalysis) { ! TableModel table = new MyTableModel(getReportMatrix(stockAnalysis), getColumnNames(stockAnalysis)); return table; } --- 147,151 ---- public TableModel getTableModel(StockAnalysis stockAnalysis) { ! TableModel table = new TailSTableModel(getReportMatrix(stockAnalysis), getColumnNames(stockAnalysis)); return table; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:58
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21512/src/java/net/sf/tails/swing/frame/stockAnalysis Modified Files: NewStockAnalysis2.java NewStockAnalysis.java NewStockAnalysis3.java Log Message: refatoração gigante! Stock virou TimeSeries Index: NewStockAnalysis2.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NewStockAnalysis2.java 15 Oct 2007 16:14:23 -0000 1.6 --- NewStockAnalysis2.java 15 Oct 2007 20:23:57 -0000 1.7 *************** *** 23,27 **** import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.analysis.Stock; import net.sf.tails.swing.frame.Index; import net.sf.tails.swing.helper.FrameHelper; --- 23,27 ---- import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tails.swing.frame.Index; import net.sf.tails.swing.helper.FrameHelper; *************** *** 38,42 **** private static final long serialVersionUID = 1L; ! private Stock stock; private String[] communCriteria; private String[] genericCriteria; --- 38,42 ---- private static final long serialVersionUID = 1L; ! private SerializableTimeSeries stock; private String[] communCriteria; private String[] genericCriteria; *************** *** 55,59 **** private String defaultCriteria; ! public NewStockAnalysis2(Index index, Stock stock) { this.index = index; this.stock = stock; --- 55,59 ---- private String defaultCriteria; ! public NewStockAnalysis2(Index index, SerializableTimeSeries stock) { this.index = index; this.stock = stock; Index: NewStockAnalysis.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NewStockAnalysis.java 10 Oct 2007 21:28:10 -0000 1.6 --- NewStockAnalysis.java 15 Oct 2007 20:23:58 -0000 1.7 *************** *** 20,24 **** import javax.swing.JOptionPane; ! import net.sf.tail.analysis.Stock; import net.sf.tail.io.StockSerializer; import net.sf.tails.swing.frame.Index; --- 20,24 ---- import javax.swing.JOptionPane; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tail.io.StockSerializer; import net.sf.tails.swing.frame.Index; *************** *** 281,285 **** { StockSerializer stockSerializer = new StockSerializer(); ! Stock stock = null; if (stockButtonGroup.isSelected(newRadioButton.getModel())) { --- 281,285 ---- { StockSerializer stockSerializer = new StockSerializer(); ! SerializableTimeSeries stock = null; if (stockButtonGroup.isSelected(newRadioButton.getModel())) { *************** *** 292,296 **** try { helper.generateFolders(folderBundle.getString("STOCK_DIR")); ! stock = new Stock(stockNameField.getText(), seriesField.getText(), helper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString())); String xmlFile = stockSerializer.toXML(stock); String filePath = folderBundle.getString("STOCK_DIR") + "/" + stockNameField.getText(); --- 292,296 ---- try { helper.generateFolders(folderBundle.getString("STOCK_DIR")); ! stock = new SerializableTimeSeries(stockNameField.getText(), seriesField.getText(), helper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString())); String xmlFile = stockSerializer.toXML(stock); String filePath = folderBundle.getString("STOCK_DIR") + "/" + stockNameField.getText(); Index: NewStockAnalysis3.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NewStockAnalysis3.java 10 Oct 2007 22:08:39 -0000 1.7 --- NewStockAnalysis3.java 15 Oct 2007 20:23:58 -0000 1.8 *************** *** 18,22 **** import net.sf.tail.OperationType; import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.Stock; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.evaluator.HigherValueEvaluator; --- 18,22 ---- import net.sf.tail.OperationType; import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.evaluator.HigherValueEvaluator; *************** *** 40,44 **** private static final long serialVersionUID = 1L; ! private Stock stock; private AnalysisCriterion selectedCriterion; private List<AnalysisCriterion> additionalCriteria; --- 40,44 ---- private static final long serialVersionUID = 1L; ! private SerializableTimeSeries stock; private AnalysisCriterion selectedCriterion; private List<AnalysisCriterion> additionalCriteria; *************** *** 67,71 **** private FrameHelper helper; ! public NewStockAnalysis3(Index index, Stock stock, AnalysisCriterion selectedCriterion, List<AnalysisCriterion> additionalCriteria) { this.index = index; this.stock = stock; --- 67,71 ---- private FrameHelper helper; ! public NewStockAnalysis3(Index index, SerializableTimeSeries stock, AnalysisCriterion selectedCriterion, List<AnalysisCriterion> additionalCriteria) { this.index = index; this.stock = stock; *************** *** 383,395 **** } ! slicer = new PartialMemorizedSlicer(stock.getSeries(), period, startDate, slicesNumber); } else if (slicerTypeComboBox.getSelectedItem().toString().equals("Fully")) { ! slicer = new FullyMemorizedSlicer(stock.getSeries(), period, startDate); } else { ! slicer = new RegularSlicer(stock.getSeries(), period, startDate); } --- 383,395 ---- } ! slicer = new PartialMemorizedSlicer(stock, period, startDate, slicesNumber); } else if (slicerTypeComboBox.getSelectedItem().toString().equals("Fully")) { ! slicer = new FullyMemorizedSlicer(stock, period, startDate); } else { ! slicer = new RegularSlicer(stock, period, startDate); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:58
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21512/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: refatoração gigante! Stock virou TimeSeries Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** NewReportFrame.java 10 Oct 2007 22:46:39 -0000 1.19 --- NewReportFrame.java 15 Oct 2007 20:23:58 -0000 1.20 *************** *** 420,426 **** DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis ! .getStock().getSeries(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.createReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); this.dispose(); --- 420,426 ---- DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis ! .getStock(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); this.dispose(); *************** *** 439,444 **** try { String dslHeader = read("/rubyDSLutils.rb"); ! dsl = new RubyDSL(dslHeader, stockAnalysis.getStock() ! .getSeries()); } catch (Exception e) { JOptionPane.showMessageDialog(null, --- 439,443 ---- try { String dslHeader = read("/rubyDSLutils.rb"); ! dsl = new RubyDSL(dslHeader, stockAnalysis.getStock()); } catch (Exception e) { JOptionPane.showMessageDialog(null, *************** *** 447,451 **** Set<Strategy> strategies; strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.createReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); this.dispose(); --- 446,450 ---- Set<Strategy> strategies; strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadStockAnalysis(stockAnalysis); this.dispose(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:58
|
Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21512/src/test/net/sf/tails/swing/helper Modified Files: CompleteXLSGeneratorTest.java ReportImageTest.java CompleteHtmlGeneratorTest.java CompleteHtmlGeneratorExecutor.java CompleteXlsGeneratorExecutor.java Log Message: refatoração gigante! Stock virou TimeSeries Index: ReportImageTest.java =================================================================== RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/ReportImageTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReportImageTest.java 15 Oct 2007 20:09:35 -0000 1.2 --- ReportImageTest.java 15 Oct 2007 20:23:57 -0000 1.3 *************** *** 51,55 **** TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(new TotalProfitCriterion(), slicer, decisions); image = new CompleteReportGenerator(new Index()); } --- 51,55 ---- TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(null,new TotalProfitCriterion(), slicer, decisions); image = new CompleteReportGenerator(new Index()); } Index: CompleteXlsGeneratorExecutor.java =================================================================== RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXlsGeneratorExecutor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompleteXlsGeneratorExecutor.java 15 Oct 2007 20:09:35 -0000 1.2 --- CompleteXlsGeneratorExecutor.java 15 Oct 2007 20:23:57 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- import net.sf.tail.AnalysisCriterion; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 44,52 **** try { ! timeSeries = ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)"); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } --- 45,51 ---- try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)")); } catch (FileNotFoundException e) { e.printStackTrace(); } Index: CompleteHtmlGeneratorExecutor.java =================================================================== RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorExecutor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CompleteHtmlGeneratorExecutor.java 15 Oct 2007 20:09:35 -0000 1.3 --- CompleteHtmlGeneratorExecutor.java 15 Oct 2007 20:23:57 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- import net.sf.tail.AnalysisCriterion; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 44,52 **** try { ! timeSeries = ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)"); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } --- 45,51 ---- try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)")); } catch (FileNotFoundException e) { e.printStackTrace(); } Index: CompleteXLSGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXLSGeneratorTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompleteXLSGeneratorTest.java 15 Oct 2007 20:09:35 -0000 1.2 --- CompleteXLSGeneratorTest.java 15 Oct 2007 20:23:57 -0000 1.3 *************** *** 54,58 **** TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(new TotalProfitCriterion(), slicer, decisions); xls = new CompleteReportGenerator(new Index()); --- 54,58 ---- TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(null,new TotalProfitCriterion(), slicer, decisions); xls = new CompleteReportGenerator(new Index()); Index: CompleteHtmlGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CompleteHtmlGeneratorTest.java 15 Oct 2007 20:09:35 -0000 1.3 --- CompleteHtmlGeneratorTest.java 15 Oct 2007 20:23:57 -0000 1.4 *************** *** 56,60 **** TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(new TotalProfitCriterion(), slicer, decisions); html = new CompleteReportGenerator(new Index()); List<AnalysisCriterion> criteria = new ArrayList<AnalysisCriterion>(); --- 56,60 ---- TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period); ! report = new Report(null, new TotalProfitCriterion(), slicer, decisions); html = new CompleteReportGenerator(new Index()); List<AnalysisCriterion> criteria = new ArrayList<AnalysisCriterion>(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:26
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/java/net/sf/tail/io Modified Files: StockSerializer.java StockAnalysisSerializer.java Log Message: refatoração gigante! Stock virou TimeSeries Index: StockSerializer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockSerializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockSerializer.java 26 Sep 2007 19:36:21 -0000 1.1 --- StockSerializer.java 15 Oct 2007 20:23:25 -0000 1.2 *************** *** 3,7 **** import java.io.IOException; ! import net.sf.tail.analysis.Stock; import com.thoughtworks.xstream.XStream; --- 3,7 ---- import java.io.IOException; ! import net.sf.tail.analysis.SerializableTimeSeries; import com.thoughtworks.xstream.XStream; *************** *** 10,14 **** public class StockSerializer { ! public String toXML(Stock stock) { XStream xstream = new XStream(new DomDriver()); xstream.setMode(XStream.NO_REFERENCES); --- 10,14 ---- public class StockSerializer { ! public String toXML(SerializableTimeSeries stock) { XStream xstream = new XStream(new DomDriver()); xstream.setMode(XStream.NO_REFERENCES); *************** *** 18,24 **** @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; --- 18,24 ---- @SuppressWarnings("unchecked") ! public SerializableTimeSeries fromXML(String xml) throws IOException { XStream xstream = new XStream(new DomDriver()); ! SerializableTimeSeries stock = (SerializableTimeSeries) xstream.fromXML(xml); stock.reloadSeries(); return stock; Index: StockAnalysisSerializer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockAnalysisSerializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockAnalysisSerializer.java 27 Sep 2007 00:17:18 -0000 1.3 --- StockAnalysisSerializer.java 15 Oct 2007 20:23:25 -0000 1.4 *************** *** 4,8 **** import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.Stock; import net.sf.tail.analysis.StockAnalysis; --- 4,8 ---- import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tail.analysis.StockAnalysis; *************** *** 22,32 **** 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()); ! newAnalysis.getAdditionalCriteria().addAll(analysis.getAdditionalCriteria()); return newAnalysis; --- 22,36 ---- XStream xstream = new XStream(new DomDriver()); StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml); ! SerializableTimeSeries newStock = analysis.getStock(); newStock.reloadSeries(); ! ! TimeSeriesSlicer newSlicer = analysis.getSlicer().applyForSeries(newStock); StockAnalysis newAnalysis = new StockAnalysis(newStock,analysis.getApplyedCriterion(),newSlicer, analysis.getEvaluator()); + newAnalysis.getAdditionalCriteria().addAll(analysis.getAdditionalCriteria()); + //TODO Arrebentamos com o encapsulamento ! newAnalysis.getReports().addAll(analysis.getReports()); ! newAnalysis.reloadReports(); ! return newAnalysis; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/indicator/oscilator Modified Files: StochasticOscilatorKTest.java StochasticOscilatorDTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: StochasticOscilatorKTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorKTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StochasticOscilatorKTest.java 23 Aug 2007 12:51:11 -0000 1.5 --- StochasticOscilatorKTest.java 15 Oct 2007 20:23:25 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; *************** *** 36,40 **** ticks.add(new Tick(45.58, 115.38, 119.44, 114.56)); ! data = new DefaultTimeSeries(ticks); } --- 37,41 ---- ticks.add(new Tick(45.58, 115.38, 119.44, 114.56)); ! data = new DummyStock(new DefaultTimeSeries(ticks)); } Index: StochasticOscilatorDTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorDTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StochasticOscilatorDTest.java 23 Aug 2007 12:51:11 -0000 1.5 --- StochasticOscilatorDTest.java 15 Oct 2007 20:23:25 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; *************** *** 36,40 **** ticks.add(new Tick(45.58, 115.38, 119.44, 114.56)); ! data = new DefaultTimeSeries(ticks); } --- 37,41 ---- ticks.add(new Tick(45.58, 115.38, 119.44, 114.56)); ! data = new DummyStock(new DefaultTimeSeries(ticks)); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/graphics Modified Files: CashFlowDatasetTest.java ChartForReportTest.java SeriesDatasetTest.java StockAndCashFlowDatasetTest.java ChartTest.java CombinedSeriesAndFlowChartTest.java StockAndCashFlowChartTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChartTest.java 23 Aug 2007 12:51:10 -0000 1.5 --- ChartTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 7,11 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.ArrayList; import java.util.List; --- 7,10 ---- *************** *** 14,17 **** --- 13,17 ---- import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 126,134 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 126,132 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: StockAndCashFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowChartTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StockAndCashFlowChartTest.java 27 Aug 2007 22:46:29 -0000 1.5 --- StockAndCashFlowChartTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 5,13 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.List; import javax.swing.JPanel; import net.sf.tail.Indicator; import net.sf.tail.OperationType; --- 5,13 ---- import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.List; import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 85,93 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 85,91 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: SeriesDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SeriesDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.5 --- SeriesDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.Operation; *************** *** 42,46 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); --- 43,47 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); Index: CombinedSeriesAndFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CombinedSeriesAndFlowChartTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CombinedSeriesAndFlowChartTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- CombinedSeriesAndFlowChartTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 7,11 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.ArrayList; import java.util.List; --- 7,10 ---- *************** *** 14,17 **** --- 13,17 ---- import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 107,115 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 107,113 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: ChartForReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartForReportTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChartForReportTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- ChartForReportTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 111,119 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 112,118 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: CashFlowDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CashFlowDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- CashFlowDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Operation; import net.sf.tail.OperationType; *************** *** 37,41 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); trades = new LinkedList<Trade>(); --- 38,42 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock( new DefaultTimeSeries(ticks)); trades = new LinkedList<Trade>(); *************** *** 80,84 **** public void testMoveRight() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DefaultTimeSeries(ticks); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); --- 81,85 ---- public void testMoveRight() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); *************** *** 93,97 **** public void testMoveLeft() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DefaultTimeSeries(ticks); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); --- 94,98 ---- public void testMoveLeft() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); Index: StockAndCashFlowDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StockAndCashFlowDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.2 --- StockAndCashFlowDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Operation; import net.sf.tail.OperationType; *************** *** 40,44 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); trades = new LinkedList<Trade>(); --- 41,45 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); trades = new LinkedList<Trade>(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail Modified Files: ReportXmlSerializerTest.java EMAWalkTest.java StockAnalysisXmlSerializerTest.java EMACompleteTest.java Added Files: DummyStock.java Log Message: refatoração gigante! Stock virou TimeSeries Index: EMACompleteTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMACompleteTest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** EMACompleteTest.java 10 Oct 2007 19:04:10 -0000 1.19 --- EMACompleteTest.java 15 Oct 2007 20:23:23 -0000 1.20 *************** *** 29,32 **** --- 29,33 ---- import net.sf.tail.report.html.ReportHTMLGenerator; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.DefaultTimeSeries; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 40,51 **** public void testCompleteSMAGenerate() throws IOException { CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader(); ! TimeSeries timeSeries = null; ! ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/petr4_15min_05102007.csv"), "Ambev (ambv4)"); ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); for (int i = 4; i < 20; i++) { Indicator<Double> tracker = new EMAIndicator(close, i); --- 41,51 ---- public void testCompleteSMAGenerate() throws IOException { CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader(); ! DefaultTimeSeries timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/petr4_15min_05102007.csv"), "Ambev (ambv4)"); ! TimeSeries dummyStock = new DummyStock(timeSeries); ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); ! Indicator<Double> close = new ClosePriceIndicator(dummyStock); for (int i = 4; i < 20; i++) { Indicator<Double> tracker = new EMAIndicator(close, i); *************** *** 54,58 **** } ! Report r = w.walk(strategies, new FullyMemorizedSlicer(timeSeries, new Period().withMonths(1)), new TotalProfitCriterion()); List<AnalysisCriterion> criteria = new LinkedList<AnalysisCriterion>(); criteria.add(new NumberOfTradesCriterion()); --- 54,58 ---- } ! Report r = w.walk(strategies, new FullyMemorizedSlicer(dummyStock, new Period().withMonths(1)), new TotalProfitCriterion()); List<AnalysisCriterion> criteria = new LinkedList<AnalysisCriterion>(); criteria.add(new NumberOfTradesCriterion()); *************** *** 61,66 **** criteria.add(new RewardRiskRatioCriterion()); ! CashFlow cashflow = new CashFlow(timeSeries, r.getAllTrades()); ! StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(timeSeries, close, cashflow, new Period() .withMonths(1)); StockAndCashFlowChart stockChart = new StockAndCashFlowChart(stockData, false); --- 61,66 ---- criteria.add(new RewardRiskRatioCriterion()); ! CashFlow cashflow = new CashFlow(dummyStock, r.getAllTrades()); ! StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(dummyStock, close, cashflow, new Period() .withMonths(1)); StockAndCashFlowChart stockChart = new StockAndCashFlowChart(stockData, false); Index: EMAWalkTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMAWalkTest.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** EMAWalkTest.java 10 Oct 2007 19:04:10 -0000 1.18 --- EMAWalkTest.java 15 Oct 2007 20:23:23 -0000 1.19 *************** *** 19,22 **** --- 19,23 ---- import net.sf.tail.report.html.ReportHTMLGenerator; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.DefaultTimeSeries; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 31,36 **** // Petrobras by year CedroTimeSeriesLoader loader = new CedroTimeSeriesLoader(); ! TimeSeries series = loader.load(new FileInputStream("BaseBovespa/diario/petr4Dia.csv"), "Petrobras Anual"); ! // Generates a Set of EMAs, that trigger an ENTER/EXIT when // crossing the close price --- 32,39 ---- // Petrobras by year CedroTimeSeriesLoader loader = new CedroTimeSeriesLoader(); ! DefaultTimeSeries defultSeries = loader.load(new FileInputStream("BaseBovespa/diario/petr4Dia.csv"), "Petrobras Anual"); ! TimeSeries series = new DummyStock(defultSeries); ! ! // Generates a Set of EMAs, that trigger an ENTER/EXIT when // crossing the close price --- NEW FILE: DummyStock.java --- package net.sf.tail; import net.sf.tail.series.DefaultTimeSeries; public class DummyStock implements TimeSeries { private DefaultTimeSeries timeSeries; public DummyStock(DefaultTimeSeries timeSeries) { this.timeSeries = timeSeries; } public int getBegin() { return timeSeries.getBegin(); } public int getEnd() { return timeSeries.getEnd(); } public String getName() { return timeSeries.getName(); } public String getPeriod() { return timeSeries.getPeriod(); } public int getSize() { return timeSeries.getSize(); } public Tick getTick(int i) { return timeSeries.getTick(i); } } Index: StockAnalysisXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/StockAnalysisXmlSerializerTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StockAnalysisXmlSerializerTest.java 8 Oct 2007 19:38:14 -0000 1.8 --- StockAnalysisXmlSerializerTest.java 15 Oct 2007 20:23:23 -0000 1.9 *************** *** 9,13 **** import java.util.Set; ! import net.sf.tail.analysis.Stock; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.criteria.AverageProfitCriterion; --- 9,13 ---- import java.util.Set; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.criteria.AverageProfitCriterion; *************** *** 32,43 **** public void testXMLSerialize() { try { ! Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); AnalysisCriterion applyedCriterion = new TotalProfitCriterion(); ! TimeSeries timeSeries = stock.getSeries(); ! timeSeries = stock.getSeries(); ! ! TimeSeriesSlicer slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1)); Runner runner = new HistoryRunner(OperationType.BUY); StrategyEvaluator evaluator = new HigherValueEvaluator(runner); --- 32,40 ---- public void testXMLSerialize() { try { ! SerializableTimeSeries stock = new SerializableTimeSeries("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); AnalysisCriterion applyedCriterion = new TotalProfitCriterion(); ! TimeSeriesSlicer slicer = new FullyMemorizedSlicer(stock, new Period().withDays(1)); Runner runner = new HistoryRunner(OperationType.BUY); StrategyEvaluator evaluator = new HigherValueEvaluator(runner); *************** *** 52,56 **** for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); Indicator<Double> tracker = new EMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 49,53 ---- 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); *************** *** 58,67 **** } ! stockAnalysis.createReport("", strategies); strategies = new HashSet<Strategy>(); for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); Indicator<Double> tracker = new SMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 55,64 ---- } ! 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); *************** *** 69,84 **** } ! stockAnalysis.createReport("", strategies); strategies = new HashSet<Strategy>(); for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); ! Indicator<Double> tracker = new WilliamsRIndicator(timeSeries, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); strategies.add(strategy); } ! stockAnalysis.createReport("", strategies); StockAnalysisSerializer serializer = new StockAnalysisSerializer(); --- 66,81 ---- } ! 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(); Index: ReportXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ReportXmlSerializerTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReportXmlSerializerTest.java 8 Oct 2007 19:38:14 -0000 1.6 --- ReportXmlSerializerTest.java 15 Oct 2007 20:23:23 -0000 1.7 *************** *** 19,22 **** --- 19,23 ---- import net.sf.tail.report.Report; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.DefaultTimeSeries; import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 29,42 **** CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader(); ! TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "AMBV4 IntraDAY"); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); --- 30,43 ---- CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader(); ! DefaultTimeSeries defaulTimeSeries = null; try { ! defaulTimeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "AMBV4 IntraDAY"); } catch (FileNotFoundException e) { e.printStackTrace(); } ! ! DummyStock timeSeries = new DummyStock(defaulTimeSeries); ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/java/net/sf/tail/series Modified Files: DefaultTimeSeries.java Log Message: refatoração gigante! Stock virou TimeSeries Index: DefaultTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/DefaultTimeSeries.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DefaultTimeSeries.java 24 Sep 2007 22:58:37 -0000 1.4 --- DefaultTimeSeries.java 15 Oct 2007 20:23:25 -0000 1.5 *************** *** 12,16 **** * */ ! public class DefaultTimeSeries implements TimeSeries { transient private final List<Tick> ticks; --- 12,16 ---- * */ ! public class DefaultTimeSeries { transient private final List<Tick> ticks; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/java/net/sf/tail/report Modified Files: Report.java Log Message: refatoração gigante! Stock virou TimeSeries Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Report.java 3 Oct 2007 18:49:59 -0000 1.20 --- Report.java 15 Oct 2007 20:23:24 -0000 1.21 *************** *** 3,8 **** --- 3,10 ---- import java.util.ArrayList; import java.util.List; + import java.util.Set; import net.sf.tail.AnalysisCriterion; + import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; *************** *** 25,29 **** private String name; ! public Report(AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) { this.applyedCriterion = criterion; this.decisions = decisions; --- 27,34 ---- private String name; ! 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; *************** *** 34,37 **** --- 39,46 ---- } + public Set<Strategy> getStrategies() { + return strategies; + } + public Number addSummarizedCriteria(AnalysisCriterion criterion) { Number result = criterion.summarize(slicer.getSeries(), decisions); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/analysis Modified Files: StockAnalysisTest.java StockTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: StockAnalysisTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StockAnalysisTest.java 8 Oct 2007 19:38:15 -0000 1.7 --- StockAnalysisTest.java 15 Oct 2007 20:23:24 -0000 1.8 *************** *** 31,35 **** public class StockAnalysisTest { ! private Stock stock; private TotalProfitCriterion applyedCriterion; --- 31,35 ---- public class StockAnalysisTest { ! private SerializableTimeSeries stock; private TotalProfitCriterion applyedCriterion; *************** *** 49,53 **** @Before public void setUp() throws Exception { ! this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); this.applyedCriterion = new TotalProfitCriterion(); --- 49,53 ---- @Before public void setUp() throws Exception { ! this.stock = new SerializableTimeSeries("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); this.applyedCriterion = new TotalProfitCriterion(); *************** *** 79,88 **** @Test public void testCreateReport() { ! assertEquals(report, stockAnalysis.createReport("", strategies)); } @Test public void testAddCriterionAndCriteria() { ! stockAnalysis.createReport("", strategies); stockAnalysis.addCriterion(new NumberOfTicksCriterion()); assertEquals(1, stockAnalysis.getAdditionalCriteria().size()); --- 79,88 ---- @Test public void testCreateReport() { ! assertEquals(report, stockAnalysis.addReport("", strategies)); } @Test public void testAddCriterionAndCriteria() { ! stockAnalysis.addReport("", strategies); stockAnalysis.addCriterion(new NumberOfTicksCriterion()); assertEquals(1, stockAnalysis.getAdditionalCriteria().size()); Index: StockTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StockTest.java 26 Sep 2007 19:36:21 -0000 1.4 --- StockTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 16,25 **** public class StockTest { ! private Stock stock; private DefaultTimeSeries series; @Before public void setUp() throws FileNotFoundException, IOException{ ! this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); this.series = new CedroTimeSeriesLoader().load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "Teste"); } --- 16,25 ---- public class StockTest { ! private SerializableTimeSeries stock; private DefaultTimeSeries series; @Before public void setUp() throws FileNotFoundException, IOException{ ! this.stock = new SerializableTimeSeries("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); this.series = new CedroTimeSeriesLoader().load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "Teste"); } *************** *** 44,48 **** StockSerializer serializer = new StockSerializer(); String serialized = serializer.toXML(stock); ! Stock afterSerializedStock = serializer.fromXML(serialized); assertEquals(stock.getSeries(), afterSerializedStock.reloadSeries()); assertEquals(stock.getSeries(), afterSerializedStock.getSeries()); --- 44,48 ---- StockSerializer serializer = new StockSerializer(); String serialized = serializer.toXML(stock); ! SerializableTimeSeries afterSerializedStock = serializer.fromXML(serialized); assertEquals(stock.getSeries(), afterSerializedStock.reloadSeries()); assertEquals(stock.getSeries(), afterSerializedStock.getSeries()); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io/reader In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/io/reader Modified Files: CedroTimeSeriesLoaderTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: CedroTimeSeriesLoaderTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/reader/CedroTimeSeriesLoaderTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CedroTimeSeriesLoaderTest.java 4 Sep 2007 13:09:15 -0000 1.2 --- CedroTimeSeriesLoaderTest.java 15 Oct 2007 20:23:23 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- import java.io.FileInputStream; + import net.sf.tail.DummyStock; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; *************** *** 26,30 **** // vindo de um FileInputStream // alem disso, o metodo load deveria ficar em um test ! ts = ctsl.load(new FileInputStream("BaseBovespa/tests/Cedro-ReaderTest.csv"), ""); } --- 27,31 ---- // vindo de um FileInputStream // alem disso, o metodo load deveria ficar em um test ! ts = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/tests/Cedro-ReaderTest.csv"), "")); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/io Modified Files: SerializerTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: SerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SerializerTest.java 8 Oct 2007 19:38:15 -0000 1.10 --- SerializerTest.java 15 Oct 2007 20:23:25 -0000 1.11 *************** *** 12,16 **** import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.Stock; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.criteria.AverageProfitCriterion; --- 12,16 ---- import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; ! import net.sf.tail.analysis.SerializableTimeSeries; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.analysis.criteria.AverageProfitCriterion; *************** *** 40,44 **** private HistoryRunner runner; ! private Stock stock; private HigherValueEvaluator evaluator; --- 40,44 ---- private HistoryRunner runner; ! private SerializableTimeSeries stock; private HigherValueEvaluator evaluator; *************** *** 46,51 **** @Before public void setUp() throws Exception { ! stock = new Stock("test", "BaseBovespa/tests/Cedro-ReaderTest.csv", new CedroTimeSeriesLoader()); ! slicer = new FullyMemorizedSlicer(stock.getSeries(), new Period().withDays(1)); runner = new HistoryRunner(OperationType.BUY); --- 46,51 ---- @Before public void setUp() throws Exception { ! stock = new SerializableTimeSeries("test", "BaseBovespa/tests/Cedro-ReaderTest.csv", new CedroTimeSeriesLoader()); ! slicer = new FullyMemorizedSlicer(stock, new Period().withDays(1)); runner = new HistoryRunner(OperationType.BUY); *************** *** 60,64 **** StockSerializer serializer = new StockSerializer(); String serializedStock = serializer.toXML(stock); ! Stock newStock = serializer.fromXML(serializedStock); assertEquals(stock, newStock); assertEquals(stock.getSeries(), newStock.getSeries()); --- 60,64 ---- StockSerializer serializer = new StockSerializer(); String serializedStock = serializer.toXML(stock); ! SerializableTimeSeries newStock = serializer.fromXML(serializedStock); assertEquals(stock, newStock); assertEquals(stock.getSeries(), newStock.getSeries()); *************** *** 77,81 **** for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); Indicator<Double> tracker = new EMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 77,81 ---- 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); *************** *** 83,92 **** } ! stockAnalysis.createReport("", strategies); strategies = new HashSet<Strategy>(); for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); Indicator<Double> tracker = new SMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 83,92 ---- } ! 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); *************** *** 94,109 **** } ! stockAnalysis.createReport("", strategies); strategies = new HashSet<Strategy>(); for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); ! Indicator<Double> tracker = new WilliamsRIndicator(stock.getSeries(), i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); strategies.add(strategy); } ! stockAnalysis.createReport("", strategies); StockAnalysisSerializer serializer = new StockAnalysisSerializer(); --- 94,109 ---- } ! 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(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/report Modified Files: ReportTest.java ReportGeneratorTest.java CompleteReportGeneratorTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: CompleteReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/CompleteReportGeneratorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CompleteReportGeneratorTest.java 10 Oct 2007 19:04:09 -0000 1.6 --- CompleteReportGeneratorTest.java 15 Oct 2007 20:23:23 -0000 1.7 *************** *** 58,62 **** @Test public void testSMAGenerate() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "", urls); --- 58,62 ---- @Test public void testSMAGenerate() throws IOException { ! Report report = new Report(null ,new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "", urls); *************** *** 69,73 **** @Test public void testSMAGenerateWithoutCriteria() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, "", urls); --- 69,73 ---- @Test public void testSMAGenerateWithoutCriteria() throws IOException { ! Report report = new Report(null,new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, "", urls); Index: ReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportTest.java 3 Oct 2007 22:56:47 -0000 1.4 --- ReportTest.java 15 Oct 2007 20:23:23 -0000 1.5 *************** *** 47,51 **** public void testGetAllTrades() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); assertEquals(trades, report.getAllTrades()); } --- 47,51 ---- public void testGetAllTrades() throws IOException { ! Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); assertEquals(trades, report.getAllTrades()); } *************** *** 54,58 **** public void testGetCriterionValue() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); assertEquals(4.5, report.getCriterionValue()); } --- 54,58 ---- public void testGetCriterionValue() throws IOException { ! Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); assertEquals(4.5, report.getCriterionValue()); } Index: ReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportGeneratorTest.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ReportGeneratorTest.java 10 Oct 2007 19:04:09 -0000 1.24 --- ReportGeneratorTest.java 15 Oct 2007 20:23:23 -0000 1.25 *************** *** 53,57 **** @Test public void testSMAGenerate() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, ""); --- 53,57 ---- @Test public void testSMAGenerate() throws IOException { ! Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, ""); *************** *** 63,67 **** @Test public void testSMAGenerateWithoutCriteria() throws IOException { ! Report report = new Report(new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, ""); --- 63,67 ---- @Test public void testSMAGenerateWithoutCriteria() throws IOException { ! Report report = new Report(null, new TotalProfitCriterion(), slicer, decisions); StringBuffer html = new ReportHTMLGenerator().generate(report, ""); |
