tail-cvs — cvs commits

[Tail-cvs] Tail/src/java/net/sf/tail/report/xls CellStylist.java, 1.7

[xanaot <xa...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28044/src/java/net/sf/tail/report/xls

Modified Files:
	CellStylist.java 
Log Message:
Refatoração dos testes do Report XLS generator

Index: CellStylist.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CellStylist.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CellStylist.java	3 Oct 2007 17:47:00 -0000	1.6
--- CellStylist.java	17 Oct 2007 17:37:28 -0000	1.7
***************
*** 16,19 ****
--- 16,21 ----
  public class CellStylist {
  
+ 	protected HSSFWorkbook workbook;
+ 
  	public CellStylist(HSSFWorkbook workbook) {
  		this.workbook = workbook;
***************
*** 21,25 ****
  
  	protected int loadPicture(HSSFWorkbook wb, File reportPNG) throws IOException {
- 
  		int pictureIndex = 0;
  		FileInputStream fis = null;
--- 23,26 ----
***************
*** 41,46 ****
  	}
  
- 	protected HSSFWorkbook workbook;
- 
  	protected void rearrangeSheet(HSSFSheet sheet, int numColumn) {
  		for (int i = 0; i < numColumn; i++) {
--- 42,45 ----
***************
*** 77,81 ****
  		return style;
  	}
! 	
  	protected HSSFCellStyle createInternalCellStyle() {
  		HSSFCellStyle style = workbook.createCellStyle();
--- 76,80 ----
  		return style;
  	}
! 
  	protected HSSFCellStyle createInternalCellStyle() {
  		HSSFCellStyle style = workbook.createCellStyle();
***************
*** 83,87 ****
  		style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM);
  		style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
! 		
  		HSSFFont font = workbook.createFont();
  		font.setFontName("Arial");
--- 82,86 ----
  		style.setBorderLeft(HSSFCellStyle.BORDER_MEDIUM);
  		style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
! 
  		HSSFFont font = workbook.createFont();
  		font.setFontName("Arial");

[Tail-cvs] Tail/src/java/net/sf/tail/io StockAnalysisSerializer.java, 1.7 StockSerializer.java, 1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/java/net/sf/tail/io

Modified Files:
	StockAnalysisSerializer.java StockSerializer.java 
Log Message:
refatoração do timeSeries

Index: StockSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StockSerializer.java	15 Oct 2007 20:23:25 -0000	1.2
--- StockSerializer.java	17 Oct 2007 16:51:44 -0000	1.3
***************
*** 3,7 ****
  import java.io.IOException;
  
! import net.sf.tail.analysis.SerializableTimeSeries;
  
  import com.thoughtworks.xstream.XStream;
--- 3,7 ----
  import java.io.IOException;
  
! import net.sf.tail.series.SerializableTimeSeries;
  
  import com.thoughtworks.xstream.XStream;

Index: StockAnalysisSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockAnalysisSerializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StockAnalysisSerializer.java	17 Oct 2007 16:41:55 -0000	1.6
--- StockAnalysisSerializer.java	17 Oct 2007 16:51:44 -0000	1.7
***************
*** 4,9 ****
  
  import net.sf.tail.TimeSeriesSlicer;
- import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.analysis.StockAnalysis;
  
  import com.thoughtworks.xstream.XStream;
--- 4,9 ----
  
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.StockAnalysis;
+ import net.sf.tail.series.SerializableTimeSeries;
  
  import com.thoughtworks.xstream.XStream;

[Tail-cvs] Tail/src/java/net/sf/tail/analysis StockAnalysis.java, 1.13 SerializableTimeSeries.java, NONE

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/java/net/sf/tail/analysis

Modified Files:
	StockAnalysis.java 
Removed Files:
	SerializableTimeSeries.java 
Log Message:
refatoração do timeSeries

Index: StockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** StockAnalysis.java	15 Oct 2007 23:36:45 -0000	1.12
--- StockAnalysis.java	17 Oct 2007 16:51:43 -0000	1.13
***************
*** 12,15 ****
--- 12,16 ----
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.report.Report;
+ import net.sf.tail.series.SerializableTimeSeries;
  
  public class StockAnalysis implements Serializable {

--- SerializableTimeSeries.java DELETED ---

[Tail-cvs] Tail/src/test/net/sf/tail StockAnalysisXmlSerializerTest.java, 1.10

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/test/net/sf/tail

Modified Files:
	StockAnalysisXmlSerializerTest.java 
Log Message:
refatoração do timeSeries

Index: StockAnalysisXmlSerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/StockAnalysisXmlSerializerTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StockAnalysisXmlSerializerTest.java	15 Oct 2007 20:23:23 -0000	1.9
--- StockAnalysisXmlSerializerTest.java	17 Oct 2007 16:51:43 -0000	1.10
***************
*** 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;
--- 9,12 ----
***************
*** 24,27 ****
--- 23,27 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  

[Tail-cvs] Tail/src/test/net/sf/tail/io SerializerTest.java,1.12

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/test/net/sf/tail/io

Modified Files:
	SerializerTest.java 
Log Message:
refatoração do timeSeries

Index: SerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SerializerTest.java	15 Oct 2007 20:23:25 -0000	1.11
--- SerializerTest.java	17 Oct 2007 16:51:44 -0000	1.12
***************
*** 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;
--- 12,15 ----
***************
*** 26,29 ****
--- 25,29 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  

[Tail-cvs] Tail/src/test/net/sf/tail/analysis StockAnalysisTest.java, 1.9 StockTest.java, NONE

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/test/net/sf/tail/analysis

Modified Files:
	StockAnalysisTest.java 
Removed Files:
	StockTest.java 
Log Message:
refatoração do timeSeries

Index: StockAnalysisTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StockAnalysisTest.java	15 Oct 2007 20:23:24 -0000	1.8
--- StockAnalysisTest.java	17 Oct 2007 16:51:43 -0000	1.9
***************
*** 22,25 ****
--- 22,26 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.RegularSlicer;
+ import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tail.strategy.FakeStrategy;
  

--- StockTest.java DELETED ---

[Tail-cvs] Tail/src/java/net/sf/tail/series SerializableTimeSeries.java, 1.1

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/java/net/sf/tail/series

Added Files:
	SerializableTimeSeries.java 
Log Message:
refatoração do timeSeries

--- NEW FILE: SerializableTimeSeries.java ---
package net.sf.tail.series;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;

import net.sf.tail.Tick;
import net.sf.tail.TimeSeries;
import net.sf.tail.TimeSeriesLoader;

public class SerializableTimeSeries implements TimeSeries {

	private String name;

	private String seriesAdress;

	private transient TimeSeries series;

	private TimeSeriesLoader loader;

	public SerializableTimeSeries(String name, String seriesAdress, TimeSeriesLoader loader) throws FileNotFoundException, IOException {
		this.name = name;
		this.seriesAdress = seriesAdress;
		this.loader = loader;
		this.series = loader.load(new FileInputStream(seriesAdress), name);
	}

	public String getName() {
		return name;
	}

	public String getSeriesAdress() {
		return seriesAdress;
	}
	
	public TimeSeries getSeries()
	{
		if(series == null) reloadSeries();
		return series;
	}
	
	public TimeSeries reloadSeries()
	{
		try {
			this.series = loader.load(new FileInputStream(seriesAdress), name);
		} catch (FileNotFoundException e) {
			e.printStackTrace();
			throw new RuntimeException(e);
		}
		return series;
	}

	@Override
	public int hashCode() {
		final int prime = 31;
		int result = 1;
		result = prime * result + ((name == null) ? 0 : name.hashCode());
		result = prime * result + ((seriesAdress == null) ? 0 : seriesAdress.hashCode());
		return result;
	}

	@Override
	public boolean equals(Object obj) {
		if (this == obj)
			return true;
		if (obj == null)
			return false;
		if (getClass() != obj.getClass())
			return false;
		final SerializableTimeSeries other = (SerializableTimeSeries) obj;
		if (name == null) {
			if (other.name != null)
				return false;
		} else if (!name.equals(other.name))
			return false;
		if (seriesAdress == null) {
			if (other.seriesAdress != null)
				return false;
		} else if (!seriesAdress.equals(other.seriesAdress))
			return false;
		return true;
	}

	public int getBegin() {
		return getSeries().getBegin();
	}

	public int getEnd() {
		return getSeries().getEnd();
	}

	public String getPeriod() {
		return getSeries().getPeriod();
	}

	public int getSize() {
		return getSeries().getSize();
	}

	public Tick getTick(int i) {
		return getSeries().getTick(i);
	}
}

[Tail-cvs] Tail/src/test/net/sf/tail/series SerializableTimeSeriesTest.java, 1.1

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8274/src/test/net/sf/tail/series

Added Files:
	SerializableTimeSeriesTest.java 
Log Message:
refatoração do timeSeries

--- NEW FILE: SerializableTimeSeriesTest.java ---
package net.sf.tail.series;

import static org.junit.Assert.assertEquals;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;

import net.sf.tail.TimeSeries;
import net.sf.tail.io.StockSerializer;
import net.sf.tail.io.reader.CedroTimeSeriesLoader;
import net.sf.tail.series.SerializableTimeSeries;

import org.junit.Before;
import org.junit.Test;

public class SerializableTimeSeriesTest {

	private SerializableTimeSeries stock;
	private TimeSeries 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");
	}
	
	@Test
	public void testGetName() {
		assertEquals("Teste", stock.getName());
	}

	@Test
	public void testGetSeriesAdress() {
		assertEquals("BaseBovespa/15min/ambv4.csv", stock.getSeriesAdress());
	}

	@Test
	public void testGetSeries() throws IOException {
		assertEquals(series, stock.getSeries());
	}
	
	@Test
	public void testReloadSeries() throws IOException{
		StockSerializer serializer = new StockSerializer();
		String serialized = serializer.toXML(stock);
		SerializableTimeSeries afterSerializedStock = serializer.fromXML(serialized);
		assertEquals(stock.getSeries(), afterSerializedStock.reloadSeries());
		assertEquals(stock.getSeries(), afterSerializedStock.getSeries());
	}
}

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/stockAnalysis NewStockAnalysis2.java, 1.8 NewStockAnalysis.java, 1.8 NewStockAnalysis3.java, 1.9

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8256/src/java/net/sf/tails/swing/frame/stockAnalysis

Modified Files:
	NewStockAnalysis2.java NewStockAnalysis.java 
	NewStockAnalysis3.java 
Log Message:
refatoração do timeSeries

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NewStockAnalysis2.java	15 Oct 2007 20:23:57 -0000	1.7
--- NewStockAnalysis2.java	17 Oct 2007 16:51:36 -0000	1.8
***************
*** 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;
--- 23,27 ----
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NewStockAnalysis.java	15 Oct 2007 20:23:58 -0000	1.7
--- NewStockAnalysis.java	17 Oct 2007 16:51:36 -0000	1.8
***************
*** 20,25 ****
  import javax.swing.JOptionPane;
  
- import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.io.StockSerializer;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;
--- 20,25 ----
  import javax.swing.JOptionPane;
  
  import net.sf.tail.io.StockSerializer;
+ import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NewStockAnalysis3.java	15 Oct 2007 20:23:58 -0000	1.8
--- NewStockAnalysis3.java	17 Oct 2007 16:51:36 -0000	1.9
***************
*** 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;
--- 18,21 ----
***************
*** 26,29 ****
--- 25,29 ----
  import net.sf.tail.series.PartialMemorizedSlicer;
  import net.sf.tail.series.RegularSlicer;
+ import net.sf.tail.series.SerializableTimeSeries;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;

[Tail-cvs] TailS/src/test/net/sf/tails/swing/helper CompleteHtmlGeneratorExecutor.java, 1.5 CompleteXlsGeneratorExecutor.java, 1.4

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4275/src/test/net/sf/tails/swing/helper

Modified Files:
	CompleteHtmlGeneratorExecutor.java 
	CompleteXlsGeneratorExecutor.java 
Log Message:
refatoração do timeSeries

Index: CompleteXlsGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXlsGeneratorExecutor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompleteXlsGeneratorExecutor.java	15 Oct 2007 20:23:57 -0000	1.3
--- CompleteXlsGeneratorExecutor.java	17 Oct 2007 16:42:10 -0000	1.4
***************
*** 11,15 ****
  
  import net.sf.tail.AnalysisCriterion;
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 11,14 ----
***************
*** 45,49 ****
  
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)"));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 44,48 ----
  
  		try {
! 			timeSeries = 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteHtmlGeneratorExecutor.java	15 Oct 2007 20:23:57 -0000	1.4
--- CompleteHtmlGeneratorExecutor.java	17 Oct 2007 16:42:10 -0000	1.5
***************
*** 10,14 ****
  
  import net.sf.tail.AnalysisCriterion;
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 10,13 ----
***************
*** 45,49 ****
  
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)"));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 44,48 ----
  
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("Data/Bovespa/15min/petr3-Dia-06-07.csv"), "Petrobras (petr3)");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();

[Tail-cvs] Tail/src/test/net/sf/tail/io/reader CedroTimeSeriesLoaderTest.java, 1.4

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io/reader
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail/io/reader

Modified Files:
	CedroTimeSeriesLoaderTest.java 
Log Message:
refatoração do timeSeries

Index: CedroTimeSeriesLoaderTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/reader/CedroTimeSeriesLoaderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CedroTimeSeriesLoaderTest.java	15 Oct 2007 20:23:23 -0000	1.3
--- CedroTimeSeriesLoaderTest.java	17 Oct 2007 16:41:54 -0000	1.4
***************
*** 5,9 ****
  import java.io.FileInputStream;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
--- 5,8 ----
***************
*** 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"), ""));
  	}
  
--- 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"), "");
  	}
  

[Tail-cvs] Tail/src/java/net/sf/tail/analysis SerializableTimeSeries.java, 1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/java/net/sf/tail/analysis

Modified Files:
	SerializableTimeSeries.java 
Log Message:
refatoração do timeSeries

Index: SerializableTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/SerializableTimeSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerializableTimeSeries.java	15 Oct 2007 20:23:24 -0000	1.1
--- SerializableTimeSeries.java	17 Oct 2007 16:41:55 -0000	1.2
***************
*** 8,12 ****
  import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesLoader;
- import net.sf.tail.series.DefaultTimeSeries;
  
  public class SerializableTimeSeries implements TimeSeries {
--- 8,11 ----
***************
*** 16,20 ****
  	private String seriesAdress;
  
! 	private transient DefaultTimeSeries defaultTimeSeries;
  
  	private TimeSeriesLoader loader;
--- 15,19 ----
  	private String seriesAdress;
  
! 	private transient TimeSeries series;
  
  	private TimeSeriesLoader loader;
***************
*** 24,28 ****
  		this.seriesAdress = seriesAdress;
  		this.loader = loader;
! 		this.defaultTimeSeries = loader.load(new FileInputStream(seriesAdress), name);
  	}
  
--- 23,27 ----
  		this.seriesAdress = seriesAdress;
  		this.loader = loader;
! 		this.series = loader.load(new FileInputStream(seriesAdress), name);
  	}
  
***************
*** 35,53 ****
  	}
  	
! 	public DefaultTimeSeries getSeries()
  	{
! 		if(defaultTimeSeries == null) reloadSeries();
! 		return defaultTimeSeries;
  	}
  	
! 	public DefaultTimeSeries reloadSeries()
  	{
  		try {
! 			this.defaultTimeSeries = loader.load(new FileInputStream(seriesAdress), name);
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
  			throw new RuntimeException(e);
  		}
! 		return defaultTimeSeries;
  	}
  
--- 34,52 ----
  	}
  	
! 	public TimeSeries getSeries()
  	{
! 		if(series == null) reloadSeries();
! 		return series;
  	}
  	
! 	public TimeSeries reloadSeries()
  	{
  		try {
! 			this.series = loader.load(new FileInputStream(seriesAdress), name);
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
  			throw new RuntimeException(e);
  		}
! 		return series;
  	}
  

[Tail-cvs] Tail/src/test/net/sf/tail EMACompleteTest.java, 1.21 ReportXmlSerializerTest.java, 1.8 EMAWalkTest.java, 1.20 DummyStock.java, NONE

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail

Modified Files:
	EMACompleteTest.java ReportXmlSerializerTest.java 
	EMAWalkTest.java 
Removed Files:
	DummyStock.java 
Log Message:
refatoração do timeSeries

Index: EMACompleteTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMACompleteTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** EMACompleteTest.java	15 Oct 2007 20:23:23 -0000	1.20
--- EMACompleteTest.java	17 Oct 2007 16:41:53 -0000	1.21
***************
*** 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;
--- 29,32 ----
***************
*** 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);
--- 40,49 ----
  	public void testCompleteSMAGenerate() throws IOException {
  		CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader();
! 		TimeSeries series = 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(series);
  		for (int i = 4; i < 20; i++) {
  			Indicator<Double> tracker = new EMAIndicator(close, i);
***************
*** 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());
--- 52,56 ----
  		}
  
! 		Report r = w.walk(strategies, new FullyMemorizedSlicer(series, 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(dummyStock, r.getAllTrades());
! 		StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(dummyStock, close, cashflow, new Period()
  				.withMonths(1));
  		StockAndCashFlowChart stockChart = new StockAndCashFlowChart(stockData, false);
--- 59,64 ----
  		criteria.add(new RewardRiskRatioCriterion());
  
! 		CashFlow cashflow = new CashFlow(series, r.getAllTrades());
! 		StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(series, 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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** EMAWalkTest.java	15 Oct 2007 20:23:23 -0000	1.19
--- EMAWalkTest.java	17 Oct 2007 16:41:54 -0000	1.20
***************
*** 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;
--- 19,22 ----
***************
*** 32,38 ****
  		// 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
--- 31,35 ----
  		// 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

--- DummyStock.java DELETED ---

Index: ReportXmlSerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ReportXmlSerializerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ReportXmlSerializerTest.java	15 Oct 2007 20:23:23 -0000	1.7
--- ReportXmlSerializerTest.java	17 Oct 2007 16:41:54 -0000	1.8
***************
*** 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;
--- 19,22 ----
***************
*** 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)));
  
--- 29,40 ----
  
  		CedroTimeSeriesLoader ctsl = new CedroTimeSeriesLoader();
! 		TimeSeries timeSeries = null;
  
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "AMBV4 IntraDAY");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
  		}
  		
  		Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
  

[Tail-cvs] Tail/src/test/net/sf/tail/graphics StockAndCashFlowDatasetTest.java, 1.4 ChartTest.java, 1.7 CombinedSeriesAndFlowChartTest.java, 1.6 StockAndCashFlowChartTest.java, 1.7 CashFlowDatasetTest.java, 1.6 ChartForReportTest.java, 1.6 SeriesDatasetTest.java, 1.7

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail/graphics

Modified Files:
	StockAndCashFlowDatasetTest.java ChartTest.java 
	CombinedSeriesAndFlowChartTest.java 
	StockAndCashFlowChartTest.java CashFlowDatasetTest.java 
	ChartForReportTest.java SeriesDatasetTest.java 
Log Message:
refatoração do timeSeries

Index: ChartTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChartTest.java	15 Oct 2007 20:23:24 -0000	1.6
--- ChartTest.java	17 Oct 2007 16:41:52 -0000	1.7
***************
*** 13,17 ****
  import javax.swing.JPanel;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 13,16 ----
***************
*** 126,130 ****
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 125,129 ----
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();

Index: StockAndCashFlowChartTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowChartTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StockAndCashFlowChartTest.java	15 Oct 2007 20:23:24 -0000	1.6
--- StockAndCashFlowChartTest.java	17 Oct 2007 16:41:53 -0000	1.7
***************
*** 9,13 ****
  import javax.swing.JPanel;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 9,12 ----
***************
*** 85,89 ****
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), ""));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 84,88 ----
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), "");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();

Index: SeriesDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SeriesDatasetTest.java	15 Oct 2007 20:23:24 -0000	1.6
--- SeriesDatasetTest.java	17 Oct 2007 16:41:53 -0000	1.7
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.Operation;
--- 6,9 ----
***************
*** 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>();
--- 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>();

Index: CombinedSeriesAndFlowChartTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CombinedSeriesAndFlowChartTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CombinedSeriesAndFlowChartTest.java	15 Oct 2007 20:23:24 -0000	1.5
--- CombinedSeriesAndFlowChartTest.java	17 Oct 2007 16:41:53 -0000	1.6
***************
*** 13,17 ****
  import javax.swing.JPanel;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 13,16 ----
***************
*** 107,111 ****
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 106,110 ----
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();

Index: ChartForReportTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartForReportTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChartForReportTest.java	15 Oct 2007 20:23:24 -0000	1.5
--- ChartForReportTest.java	17 Oct 2007 16:41:53 -0000	1.6
***************
*** 12,16 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
--- 12,15 ----
***************
*** 112,116 ****
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""));
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 111,115 ----
  		TimeSeries timeSeries = null;
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();

Index: CashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CashFlowDatasetTest.java	15 Oct 2007 20:23:24 -0000	1.5
--- CashFlowDatasetTest.java	17 Oct 2007 16:41:53 -0000	1.6
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
--- 6,9 ----
***************
*** 38,42 ****
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
! 		series =  new DummyStock( new DefaultTimeSeries(ticks));
  		trades = new LinkedList<Trade>();
  
--- 37,41 ----
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
! 		series = new DefaultTimeSeries(ticks);
  		trades = new LinkedList<Trade>();
  
***************
*** 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);
--- 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);
***************
*** 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);
--- 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);

Index: StockAndCashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowDatasetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StockAndCashFlowDatasetTest.java	15 Oct 2007 20:23:24 -0000	1.3
--- StockAndCashFlowDatasetTest.java	17 Oct 2007 16:41:52 -0000	1.4
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
--- 6,9 ----
***************
*** 41,45 ****
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
! 		series = new DummyStock(new DefaultTimeSeries(ticks));
  		trades = new LinkedList<Trade>();
  
--- 40,44 ----
  		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
! 		series = new DefaultTimeSeries(ticks);
  		trades = new LinkedList<Trade>();
  

[Tail-cvs] Tail/src/java/net/sf/tail/io StockAnalysisSerializer.java, 1.6

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/java/net/sf/tail/io

Modified Files:
	StockAnalysisSerializer.java 
Log Message:
refatoração do timeSeries

Index: StockAnalysisSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockAnalysisSerializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StockAnalysisSerializer.java	15 Oct 2007 23:36:45 -0000	1.5
--- StockAnalysisSerializer.java	17 Oct 2007 16:41:55 -0000	1.6
***************
*** 8,12 ****
  
  import com.thoughtworks.xstream.XStream;
- import com.thoughtworks.xstream.io.xml.DomDriver;
  
  public class StockAnalysisSerializer {
--- 8,11 ----
***************
*** 14,18 ****
  	public String toXML(StockAnalysis analysis) {
  		XStream xstream = new XStream();
- 		//xstream.setMode(XStream.NO_REFERENCES);
  		return xstream.toXML(analysis);
  	}
--- 13,16 ----
***************
*** 21,25 ****
  	public StockAnalysis fromXML(String xml) throws IOException {
  		XStream xstream = new XStream();
- 		//xstream.setMode(XStream.NO_REFERENCES);
  		StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml);
  		SerializableTimeSeries newStock = analysis.getStock();
--- 19,22 ----

[Tail-cvs] Tail/src/java/net/sf/tail/io/reader CedroTimeSeriesLoader.java, 1.5

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io/reader
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/java/net/sf/tail/io/reader

Modified Files:
	CedroTimeSeriesLoader.java 
Log Message:
refatoração do timeSeries

Index: CedroTimeSeriesLoader.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/reader/CedroTimeSeriesLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CedroTimeSeriesLoader.java	15 Oct 2007 20:23:23 -0000	1.4
--- CedroTimeSeriesLoader.java	17 Oct 2007 16:41:54 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  
  import net.sf.tail.Tick;
+ import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesLoader;
  import net.sf.tail.series.DefaultTimeSeries;
***************
*** 23,27 ****
  	transient private static final Logger LOG = Logger.getLogger(CedroTimeSeriesLoader.class);
  
! 	public DefaultTimeSeries load(InputStream stream, String seriesName) {
  
  		List<Tick> ticks= new ArrayList<Tick>();
--- 24,28 ----
  	transient private static final Logger LOG = Logger.getLogger(CedroTimeSeriesLoader.class);
  
! 	public TimeSeries load(InputStream stream, String seriesName) {
  
  		List<Tick> ticks= new ArrayList<Tick>();

[Tail-cvs] Tail/src/java/net/sf/tail/series DefaultTimeSeries.java, 1.6

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/java/net/sf/tail/series

Modified Files:
	DefaultTimeSeries.java 
Log Message:
refatoração do timeSeries

Index: DefaultTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/DefaultTimeSeries.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultTimeSeries.java	15 Oct 2007 20:23:25 -0000	1.5
--- DefaultTimeSeries.java	17 Oct 2007 16:41:55 -0000	1.6
***************
*** 12,16 ****
   * 
   */
! public class DefaultTimeSeries {
  	transient private final List<Tick> ticks;
  
--- 12,16 ----
   * 
   */
! public class DefaultTimeSeries implements TimeSeries{
  	transient private final List<Tick> ticks;
  

[Tail-cvs] Tail/src/test/net/sf/tail/analysis StockTest.java,1.6

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail/analysis

Modified Files:
	StockTest.java 
Log Message:
refatoração do timeSeries

Index: StockTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StockTest.java	15 Oct 2007 20:23:24 -0000	1.5
--- StockTest.java	17 Oct 2007 16:41:54 -0000	1.6
***************
*** 7,13 ****
  import java.io.IOException;
  
  import net.sf.tail.io.StockSerializer;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
- import net.sf.tail.series.DefaultTimeSeries;
  
  import org.junit.Before;
--- 7,13 ----
  import java.io.IOException;
  
+ import net.sf.tail.TimeSeries;
  import net.sf.tail.io.StockSerializer;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  
  import org.junit.Before;
***************
*** 17,21 ****
  
  	private SerializableTimeSeries stock;
! 	private DefaultTimeSeries series;
  
  	@Before 
--- 17,21 ----
  
  	private SerializableTimeSeries stock;
! 	private TimeSeries series;
  
  	@Before 

[Tail-cvs] Tail/src/java/net/sf/tail TimeSeriesLoader.java,1.5

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/java/net/sf/tail

Modified Files:
	TimeSeriesLoader.java 
Log Message:
refatoração do timeSeries

Index: TimeSeriesLoader.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TimeSeriesLoader.java	15 Oct 2007 20:23:25 -0000	1.4
--- TimeSeriesLoader.java	17 Oct 2007 16:41:55 -0000	1.5
***************
*** 3,9 ****
  import java.io.InputStream;
  
- import net.sf.tail.series.DefaultTimeSeries;
- 
  public interface TimeSeriesLoader {
! 	DefaultTimeSeries load(InputStream stream, String seriesName);
  }
--- 3,7 ----
  import java.io.InputStream;
  
  public interface TimeSeriesLoader {
! 	TimeSeries load(InputStream stream, String seriesName);
  }

[Tail-cvs] Tail/src/test/net/sf/tail/indicator/tracker WilliamsRIndicatorTest.java, 1.6

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail/indicator/tracker

Modified Files:
	WilliamsRIndicatorTest.java 
Log Message:
refatoração do timeSeries

Index: WilliamsRIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/WilliamsRIndicatorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WilliamsRIndicatorTest.java	15 Oct 2007 20:23:24 -0000	1.5
--- WilliamsRIndicatorTest.java	17 Oct 2007 16:41:55 -0000	1.6
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
--- 6,9 ----
***************
*** 38,42 ****
  		ticks.add(new Tick(45.58, 45.55, 45.61, 45.39));
  
! 		data = new DummyStock(new DefaultTimeSeries(ticks));
  
  	}
--- 37,41 ----
  		ticks.add(new Tick(45.58, 45.55, 45.61, 45.39));
  
! 		data = new DefaultTimeSeries(ticks);
  
  	}

[Tail-cvs] Tail/src/test/net/sf/tail/indicator/oscilator StochasticOscilatorKTest.java, 1.7 StochasticOscilatorDTest.java, 1.7

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3844/src/test/net/sf/tail/indicator/oscilator

Modified Files:
	StochasticOscilatorKTest.java StochasticOscilatorDTest.java 
Log Message:
refatoração do timeSeries

Index: StochasticOscilatorKTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorKTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StochasticOscilatorKTest.java	15 Oct 2007 20:23:25 -0000	1.6
--- StochasticOscilatorKTest.java	17 Oct 2007 16:41:54 -0000	1.7
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
--- 6,9 ----
***************
*** 37,41 ****
  		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
! 		data = new DummyStock(new DefaultTimeSeries(ticks));
  	}
  
--- 36,40 ----
  		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
! 		data = new DefaultTimeSeries(ticks);
  	}
  

Index: StochasticOscilatorDTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorDTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StochasticOscilatorDTest.java	15 Oct 2007 20:23:25 -0000	1.6
--- StochasticOscilatorDTest.java	17 Oct 2007 16:41:54 -0000	1.7
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.DummyStock;
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
--- 6,9 ----
***************
*** 37,41 ****
  		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
! 		data = new DummyStock(new DefaultTimeSeries(ticks));
  	}
  
--- 36,40 ----
  		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
! 		data = new DefaultTimeSeries(ticks);
  	}
  

[Tail-cvs] Tail/src/java/net/sf/tail/analysis StockAnalysis.java, 1.12

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6913/src/java/net/sf/tail/analysis

Modified Files:
	StockAnalysis.java 
Log Message:
otimizando Xs

Index: StockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StockAnalysis.java	15 Oct 2007 20:23:24 -0000	1.11
--- StockAnalysis.java	15 Oct 2007 23:36:45 -0000	1.12
***************
*** 97,110 ****
  		List<Report> newReports = new ArrayList<Report>();
  		for (int i = 0; i < reports.size(); i++) {
- 			System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
  			Report newReport = createReport(reports.get(i).getName(), reports.get(i).getStrategies());
  			newReports.add(newReport);
  		}
- 		
- 		
- 		//for (Report report : reports) {
- 		//	Report newReport = createReport(report.getName(), report.getStrategies());
- 		//	newReports.add(newReport);
- 		//}
  		System.out.println("=-----------------------------------------------------------------");
  		reports = newReports;
--- 97,103 ----

[Tail-cvs] Tail/lib xpp3_min-1.1.3.4.O.jar,1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6913/lib

Added Files:
	xpp3_min-1.1.3.4.O.jar 
Log Message:
otimizando Xs

--- NEW FILE: xpp3_min-1.1.3.4.O.jar ---
(This appears to be a binary file; contents omitted.)

[Tail-cvs] Tail/src/java/net/sf/tail/indicator/cache CachedIndicator.java, 1.9

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/cache
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6913/src/java/net/sf/tail/indicator/cache

Modified Files:
	CachedIndicator.java 
Log Message:
otimizando Xs

Index: CachedIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/cache/CachedIndicator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CachedIndicator.java	24 Sep 2007 22:45:27 -0000	1.8
--- CachedIndicator.java	15 Oct 2007 23:36:45 -0000	1.9
***************
*** 16,20 ****
  public abstract class CachedIndicator<T> implements Indicator<T> {
  
! 	private List<T> results;
  
  	public CachedIndicator() {
--- 16,20 ----
  public abstract class CachedIndicator<T> implements Indicator<T> {
  
! 	private transient List<T> results;
  
  	public CachedIndicator() {
***************
*** 23,28 ****
  
  	public T getValue(int index) {
! 		increaseLength(index);
  
  		if (results.get(index) == null) {
  			int i = index;
--- 23,32 ----
  
  	public T getValue(int index) {
! 		
  
+ 		if(results == null)
+ 			results = new ArrayList<T>();
+ 		
+ 		increaseLength(index);
  		if (results.get(index) == null) {
  			int i = index;

[Tail-cvs] Tail/src/java/net/sf/tail/io StockAnalysisSerializer.java, 1.5

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6913/src/java/net/sf/tail/io

Modified Files:
	StockAnalysisSerializer.java 
Log Message:
otimizando Xs

Index: StockAnalysisSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockAnalysisSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockAnalysisSerializer.java	15 Oct 2007 20:23:25 -0000	1.4
--- StockAnalysisSerializer.java	15 Oct 2007 23:36:45 -0000	1.5
***************
*** 13,18 ****
  
  	public String toXML(StockAnalysis analysis) {
! 		XStream xstream = new XStream(new DomDriver());
! 		xstream.setMode(XStream.NO_REFERENCES);
  		return xstream.toXML(analysis);
  	}
--- 13,18 ----
  
  	public String toXML(StockAnalysis analysis) {
! 		XStream xstream = new XStream();
! 		//xstream.setMode(XStream.NO_REFERENCES);
  		return xstream.toXML(analysis);
  	}
***************
*** 20,24 ****
  	@SuppressWarnings("unchecked")
  	public StockAnalysis fromXML(String xml) throws IOException {
! 		XStream xstream = new XStream(new DomDriver());
  		StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml);
  		SerializableTimeSeries newStock = analysis.getStock();
--- 20,25 ----
  	@SuppressWarnings("unchecked")
  	public StockAnalysis fromXML(String xml) throws IOException {
! 		XStream xstream = new XStream();
! 		//xstream.setMode(XStream.NO_REFERENCES);
  		StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml);
  		SerializableTimeSeries newStock = analysis.getStock();