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

[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-serv21382/src/java/net/sf/tail/io/reader

Modified Files:
	CedroTimeSeriesLoader.java 
Log Message:
refatoração gigante! Stock virou TimeSeries

Index: CedroTimeSeriesLoader.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/reader/CedroTimeSeriesLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CedroTimeSeriesLoader.java	25 Sep 2007 00:02:28 -0000	1.3
--- CedroTimeSeriesLoader.java	15 Oct 2007 20:23:23 -0000	1.4
***************
*** 23,66 ****
  	transient private static final Logger LOG = Logger.getLogger(CedroTimeSeriesLoader.class);
  
! 	public DefaultTimeSeries load(InputStream stream, String seriesName) throws IOException {
  
! 		LOG.info("Reading " + stream);
! 		CsvReader reader = new CsvReader(stream, Charset.defaultCharset());
! 		reader.readHeaders();
! 		List<Tick> ticks = new ArrayList<Tick>();
  
! 		while (reader.readRecord()) {
! 			SimpleDateFormat simpleDate;
  
! 			if (reader.get(0).length() > 10)
! 				simpleDate = new SimpleDateFormat("dd/M/yyyy HH:mm:ss");
! 			else
! 				simpleDate = new SimpleDateFormat("dd/M/yyyy");
  
! 			Date dateUtil;
! 			try {
! 				dateUtil = simpleDate.parse(reader.get(0));
! 			} catch (ParseException e) {
! 				throw new RuntimeException(e);
! 			}
  
! 			DateTime date = new DateTime(dateUtil.getTime());
  
! 			double open = java.lang.Double.parseDouble(reader.get(1));
! 			double close = java.lang.Double.parseDouble(reader.get(2));
! 			double high = java.lang.Double.parseDouble(reader.get(3));
! 			double low = java.lang.Double.parseDouble(reader.get(4));
! 			double change = java.lang.Double.parseDouble(reader.get(5));
! 			double previous = java.lang.Double.parseDouble(reader.get(6));
! 			double volumeAmount = java.lang.Double.parseDouble(reader.get(7));
! 			double volumeFinancier = java.lang.Double.parseDouble(reader.get(8));
! 			double quantity = java.lang.Double.parseDouble(reader.get(9));
  
! 			Tick tick = new Tick(date, open, close, high, low, change, previous, volumeAmount, volumeFinancier,
! 					(int) quantity);
! 			ticks.add(0, tick);
! 		}
  
! 		LOG.info("Reading done for " + stream);
  
  		return new DefaultTimeSeries(seriesName, ticks);
--- 23,73 ----
  	transient private static final Logger LOG = Logger.getLogger(CedroTimeSeriesLoader.class);
  
! 	public DefaultTimeSeries load(InputStream stream, String seriesName) {
  
! 		List<Tick> ticks= new ArrayList<Tick>();
! 		try {
! 			LOG.info("Reading " + stream);
! 			CsvReader reader = new CsvReader(stream, Charset.defaultCharset());
! 			
! 			reader.readHeaders();
  
! 			while (reader.readRecord()) {
! 				SimpleDateFormat simpleDate;
  
! 				if (reader.get(0).length() > 10)
! 					simpleDate = new SimpleDateFormat("dd/M/yyyy HH:mm:ss");
! 				else
! 					simpleDate = new SimpleDateFormat("dd/M/yyyy");
  
! 				Date dateUtil = simpleDate.parse(reader.get(0));
  
! 				DateTime date = new DateTime(dateUtil.getTime());
  
! 				double open = java.lang.Double.parseDouble(reader.get(1));
! 				double close = java.lang.Double.parseDouble(reader.get(2));
! 				double high = java.lang.Double.parseDouble(reader.get(3));
! 				double low = java.lang.Double.parseDouble(reader.get(4));
! 				double change = java.lang.Double.parseDouble(reader.get(5));
! 				double previous = java.lang.Double.parseDouble(reader.get(6));
! 				double volumeAmount = java.lang.Double.parseDouble(reader.get(7));
! 				double volumeFinancier = java.lang.Double.parseDouble(reader.get(8));
! 				double quantity = java.lang.Double.parseDouble(reader.get(9));
  
! 				Tick tick = new Tick(date, open, close, high, low, change, previous, volumeAmount, volumeFinancier,
! 						(int) quantity);
! 				ticks.add(0, tick);
! 			}
  
! 			LOG.info("Reading done for " + stream);
! 		} catch (NumberFormatException e) {
! 			e.printStackTrace();
! 			throw new RuntimeException(e);
! 		} catch (IOException e) {
! 			e.printStackTrace();
! 			throw new RuntimeException(e);
! 		} catch (ParseException e) {
! 			e.printStackTrace();
! 			throw new RuntimeException(e);
! 		}
  
  		return new DefaultTimeSeries(seriesName, ticks);