|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 18:13:04
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/reader In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17026/src/java/net/sf/tail/reader Modified Files: CedroTimeSeriesLoader.java Log Message: Continuando a readaptar as classes Index: CedroTimeSeriesLoader.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/reader/CedroTimeSeriesLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CedroTimeSeriesLoader.java 12 May 2007 17:43:33 -0000 1.3 --- CedroTimeSeriesLoader.java 12 May 2007 18:13:01 -0000 1.4 *************** *** 17,52 **** import com.csvreader.CsvReader; ! /** ! * ! * ! * @author Marcio ! * ! */ public class CedroTimeSeriesLoader implements TimeSeriesLoader{ ! ! public TimeSeries load(InputStream stream) throws IOException { ! 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 date = null; ! try { date = simpleDate.parse(reader.get(0)); } catch (ParseException e) { ! ! } Timestamp timestamp = new Timestamp(date.getTime()); double open = java.lang.Double.parseDouble(reader.get(1)); --- 17,48 ---- import com.csvreader.CsvReader; ! public class CedroTimeSeriesLoader implements TimeSeriesLoader{ ! ! public TimeSeries load(InputStream stream) throws IOException { ! 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 date = null; ! ! try { date = simpleDate.parse(reader.get(0)); } catch (ParseException e) { ! e.printStackTrace(); } + Timestamp timestamp = new Timestamp(date.getTime()); double open = java.lang.Double.parseDouble(reader.get(1)); *************** *** 59,67 **** double volumeFinancier = java.lang.Double.parseDouble(reader.get(8)); double quantity = java.lang.Double.parseDouble(reader.get(9)); ! Tick tick = new Tick(timestamp, open, close, high, low, change, previous, volumeAmount, volumeFinancier, (int)quantity); ticks.add(0, tick); } ! return new TickTimeSeries(ticks); } --- 55,63 ---- double volumeFinancier = java.lang.Double.parseDouble(reader.get(8)); double quantity = java.lang.Double.parseDouble(reader.get(9)); ! Tick tick = new Tick(timestamp, open, close, high, low, change, previous, volumeAmount, volumeFinancier, (int)quantity); ticks.add(0, tick); } ! return new TickTimeSeries(ticks); } |