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-08-20 19:32:37
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5497/src/test/net/sf/tail/graphics Modified Files: StockAndFlowChartTest.java Log Message: Mudança no construtor. Index: StockAndFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndFlowChartTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockAndFlowChartTest.java 20 Aug 2007 19:02:00 -0000 1.1 --- StockAndFlowChartTest.java 20 Aug 2007 19:32:31 -0000 1.2 *************** *** 64,71 **** SMAIndicator sma = new SMAIndicator(indicator, 8); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(indicator,sma), 0, timeSeries.getSize() - 1); cashFlow = new CashFlow(timeSeries, trades, indicator.getValue(0).doubleValue()); ! seriesDataset = new StockAndCashFlowDataset(timeSeries, indicator, cashFlow, 0, timeSeries.getSize() - 1); StockAndCashFlowChart seriesAndFlowChart = new StockAndCashFlowChart(seriesDataset); --- 64,71 ---- SMAIndicator sma = new SMAIndicator(indicator, 8); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(indicator,sma), timeSeries.getBegin(), timeSeries.getEnd()); cashFlow = new CashFlow(timeSeries, trades, indicator.getValue(0).doubleValue()); ! seriesDataset = new StockAndCashFlowDataset(timeSeries, indicator, cashFlow); StockAndCashFlowChart seriesAndFlowChart = new StockAndCashFlowChart(seriesDataset); |
|
From: Carlos <ma...@us...> - 2007-08-20 19:32:37
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5497/src/java/net/sf/tail/graphics Modified Files: StockAndCashFlowDataset.java Log Message: Mudança no construtor. Index: StockAndCashFlowDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/StockAndCashFlowDataset.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockAndCashFlowDataset.java 20 Aug 2007 19:02:00 -0000 1.1 --- StockAndCashFlowDataset.java 20 Aug 2007 19:32:31 -0000 1.2 *************** *** 39,42 **** --- 39,53 ---- loadValues(); } + + public StockAndCashFlowDataset(TimeSeries series, Indicator<? extends Number> closePrice, CashFlow cashFlow) { + this.data = new DefaultKeyedValues2D(); + this.closePrice = closePrice; + this.cashFlow = cashFlow; + this.firstIndex = series.getBegin(); + this.lastIndex = series.getEnd(); + this.series = series; + + loadValues(); + } private void loadValues() { |
|
From: Carlos <ma...@us...> - 2007-08-20 19:02:02
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/flow In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24551/src/java/net/sf/tail/flow Modified Files: CashFlow.java Log Message: Novo construtor no cashflow para o valor inicial não necessariamente ser 1. Stockandcashflow criado para o report geral, imprime o cash flow versus buy and hold de todo o timeseries, sem setas de trade. Index: CashFlow.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/flow/CashFlow.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CashFlow.java 18 Aug 2007 14:05:33 -0000 1.8 --- CashFlow.java 20 Aug 2007 19:02:00 -0000 1.9 *************** *** 24,27 **** --- 24,35 ---- calculate(); } + + public CashFlow(TimeSeries timeSeries, List<Trade> trades, double initialValue) { + this.timeSeries = timeSeries; + this.trades = trades; + values = new ArrayList<Double>(); + values.add(initialValue); + calculate(); + } private void calculate() { |
|
From: Carlos <ma...@us...> - 2007-08-20 19:02:00
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24551/src/java/net/sf/tail/graphics Added Files: StockAndCashFlowChart.java StockAndCashFlowDataset.java Log Message: Novo construtor no cashflow para o valor inicial não necessariamente ser 1. Stockandcashflow criado para o report geral, imprime o cash flow versus buy and hold de todo o timeseries, sem setas de trade. --- NEW FILE: StockAndCashFlowChart.java --- package net.sf.tail.graphics; import java.awt.Color; import java.awt.Font; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.data.general.DatasetChangeEvent; import org.jfree.data.general.DatasetChangeListener; public class StockAndCashFlowChart implements DatasetChangeListener { private CategoryDataset dataSet; private CategoryPlot plot; private LineAndShapeRenderer lineAndShapeRenderer; public StockAndCashFlowChart(CategoryDataset dataSet) { this.dataSet = dataSet; this.dataSet.addChangeListener(this); this.lineAndShapeRenderer = new LineAndShapeRenderer(true, true); } public JFreeChart createChart(String chartName) { JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet, PlotOrientation.VERTICAL, true, true, false); plot = (CategoryPlot)jfreechart.getPlot(); plot.setBackgroundPaint(Color.LIGHT_GRAY); //Setando labels em 90 graus CategoryAxis categoryAxis = plot.getDomainAxis(); //Setando tamanho do grafico NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis(); rangeAxis.setAutoRangeIncludesZero(false); //Setando tamanho do label categoryAxis.setLabelFont(new Font("SansSerif", 0, 10)); //Setando tamanho do label de cada tick categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); //gerando setas setSeriesShapes(); return jfreechart; } /** * @param dataSet * @param plot */ private void setSeriesShapes() { lineAndShapeRenderer.setSeriesShapesVisible(0, false); lineAndShapeRenderer.setSeriesShapesVisible(1, false); plot.setRenderer(lineAndShapeRenderer); } public void datasetChanged(DatasetChangeEvent event) { setSeriesShapes(); } } --- NEW FILE: StockAndCashFlowDataset.java --- package net.sf.tail.graphics; import java.util.List; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; import net.sf.tail.flow.CashFlow; import org.jfree.data.DefaultKeyedValues2D; import org.jfree.data.category.CategoryDataset; import org.jfree.data.general.AbstractDataset; @SuppressWarnings("unchecked") public class StockAndCashFlowDataset extends AbstractDataset implements CategoryDataset { private static final long serialVersionUID = -7204964027452086107L; private DefaultKeyedValues2D data; private Indicator<? extends Number> closePrice; private CashFlow cashFlow; private int firstIndex; private int lastIndex; private TimeSeries series; public StockAndCashFlowDataset(TimeSeries series, Indicator<? extends Number> closePrice, CashFlow cashFlow, int firstIndex, int lastIndex) { this.data = new DefaultKeyedValues2D(); this.closePrice = closePrice; this.cashFlow = cashFlow; this.firstIndex = firstIndex; this.lastIndex = lastIndex; this.series = series; loadValues(); } private void loadValues() { data = new DefaultKeyedValues2D(); for (int i = firstIndex; i <= lastIndex; i++) { data.addValue(closePrice.getValue(i), closePrice.getName() ,series.getTick(i).getDate().toString("hh:mm d/M/yyyy")); } for (int i = firstIndex; i <= lastIndex; i++) { data.addValue(cashFlow.getValue(i), "Money Amount", series.getTick(i).getDate().toString("hh:mm d/M/yyyy")); } } public int getColumnIndex(Comparable key) { return this.data.getColumnIndex(key); } public Comparable getColumnKey(int column) { return this.data.getColumnKey(column); } public List getColumnKeys() { return this.data.getColumnKeys(); } public int getRowIndex(Comparable key) { return this.data.getRowIndex(key); } public Comparable getRowKey(int row) { return this.data.getRowKey(row); } public List getRowKeys() { return this.data.getRowKeys(); } public Number getValue(Comparable rowKey, Comparable columnKey) { return this.data.getValue(rowKey, columnKey); } public int getColumnCount() { return this.data.getColumnCount(); } public int getRowCount() { return this.data.getRowCount(); } public Number getValue(int row, int column) { return this.data.getValue(row, column); } } |
|
From: Carlos <ma...@us...> - 2007-08-20 19:02:00
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24551/src/test/net/sf/tail/graphics Added Files: StockAndFlowChartTest.java Log Message: Novo construtor no cashflow para o valor inicial não necessariamente ser 1. Stockandcashflow criado para o report geral, imprime o cash flow versus buy and hold de todo o timeseries, sem setas de trade. --- NEW FILE: StockAndFlowChartTest.java --- package net.sf.tail.graphics; import java.awt.Dimension; import java.awt.FlowLayout; 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; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.SMAIndicator; import net.sf.tail.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; import org.jfree.ui.ApplicationFrame; import org.jfree.ui.RefineryUtilities; public class StockAndFlowChartTest extends ApplicationFrame{ private static final long serialVersionUID = -6626066873257820845L; private StockAndCashFlowDataset seriesDataset; private Indicator<? extends Number> indicator; private CashFlow cashFlow; private final TimeSeries timeSeries; public StockAndFlowChartTest(String chartName) { super(chartName); timeSeries = readFileData(); JPanel chartPanel = createSmaAndStrategyChart(); chartPanel.setPreferredSize(new Dimension(800, 600)); JPanel mainPanel = new JPanel(new FlowLayout()); mainPanel.add(chartPanel,"North"); mainPanel.setPreferredSize(new Dimension(1280, 1024)); setContentPane(mainPanel); } public static void main(String args[]) { StockAndFlowChartTest chart = new StockAndFlowChartTest("Chart test"); chart.pack(); RefineryUtilities.centerFrameOnScreen(chart); chart.setVisible(true); } public JPanel createSmaAndStrategyChart() { indicator = new ClosePriceIndicator(timeSeries); SMAIndicator sma = new SMAIndicator(indicator, 8); List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(indicator,sma), 0, timeSeries.getSize() - 1); cashFlow = new CashFlow(timeSeries, trades, indicator.getValue(0).doubleValue()); seriesDataset = new StockAndCashFlowDataset(timeSeries, indicator, cashFlow, 0, timeSeries.getSize() - 1); StockAndCashFlowChart seriesAndFlowChart = new StockAndCashFlowChart(seriesDataset); JFreeChart jfreechart = seriesAndFlowChart.createChart("Test Chart"); return new ChartPanel(jfreechart); } /** * @return */ private TimeSeries readFileData() { CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader(); 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; } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/indicator/tracker Modified Files: WilliamsRIndicatorTest.java Log Message: arrumando pacotes Index: WilliamsRIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/WilliamsRIndicatorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WilliamsRIndicatorTest.java 20 Aug 2007 18:03:57 -0000 1.3 --- WilliamsRIndicatorTest.java 20 Aug 2007 18:15:31 -0000 1.4 *************** *** 6,10 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; --- 6,9 ---- *************** *** 12,15 **** --- 11,15 ---- import net.sf.tail.indicator.simple.MaxPriceIndicator; import net.sf.tail.indicator.simple.MinPriceIndicator; + import net.sf.tail.series.DefaultTimeSeries; import org.junit.Before; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/graphics Modified Files: CashFlowDatasetTest.java SeriesDatasetTest.java Log Message: arrumando pacotes Index: CashFlowDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CashFlowDatasetTest.java 18 Aug 2007 14:58:33 -0000 1.2 --- CashFlowDatasetTest.java 20 Aug 2007 18:15:31 -0000 1.3 *************** *** 7,11 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Operation; import net.sf.tail.OperationType; --- 7,10 ---- *************** *** 14,17 **** --- 13,17 ---- import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; + import net.sf.tail.series.DefaultTimeSeries; import org.joda.time.DateTime; Index: SeriesDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeriesDatasetTest.java 4 Aug 2007 02:34:18 -0000 1.3 --- SeriesDatasetTest.java 20 Aug 2007 18:15:31 -0000 1.4 *************** *** 7,11 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Indicator; import net.sf.tail.Operation; --- 7,10 ---- *************** *** 15,18 **** --- 14,18 ---- import net.sf.tail.Trade; import net.sf.tail.sample.SampleIndicator; + import net.sf.tail.series.DefaultTimeSeries; import org.joda.time.DateTime; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/walk In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/analysis/walk Modified Files: WalkForwardTest.java Log Message: arrumando pacotes Index: WalkForwardTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/walk/WalkForwardTest.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** WalkForwardTest.java 15 Aug 2007 22:07:52 -0000 1.14 --- WalkForwardTest.java 20 Aug 2007 18:15:30 -0000 1.15 *************** *** 16,20 **** import net.sf.tail.Walker; import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; --- 16,19 ---- *************** *** 22,25 **** --- 21,25 ---- import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleTimeSeries; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.FakeStrategy; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/series Added Files: SlicerByTimePeriodTest.java Log Message: arrumando pacotes --- NEW FILE: SlicerByTimePeriodTest.java --- package net.sf.tail.series; import static org.junit.Assert.assertEquals; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.TimeSeriesSlicer.SlicerType; import net.sf.tail.sample.SampleTimeSeries; import net.sf.tail.series.SlicerByTimePeriod; import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Before; import org.junit.Test; public class SlicerByTimePeriodTest { private SampleTimeSeries series; private DateTime date; @Before public void setUp() throws Exception { this.date = new DateTime(0); } @Test public void testSplitByYearOneDatePerYear() { 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 split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(5, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(0, split.getSlice(0).getEnd()); assertEquals(1, split.getSlice(1).getBegin()); assertEquals(1, split.getSlice(1).getEnd()); assertEquals(2, split.getSlice(2).getBegin()); assertEquals(2, split.getSlice(2).getEnd()); assertEquals(3, split.getSlice(3).getBegin()); assertEquals(3, split.getSlice(3).getEnd()); assertEquals(4, split.getSlice(4).getBegin()); assertEquals(4, split.getSlice(4).getEnd()); } @Test public void testSplitByYear() { 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) ); Period period = new Period().withYears(1); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(4, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(2, split.getSlice(0).getEnd()); assertEquals(3, split.getSlice(1).getBegin()); assertEquals(5, split.getSlice(1).getEnd()); assertEquals(6, split.getSlice(2).getBegin()); assertEquals(9, split.getSlice(2).getEnd()); assertEquals(10, split.getSlice(3).getBegin()); assertEquals(10, split.getSlice(3).getEnd()); } @Test public void testSplitByYearForcingJuly() { Period period = new Period().withYears(1); series = new SampleTimeSeries( date.withDate(2000,1,1), date.withDate(2000,2,1), date.withDate(2000,3,1), date.withDate(2001,1,1), date.withDate(2001,2,1), date.withDate(2001,12,12), date.withDate(2002,1,1), date.withDate(2002,2,1), date.withDate(2002,3,1), date.withDate(2002,5,1), date.withDate(2003,3,1) ); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withYear(2000).withMonthOfYear(7), SlicerType.REGULAR); assertEquals(3, split.getSlices()); assertEquals(3, split.getSlice(0).getBegin()); assertEquals(4, split.getSlice(0).getEnd()); assertEquals(5, split.getSlice(1).getBegin()); assertEquals(9, split.getSlice(1).getEnd()); assertEquals(10, split.getSlice(2).getBegin()); assertEquals(10, split.getSlice(2).getEnd()); } @Test public void testSplitByYearWithHolesBetweenSlices() { 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(2005), date.withYear(2005)); Period period = new Period().withYears(1); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(4, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(2, split.getSlice(0).getEnd()); assertEquals(3, split.getSlice(1).getBegin()); assertEquals(5, split.getSlice(1).getEnd()); assertEquals(6, split.getSlice(2).getBegin()); assertEquals(9, split.getSlice(2).getEnd()); assertEquals(10, split.getSlice(3).getBegin()); assertEquals(11, split.getSlice(3).getEnd()); } @Test public void testSplitByYearWithBiggerSlices() { series = new SampleTimeSeries( date.withDate(2000, 1, 1), date.withDate(2000, 2, 1), date.withDate(2000, 3, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date.withDate(2003, 3, 3) ); Period period = new Period().withYears(1); SlicerByTimePeriod split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(4, split.getSlices()); assertEquals(0, split.getBiggerSlice(0, 2).getBegin()); assertEquals(5, split.getBiggerSlice(0, 2).getEnd()); assertEquals(3, split.getBiggerSlice(1, 2).getBegin()); assertEquals(9, split.getBiggerSlice(1, 2).getEnd()); assertEquals(0, split.getBiggerSlice(0, 3).getBegin()); assertEquals(9, split.getBiggerSlice(0, 3).getEnd()); } @Test public void testSplitByYearBeginningInJuly() { Period period = new Period().withYears(1); series = new SampleTimeSeries( date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date.withDate(2003, 3, 3) ); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(3, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(4, split.getSlice(0).getEnd()); assertEquals(5, split.getSlice(1).getBegin()); assertEquals(9, split.getSlice(1).getEnd()); assertEquals(10, split.getSlice(2).getBegin()); assertEquals(10, split.getSlice(2).getEnd()); } @Test public void testSplitByYearBeginingInJulyOverridingPeriodBeginTo1of1of2000() { Period period = new Period().withYears(1); series = new SampleTimeSeries( date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date.withDate(2003, 3, 3) ); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.REGULAR); assertEquals(4, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(2, split.getSlice(0).getEnd()); assertEquals(3, split.getSlice(1).getBegin()); assertEquals(5, split.getSlice(1).getEnd()); assertEquals(6, split.getSlice(2).getBegin()); assertEquals(9, split.getSlice(2).getEnd()); assertEquals(10, split.getSlice(3).getBegin()); assertEquals(10, split.getSlice(3).getEnd()); } @Test public void testSplitByHour() { Period period = new Period().withHours(1); DateTime openTime = new DateTime(0).withTime(10, 0, 0, 0); series = new SampleTimeSeries( openTime, openTime.plusMinutes(1) , openTime.plusMinutes(2), openTime.plusMinutes(10), openTime.plusMinutes(15), openTime.plusMinutes(25), openTime.plusHours(1), openTime.plusHours(2), openTime.plusHours(7), openTime.plusHours(10).plusMinutes(5), openTime.plusHours(10).plusMinutes(10), openTime.plusHours(10).plusMinutes(20), openTime.plusHours(10).plusMinutes(30) ); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, SlicerType.REGULAR); assertEquals(5, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(5, split.getSlice(0).getEnd()); assertEquals(6, split.getSlice(1).getBegin()); assertEquals(6, split.getSlice(1).getEnd()); assertEquals(7, split.getSlice(2).getBegin()); assertEquals(7, split.getSlice(2).getEnd()); assertEquals(8, split.getSlice(3).getBegin()); assertEquals(8, split.getSlice(3).getEnd()); assertEquals(9, split.getSlice(4).getBegin()); assertEquals(12, split.getSlice(4).getEnd()); } @Test public void testMemorizedSlicer() { Period period = new Period().withYears(1); series = new SampleTimeSeries( date.withDate(2000, 7, 1), date.withDate(2000, 8, 1),date.withDate(2000, 9, 15), date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002, 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date.withDate(2003, 3, 3) ); TimeSeriesSlicer split = new SlicerByTimePeriod(series, period, date.withDate(2000, 1, 1), SlicerType.MEMORIZED); assertEquals(4, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); assertEquals(2, split.getSlice(0).getEnd()); assertEquals(0, split.getSlice(1).getBegin()); assertEquals(5, split.getSlice(1).getEnd()); assertEquals(0, split.getSlice(2).getBegin()); assertEquals(9, split.getSlice(2).getEnd()); assertEquals(0, split.getSlice(3).getBegin()); assertEquals(10, split.getSlice(3).getEnd()); } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/java/net/sf/tail Removed Files: DefaultTimeSeries.java Log Message: arrumando pacotes --- DefaultTimeSeries.java DELETED --- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/java/net/sf/tail/series Added Files: SlicerByTimePeriod.java DefaultTimeSeries.java Log Message: arrumando pacotes --- NEW FILE: DefaultTimeSeries.java --- package net.sf.tail.series; import java.util.List; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; /** * Implementação default da interface {@link TimeSeries}. * * @author Marcio * */ public class DefaultTimeSeries implements TimeSeries { private final List<Tick> ticks; private final String name; public DefaultTimeSeries(String name, List<Tick> ticks) { this.name = name; this.ticks = ticks; } public DefaultTimeSeries(List<Tick> ticks) { this(null, ticks); } public String getName() { return name == null ? "not named" : name; } public Tick getTick(int i) { return ticks.get(i); } public int getSize() { return ticks.size(); } public int getBegin() { return 0; } public int getEnd() { return getSize() - 1; } public String getPeriod() { return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); } } --- NEW FILE: SlicerByTimePeriod.java --- package net.sf.tail.series; import java.util.ArrayList; import java.util.List; import net.sf.tail.ConstrainedTimeSeries; import net.sf.tail.TimeSeries; import net.sf.tail.TimeSeriesSlicer; import org.apache.log4j.Logger; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; public class SlicerByTimePeriod implements TimeSeriesSlicer { private transient TimeSeries series; private Period period; private transient List<TimeSeries> splittedSeries; private DateTime periodBegin; private transient static Logger LOG = Logger.getLogger(SlicerByTimePeriod.class); private SlicerType slicerType; public SlicerByTimePeriod(TimeSeries series, Period period, DateTime begin, SlicerType slicerType) { splittedSeries = new ArrayList<TimeSeries>(); this.series = series; this.period = period; this.periodBegin = begin; this.slicerType = slicerType; split(); } public SlicerByTimePeriod(TimeSeries series, Period period, SlicerType slicerType) { this(series, period, series.getTick(0).getDate(), slicerType); } public TimeSeriesSlicer applyForType(SlicerType type){ if (type == this.slicerType) { return this; } return new SlicerByTimePeriod(this.series,this.period,this.periodBegin ,type); } private void split() { LOG.debug(String.format("Spliting %s ", series)); DateTime begin = periodBegin; DateTime end = begin.plus(period); Interval interval = new Interval(begin, end); int index = 0; while (series.getTick(index).getDate().isBefore(interval.getStart())) index++; int sliceBeginIndex = index; while (index <= series.getEnd()) { if (interval.contains(series.getTick(index).getDate())) { index++; } else if (end.plus(period).isAfter(series.getTick(index).getDate())) { createSlice(sliceBeginIndex, index - 1); LOG.debug(String.format("Interval %s before %s ", interval, series.getTick(index).getDate())); if(slicerType == SlicerType.REGULAR) sliceBeginIndex = index; begin = end; end = begin.plus(period); interval = new Interval(begin, end); index++; } else { begin = end; end = begin.plus(period); interval = new Interval(begin, end); } } createSlice(sliceBeginIndex, series.getEnd()); } private void createSlice(int begin, int end) { LOG.debug(String.format("New series from %d to %d ", begin, end)); LOG.debug(String.format("New series from %s to %s ", series.getTick(begin).getDate(), series.getTick(end) .getDate())); ConstrainedTimeSeries slice = new ConstrainedTimeSeries(series, begin, end); splittedSeries.add(slice); } public TimeSeries getSlice(int position) { return getBiggerSlice(position, 1); } public TimeSeries getBiggerSlice(int position, int numberOfPeriodsOfTheSlice) { if (numberOfPeriodsOfTheSlice < 1) { throw new IllegalArgumentException(); } return new ConstrainedTimeSeries(series, splittedSeries.get(position).getBegin(), splittedSeries.get( Math.min(position + numberOfPeriodsOfTheSlice - 1, splittedSeries.size() - 1)).getEnd()); } public int getSlices() { return splittedSeries.size(); } public TimeSeries getSeries() { return series; } public String getName() { String sPeriod = ""; sPeriod = periodToString(sPeriod); return this.getClass().getSimpleName() + " Period: " + sPeriod; } private String periodToString(String sPeriod) { if(period.getYears() > 0) sPeriod += period.getYears() + " year(s) ,"; if(period.getMonths() > 0) sPeriod += period.getMonths() + " month(s) ,"; if(period.getDays()> 0 ) sPeriod += period.getDays() + " day(s) ,"; if(period.getHours()> 0 ) sPeriod += period.getHours() + " day(s) ,"; if(period.getMinutes()> 0 ) sPeriod += period.getMinutes() + " day(s) ,"; return sPeriod.substring(0,sPeriod.length()-2); } public String getPeriod() { return this.periodBegin.toString("hh:mm dd/MM/yyyy - ") + series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); } public SlicerType getSlicerType() { return this.slicerType; } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:30
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/reader In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/java/net/sf/tail/reader Modified Files: CedroTimeSeriesLoader.java Log Message: arrumando pacotes Index: CedroTimeSeriesLoader.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/reader/CedroTimeSeriesLoader.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CedroTimeSeriesLoader.java 8 Aug 2007 19:56:19 -0000 1.14 --- CedroTimeSeriesLoader.java 20 Aug 2007 18:15:31 -0000 1.15 *************** *** 10,16 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Tick; import net.sf.tail.TimeSeriesLoader; import org.apache.log4j.Logger; --- 10,16 ---- import java.util.List; import net.sf.tail.Tick; import net.sf.tail.TimeSeriesLoader; + import net.sf.tail.series.DefaultTimeSeries; import org.apache.log4j.Logger; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:29
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/indicator/oscilator Modified Files: StochasticOscilatorKTest.java StochasticOscilatorDTest.java Log Message: arrumando pacotes Index: StochasticOscilatorKTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorKTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StochasticOscilatorKTest.java 26 Jul 2007 22:23:34 -0000 1.3 --- StochasticOscilatorKTest.java 20 Aug 2007 18:15:30 -0000 1.4 *************** *** 6,12 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; import org.junit.Before; --- 6,12 ---- import java.util.List; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; + import net.sf.tail.series.DefaultTimeSeries; import org.junit.Before; Index: StochasticOscilatorDTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorDTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StochasticOscilatorDTest.java 26 Jul 2007 22:23:34 -0000 1.3 --- StochasticOscilatorDTest.java 20 Aug 2007 18:15:30 -0000 1.4 *************** *** 6,13 **** import java.util.List; - import net.sf.tail.DefaultTimeSeries; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; import net.sf.tail.indicator.tracker.SMAIndicator; import org.junit.Before; --- 6,13 ---- import java.util.List; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; import net.sf.tail.indicator.tracker.SMAIndicator; + import net.sf.tail.series.DefaultTimeSeries; import org.junit.Before; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:29
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/analysis Removed Files: SlicerByTimePeriodTest.java Log Message: arrumando pacotes --- SlicerByTimePeriodTest.java DELETED --- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:29
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/java/net/sf/tail/analysis Removed Files: SlicerByTimePeriod.java Log Message: arrumando pacotes --- SlicerByTimePeriod.java DELETED --- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:29
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail Modified Files: EMACompleteTest.java EMAWalkTest.java XmlSerializerTest.java Log Message: arrumando pacotes Index: EMACompleteTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMACompleteTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EMACompleteTest.java 20 Aug 2007 18:03:57 -0000 1.4 --- EMACompleteTest.java 20 Aug 2007 18:15:29 -0000 1.5 *************** *** 10,14 **** import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.MaximumDrawDownCriterion; import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; --- 10,13 ---- *************** *** 24,27 **** --- 23,27 ---- import net.sf.tail.report.ReportGenerator; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; Index: EMAWalkTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMAWalkTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EMAWalkTest.java 15 Aug 2007 22:07:52 -0000 1.9 --- EMAWalkTest.java 20 Aug 2007 18:15:29 -0000 1.10 *************** *** 8,12 **** import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.AverageProfitCriterion; import net.sf.tail.analysis.criteria.MaximumDrawDownCriterion; --- 8,11 ---- *************** *** 21,24 **** --- 20,24 ---- import net.sf.tail.report.ReportGenerator; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; Index: XmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/XmlSerializerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XmlSerializerTest.java 20 Aug 2007 18:03:57 -0000 1.1 --- XmlSerializerTest.java 20 Aug 2007 18:15:29 -0000 1.2 *************** *** 11,15 **** import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; --- 11,14 ---- *************** *** 21,24 **** --- 20,24 ---- import net.sf.tail.report.ReportSerializer; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:28
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4919/src/test/net/sf/tail/report Modified Files: ReportGeneratorTest.java ReportSerializerTest.java Log Message: arrumando pacotes Index: ReportSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportSerializerTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReportSerializerTest.java 20 Aug 2007 18:03:58 -0000 1.2 --- ReportSerializerTest.java 20 Aug 2007 18:15:29 -0000 1.3 *************** *** 11,15 **** import net.sf.tail.Walker; import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; --- 11,14 ---- *************** *** 19,22 **** --- 18,22 ---- import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleTimeSeries; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; import net.sf.tail.strategy.JustBuyOnceStrategy; Index: ReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportGeneratorTest.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ReportGeneratorTest.java 18 Aug 2007 19:55:48 -0000 1.16 --- ReportGeneratorTest.java 20 Aug 2007 18:15:29 -0000 1.17 *************** *** 11,19 **** import net.sf.tail.Trade; import net.sf.tail.TimeSeriesSlicer.SlicerType; - import net.sf.tail.analysis.SlicerByTimePeriod; import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.Decision; import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleTimeSeries; import net.sf.tail.strategy.FakeStrategy; --- 11,19 ---- import net.sf.tail.Trade; import net.sf.tail.TimeSeriesSlicer.SlicerType; import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.evaluator.Decision; import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleTimeSeries; + import net.sf.tail.series.SlicerByTimePeriod; import net.sf.tail.strategy.FakeStrategy; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:23
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4892/src/java/net/sf/tail/series Log Message: Directory /cvsroot/tail/Tail/src/java/net/sf/tail/series added to the repository |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:15:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4892/src/test/net/sf/tail/series Log Message: Directory /cvsroot/tail/Tail/src/test/net/sf/tail/series added to the repository |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:04:00
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/java/net/sf/tail/indicator/simple Modified Files: ClosePriceIndicator.java Log Message: terminado o reportSerializer e refatorado código Index: ClosePriceIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple/ClosePriceIndicator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ClosePriceIndicator.java 7 Aug 2007 19:45:37 -0000 1.6 --- ClosePriceIndicator.java 20 Aug 2007 18:03:58 -0000 1.7 *************** *** 4,8 **** import net.sf.tail.TimeSeries; ! public class ClosePriceIndicator implements Indicator<Double> { private TimeSeries data; --- 4,8 ---- import net.sf.tail.TimeSeries; ! public class ClosePriceIndicator implements Indicator<Double>{ private TimeSeries data; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:03:58
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/reader In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/test/net/sf/tail/reader Modified Files: CedroTimeSeriesLoaderTest.java Log Message: terminado o reportSerializer e refatorado código Index: CedroTimeSeriesLoaderTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/reader/CedroTimeSeriesLoaderTest.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CedroTimeSeriesLoaderTest.java 7 Aug 2007 17:34:44 -0000 1.16 --- CedroTimeSeriesLoaderTest.java 20 Aug 2007 18:03:58 -0000 1.17 *************** *** 5,9 **** import java.io.FileInputStream; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; --- 5,8 ---- *************** *** 51,60 **** } - - // Método adicionado por causa da compatibilidade do Eclipse 3.1.2(Rede - // Linux) - // e o JUnit4 - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(CedroTimeSeriesLoaderTest.class); - } } --- 50,52 ---- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:03:58
|
Update of /cvsroot/tail/Tail/src/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/templates Modified Files: report.html style.css report.ftl Log Message: terminado o reportSerializer e refatorado código Index: report.html =================================================================== RCS file: /cvsroot/tail/Tail/src/templates/report.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** report.html 18 Aug 2007 19:55:48 -0000 1.4 --- report.html 20 Aug 2007 18:03:58 -0000 1.5 *************** *** 13,17 **** <body><link rel="stylesheet" type="text/css" href="style.css"> ! <table align="center"> <tr> <th>Period</th> --- 13,17 ---- <body><link rel="stylesheet" type="text/css" href="style.css"> ! <table align="left"> <tr> <th>Period</th> Index: report.ftl =================================================================== RCS file: /cvsroot/tail/Tail/src/templates/report.ftl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** report.ftl 18 Aug 2007 19:55:48 -0000 1.9 --- report.ftl 20 Aug 2007 18:03:58 -0000 1.10 *************** *** 2,6 **** <link rel="stylesheet" type="text/css" href="style.css"> ! <table align="center"> <tr> <th>Period</th> --- 2,6 ---- <link rel="stylesheet" type="text/css" href="style.css"> ! <table align="left"> <tr> <th>Period</th> Index: style.css =================================================================== RCS file: /cvsroot/tail/Tail/src/templates/style.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** style.css 18 Aug 2007 19:55:48 -0000 1.4 --- style.css 20 Aug 2007 18:03:58 -0000 1.5 *************** *** 106,109 **** --- 106,112 ---- { color: #003061; + padding: 3px; + padding-left: 5px; + padding-right: 5px; } .total{ |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:03:58
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/evaluator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/java/net/sf/tail/analysis/evaluator Modified Files: Decision.java Log Message: terminado o reportSerializer e refatorado código Index: Decision.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/evaluator/Decision.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Decision.java 13 Aug 2007 20:21:16 -0000 1.10 --- Decision.java 20 Aug 2007 18:03:57 -0000 1.11 *************** *** 9,16 **** import net.sf.tail.Trade; ! public class Decision { private AnalysisCriterion criterion; ! private TimeSeries series; --- 9,16 ---- import net.sf.tail.Trade; ! public class Decision{ private AnalysisCriterion criterion; ! private TimeSeries series; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-08-20 18:03:57
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/java/net/sf/tail/report Modified Files: ReportSerializer.java Report.java Log Message: terminado o reportSerializer e refatorado código Index: ReportSerializer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/ReportSerializer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReportSerializer.java 15 Aug 2007 22:07:52 -0000 1.2 --- ReportSerializer.java 20 Aug 2007 18:03:57 -0000 1.3 *************** *** 1,6 **** package net.sf.tail.report; - import net.sf.tail.sample.SampleTimeSeries; - import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; --- 1,4 ---- *************** *** 11,15 **** // ele apenas transforma, quem grava deve ser outra pessoa XStream xstream = new XStream(new DomDriver()); - xstream.omitField(SampleTimeSeries.class, "ticks"); xstream.setMode(XStream.ID_REFERENCES); return xstream.toXML(report); --- 9,12 ---- Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Report.java 8 Aug 2007 22:03:28 -0000 1.5 --- Report.java 20 Aug 2007 18:03:57 -0000 1.6 *************** *** 9,13 **** public class Report { ! private List<Decision> decisions; private TimeSeriesSlicer slicer; --- 9,13 ---- public class Report { ! private transient List<Decision> decisions; private TimeSeriesSlicer slicer; *************** *** 19,24 **** this.decisions = decisions; this.slicer = slicer; - - } --- 19,22 ---- |
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/strategy In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32071/src/test/net/sf/tail/strategy Modified Files: SupportStrategyTest.java IndicatorOverIndicatorStrategyTest.java IndicatorCrossedIndicatorStrategyTest.java ResistanceStrategyTest.java MinValueStarterStrategyTest.java Log Message: terminado o reportSerializer e refatorado código Index: IndicatorOverIndicatorStrategyTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/strategy/IndicatorOverIndicatorStrategyTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** IndicatorOverIndicatorStrategyTest.java 8 Jun 2007 14:59:36 -0000 1.7 --- IndicatorOverIndicatorStrategyTest.java 20 Aug 2007 18:03:57 -0000 1.8 *************** *** 4,8 **** import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Indicator; import net.sf.tail.Operation; --- 4,7 ---- *************** *** 12,16 **** import net.sf.tail.sample.SampleIndicator; - import org.junit.After; import org.junit.Before; import org.junit.Test; --- 11,14 ---- *************** *** 51,63 **** } - - @After - public void tearDown() throws Exception { - } - - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(IndicatorOverIndicatorStrategyTest.class); - } - } --- 49,51 ---- Index: IndicatorCrossedIndicatorStrategyTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/strategy/IndicatorCrossedIndicatorStrategyTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IndicatorCrossedIndicatorStrategyTest.java 8 Jun 2007 14:59:36 -0000 1.5 --- IndicatorCrossedIndicatorStrategyTest.java 20 Aug 2007 18:03:57 -0000 1.6 *************** *** 5,9 **** import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Indicator; import net.sf.tail.Operation; --- 5,8 ---- *************** *** 120,127 **** } } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(IndicatorCrossedIndicatorStrategyTest.class); - } - } --- 119,121 ---- Index: SupportStrategyTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/strategy/SupportStrategyTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SupportStrategyTest.java 8 Jun 2007 14:59:36 -0000 1.3 --- SupportStrategyTest.java 20 Aug 2007 18:03:57 -0000 1.4 *************** *** 4,8 **** import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Operation; import net.sf.tail.OperationType; --- 4,7 ---- *************** *** 45,51 **** assertFalse(support.shouldOperate(trade, 5)); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(SupportStrategyTest.class); - } } --- 44,46 ---- Index: ResistanceStrategyTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/strategy/ResistanceStrategyTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResistanceStrategyTest.java 8 Jun 2007 14:59:36 -0000 1.3 --- ResistanceStrategyTest.java 20 Aug 2007 18:03:57 -0000 1.4 *************** *** 4,8 **** import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Operation; import net.sf.tail.OperationType; --- 4,7 ---- *************** *** 52,58 **** assertEquals(new Operation(6, OperationType.SELL), trade.getExit()); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(ResistanceStrategyTest.class); - } } --- 51,53 ---- Index: MinValueStarterStrategyTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/strategy/MinValueStarterStrategyTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MinValueStarterStrategyTest.java 8 Jun 2007 14:59:36 -0000 1.4 --- MinValueStarterStrategyTest.java 20 Aug 2007 18:03:57 -0000 1.5 *************** *** 4,8 **** import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import junit.framework.JUnit4TestAdapter; import net.sf.tail.Operation; import net.sf.tail.OperationType; --- 4,7 ---- *************** *** 62,68 **** assertFalse(starter.shouldOperate(trade, 4)); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(MinValueStarterStrategyTest.class); - } } --- 61,63 ---- |