Menu
▾
▴
tail-cvs — cvs commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(148) |
Jun
(48) |
Jul
(107) |
Aug
(292) |
Sep
(301) |
Oct
(530) |
Nov
(142) |
Dec
(37) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Thies <tg...@us...> - 2007-05-12 17:43:34
|
Update of /cvsroot/tail/Tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3357 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/tail/Tail/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 11 May 2007 20:41:41 -0000 1.2 --- .classpath 12 May 2007 17:43:33 -0000 1.3 *************** *** 3,8 **** <classpathentry kind="src" path="src/test"/> <classpathentry kind="src" path="src/java"/> ! <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry exported="true" kind="lib" path="lib/javacsv.jar"/> <classpathentry kind="lib" path="lib/junit-4.1.jar"/> <classpathentry kind="output" path="bin"/> --- 3,8 ---- <classpathentry kind="src" path="src/test"/> <classpathentry kind="src" path="src/java"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java5"/> ! <classpathentry kind="lib" exported="true" path="lib/javacsv.jar"/> <classpathentry kind="lib" path="lib/junit-4.1.jar"/> <classpathentry kind="output" path="bin"/> |
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3357/src/java/net/sf/tail/indicator/simple Added Files: MaxPriceIndicator.java MinPriceIndicator.java VolumeFinancierIndicator.java OpenPriceIndicator.java VolumeAmountIndicator.java Log Message: --- NEW FILE: OpenPriceIndicator.java --- package net.sf.tail.indicator.simple; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; public class OpenPriceIndicator implements Indicator<Double> { private TimeSeries data; public OpenPriceIndicator(TimeSeries data) { this.data = data; } public Double calculate(int index) { return data.getTick(index).getOpenPrice(); } } --- NEW FILE: MinPriceIndicator.java --- package net.sf.tail.indicator.simple; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; public class MinPriceIndicator implements Indicator<Double> { private TimeSeries data; public MinPriceIndicator(TimeSeries data) { this.data = data; } public Double calculate(int index) { return data.getTick(index).getMinPrice(); } } --- NEW FILE: VolumeAmountIndicator.java --- package net.sf.tail.indicator.simple; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; public class VolumeAmountIndicator implements Indicator<Double> { private TimeSeries data; public VolumeAmountIndicator(TimeSeries data) { this.data = data; } public Double calculate(int index) { return data.getTick(index).getVolumeAmount(); } } --- NEW FILE: MaxPriceIndicator.java --- package net.sf.tail.indicator.simple; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; public class MaxPriceIndicator implements Indicator<Double> { private TimeSeries data; public MaxPriceIndicator(TimeSeries data) { this.data = data; } public Double calculate(int index) { return data.getTick(index).getMaxPrice(); } } --- NEW FILE: VolumeFinancierIndicator.java --- package net.sf.tail.indicator.simple; import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; public class VolumeFinancierIndicator implements Indicator<Double> { private TimeSeries data; public VolumeFinancierIndicator(TimeSeries data) { this.data = data; } public Double calculate(int index) { return data.getTick(index).getVolumeFinancier(); } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 17:34:06
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/reader In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31643/src/java/net/sf/tail/reader Removed Files: TimeSeriesFactory.java Log Message: Continuando a readaptar as classes --- TimeSeriesFactory.java DELETED --- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 17:34:06
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31643/src/java/net/sf/tail/indicator/tracker Modified Files: SMAIndicator.java EMAIndicator.java Log Message: Continuando a readaptar as classes Index: EMAIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/EMAIndicator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EMAIndicator.java 12 May 2007 14:23:35 -0000 1.2 --- EMAIndicator.java 12 May 2007 17:34:01 -0000 1.3 *************** *** 5,17 **** public class EMAIndicator implements Indicator<Double> { ! public EMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { ! } public Double getValue(int index) { ! return 0.0; } ! } --- 5,53 ---- public class EMAIndicator implements Indicator<Double> { ! private final Indicator<? extends Number> indicator; ! private final int timeFrame; ! private Double[] resultsList; ! public EMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { ! this.indicator = indicator; ! this.timeFrame = timeFrame; ! resultsList = new Double[100]; } public Double getValue(int index) { ! if(resultsList.length <= index ) { ! resultsList = increaseLenght(resultsList); ! } ! if(resultsList[index] == null){ ! resultsList[index] = calculate(index); ! } ! return resultsList[index]; } ! private Double[] increaseLenght(Double[] array) { ! Double[] tmpDouble = new Double[array.length*2]; ! for (int i = 0; i < array.length; i++) { ! tmpDouble[i] = array[i]; ! } ! return tmpDouble; ! } ! ! private double multiplier(){ ! return 2 / (timeFrame + 1); ! } ! ! private Double calculate(int index) { ! ! if(index + 1 < timeFrame){ ! return new SMAIndicator(indicator,timeFrame).getValue(index); ! } ! ! double emaPrev = getValue(index - 1).doubleValue(); ! double result = ( ( indicator.getValue(index).doubleValue() - emaPrev ) * multiplier()) + emaPrev; ! ! ! return result; ! ! ! } } Index: SMAIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/SMAIndicator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SMAIndicator.java 12 May 2007 14:23:35 -0000 1.2 --- SMAIndicator.java 12 May 2007 17:34:01 -0000 1.3 *************** *** 1,6 **** package net.sf.tail.indicator.tracker; - import java.util.ArrayList; - import java.util.List; import net.sf.tail.Indicator; --- 1,4 ---- *************** *** 9,27 **** private final Indicator<? extends Number> indicator; private final int timeFrame; ! private List<Double> resultsList; public SMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { this.indicator = indicator; this.timeFrame = timeFrame; ! resultsList = new ArrayList<Double>(); } public Double getValue(int index) { ! if(resultsList.get(index) != null) { ! return resultsList.get(index); } ! return calculate(index); ! } --- 7,36 ---- private final Indicator<? extends Number> indicator; private final int timeFrame; ! private Double[] resultsList; public SMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { this.indicator = indicator; this.timeFrame = timeFrame; ! resultsList = new Double[100]; } public Double getValue(int index) { ! if(resultsList.length <= index ) { ! resultsList = increaseLenght(resultsList); } ! if(resultsList[index] == null){ ! resultsList[index] = calculate(index); ! } ! return resultsList[index]; ! ! } ! ! private Double[] increaseLenght(Double[] array) { ! Double[] tmpDouble = new Double[array.length*2]; ! for (int i = 0; i < array.length; i++) { ! tmpDouble[i] = array[i]; ! } ! return tmpDouble; } *************** *** 31,45 **** sum += indicator.getValue(i).doubleValue(); } ! double result = sum / Math.min(timeFrame, index + 1); ! ! /** Armazenando todos resultados já calculados na lista. **/ ! resultsList.add(index, result); ! ! return result; } - public List<Double> getResultsList() { - return resultsList; - } } --- 40,47 ---- sum += indicator.getValue(i).doubleValue(); } ! ! return sum / Math.min(timeFrame, index + 1); } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 17:34:06
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31643/src/test/net/sf/tail/indicator Modified Files: SMAIndicatorTest.java EMAIndicatorTest.java Log Message: Continuando a readaptar as classes Index: SMAIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/SMAIndicatorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SMAIndicatorTest.java 12 May 2007 14:23:35 -0000 1.3 --- SMAIndicatorTest.java 12 May 2007 17:34:01 -0000 1.4 *************** *** 2,5 **** --- 2,7 ---- + import java.util.Arrays; + import net.sf.tail.SampleTimeSeries; import net.sf.tail.TimeSeries; *************** *** 48,51 **** --- 50,62 ---- } + @Test + public void testIncreaseArrayMethod() { + double[] d = new double[200]; + Arrays.fill(d, 10); + TimeSeries dataMax = new SampleTimeSeries(d ); + SMAIndicator quoteSMA = new SMAIndicator(new ClosePriceIndicator(dataMax), 100); + assertEquals(10d, quoteSMA.getValue(105)); + } + @Test(expected = IndexOutOfBoundsException.class) public void testWrongIndex() { Index: EMAIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/EMAIndicatorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EMAIndicatorTest.java 12 May 2007 14:23:35 -0000 1.3 --- EMAIndicatorTest.java 12 May 2007 17:34:01 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- import net.sf.tail.indicator.tracker.SMAIndicator; + import org.junit.Before; import org.junit.Test; *************** *** 17,23 **** private TimeSeries data; public void setUp() { //data = new SampleData(new double[] { 447.3, 456.8, 451.0, 452.5, 453.4, 455.5, 456.0, 454.7, 453.5, 456.5, ! // 459.5, 465.2, 460.8, 460.8 }); data = new SampleTimeSeries(new double[] { 64.75, 63.79, 63.73, 63.73, 63.55, 63.19, 63.91, 63.85, 62.95, 63.37, 61.33, 61.51 }); --- 18,25 ---- private TimeSeries data; + @Before public void setUp() { //data = new SampleData(new double[] { 447.3, 456.8, 451.0, 452.5, 453.4, 455.5, 456.0, 454.7, 453.5, 456.5, ! // 459.5, 465.2, 460.8, 460.8 }); data = new SampleTimeSeries(new double[] { 64.75, 63.79, 63.73, 63.73, 63.55, 63.19, 63.91, 63.85, 62.95, 63.37, 61.33, 61.51 }); *************** *** 31,34 **** --- 33,38 ---- // the start of an EMA must be equals to a SMA for (int i = 0; i < 9; i++) { + sma.getValue(i); + ema.getValue(i); assertEquals(sma.getValue(i), ema.getValue(i)); } *************** *** 49,57 **** assertEquals(3d, ema.getValue(14)); } ! // 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(EMAIndicatorTest.class); } } --- 53,61 ---- assertEquals(3d, ema.getValue(14)); } ! // 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(EMAIndicatorTest.class); } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 14:25:19
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14135/src/java/net/sf/tail/indicator/simple Modified Files: ClosePriceIndicator.java ConstantIndicator.java Log Message: Continuando a readaptar as classes Index: ClosePriceIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple/ClosePriceIndicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClosePriceIndicator.java 11 May 2007 20:41:41 -0000 1.1 --- ClosePriceIndicator.java 12 May 2007 14:23:35 -0000 1.2 *************** *** 12,16 **** } ! public Double calculate(int index) { return data.getTick(index).getClosePrice(); } --- 12,16 ---- } ! public Double getValue(int index) { return data.getTick(index).getClosePrice(); } Index: ConstantIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/simple/ConstantIndicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstantIndicator.java 11 May 2007 20:41:41 -0000 1.1 --- ConstantIndicator.java 12 May 2007 14:23:35 -0000 1.2 *************** *** 12,16 **** } ! public T calculate(int index) { return value; } --- 12,16 ---- } ! public T getValue(int index) { return value; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 14:24:58
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14135/src/test/net/sf/tail/indicator Modified Files: SMAIndicatorTest.java EMAIndicatorTest.java Log Message: Continuando a readaptar as classes Index: SMAIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/SMAIndicatorTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SMAIndicatorTest.java 12 May 2007 14:19:08 -0000 1.2 --- SMAIndicatorTest.java 12 May 2007 14:23:35 -0000 1.3 *************** *** 26,42 **** SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(1.0, sma.calculate(0)); ! assertEquals(1.5, sma.calculate(1)); ! assertEquals(2.0, sma.calculate(2)); ! assertEquals(3.0, sma.calculate(3)); ! assertEquals(10.0 / 3, sma.calculate(4)); ! assertEquals(11.0 / 3, sma.calculate(5)); ! assertEquals(4.0, sma.calculate(6)); ! assertEquals(13.0 / 3, sma.calculate(7)); ! assertEquals(4.0, sma.calculate(8)); ! assertEquals(10.0 / 3, sma.calculate(9)); ! assertEquals(10.0 / 3, sma.calculate(10)); ! assertEquals(10.0 / 3, sma.calculate(11)); ! assertEquals(3.0, sma.calculate(12)); } --- 26,42 ---- SMAIndicator sma = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(1.0, sma.getValue(0)); ! assertEquals(1.5, sma.getValue(1)); ! assertEquals(2.0, sma.getValue(2)); ! assertEquals(3.0, sma.getValue(3)); ! assertEquals(10.0 / 3, sma.getValue(4)); ! assertEquals(11.0 / 3, sma.getValue(5)); ! assertEquals(4.0, sma.getValue(6)); ! assertEquals(13.0 / 3, sma.getValue(7)); ! assertEquals(4.0, sma.getValue(8)); ! assertEquals(10.0 / 3, sma.getValue(9)); ! assertEquals(10.0 / 3, sma.getValue(10)); ! assertEquals(10.0 / 3, sma.getValue(11)); ! assertEquals(3.0, sma.getValue(12)); } *************** *** 45,49 **** public void test3daysJumping() { SMAIndicator quoteSMA = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(3d, quoteSMA.calculate(12)); } --- 45,49 ---- public void test3daysJumping() { SMAIndicator quoteSMA = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(3d, quoteSMA.getValue(12)); } *************** *** 51,55 **** public void testWrongIndex() { SMAIndicator quoteSMA = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(3d, quoteSMA.calculate(13)); } --- 51,55 ---- public void testWrongIndex() { SMAIndicator quoteSMA = new SMAIndicator(new ClosePriceIndicator(data), 3); ! assertEquals(3d, quoteSMA.getValue(13)); } Index: EMAIndicatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/EMAIndicatorTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EMAIndicatorTest.java 12 May 2007 14:19:08 -0000 1.2 --- EMAIndicatorTest.java 12 May 2007 14:23:35 -0000 1.3 *************** *** 31,39 **** // the start of an EMA must be equals to a SMA for (int i = 0; i < 9; i++) { ! assertEquals(sma.calculate(i), ema.calculate(i)); } ! assertEquals(63.65, ema.calculate(9), 0.01); ! assertEquals(63.23, ema.calculate(10), 0.01); ! assertEquals(62.91, ema.calculate(11), 0.01); } --- 31,39 ---- // the start of an EMA must be equals to a SMA for (int i = 0; i < 9; i++) { ! assertEquals(sma.getValue(i), ema.getValue(i)); } ! assertEquals(63.65, ema.getValue(9), 0.01); ! assertEquals(63.23, ema.getValue(10), 0.01); ! assertEquals(62.91, ema.getValue(11), 0.01); } *************** *** 41,45 **** public void test10daysJumping() { EMAIndicator ema = new EMAIndicator(new ClosePriceIndicator(data), 10); ! assertEquals(63.23, ema.calculate(10), 0.01); } --- 41,45 ---- public void test10daysJumping() { EMAIndicator ema = new EMAIndicator(new ClosePriceIndicator(data), 10); ! assertEquals(63.23, ema.getValue(10), 0.01); } *************** *** 47,51 **** public void testWrongIndex() { EMAIndicator ema = new EMAIndicator(new ClosePriceIndicator(data), 10); ! assertEquals(3d, ema.calculate(14)); } --- 47,51 ---- public void testWrongIndex() { EMAIndicator ema = new EMAIndicator(new ClosePriceIndicator(data), 10); ! assertEquals(3d, ema.getValue(14)); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 14:24:58
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14135/src/java/net/sf/tail Modified Files: Indicator.java Log Message: Continuando a readaptar as classes Index: Indicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/Indicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Indicator.java 11 May 2007 20:41:41 -0000 1.1 --- Indicator.java 12 May 2007 14:23:35 -0000 1.2 *************** *** 2,5 **** public interface Indicator<T> { ! public T calculate(int index); } --- 2,5 ---- public interface Indicator<T> { ! public T getValue(int index); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 14:24:58
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14135/src/java/net/sf/tail/indicator/tracker Modified Files: SMAIndicator.java EMAIndicator.java Log Message: Continuando a readaptar as classes Index: EMAIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/EMAIndicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EMAIndicator.java 11 May 2007 20:41:40 -0000 1.1 --- EMAIndicator.java 12 May 2007 14:23:35 -0000 1.2 *************** *** 10,14 **** } ! public Double calculate(int index) { return 0.0; } --- 10,14 ---- } ! public Double getValue(int index) { return 0.0; } Index: SMAIndicator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/SMAIndicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SMAIndicator.java 11 May 2007 20:41:40 -0000 1.1 --- SMAIndicator.java 12 May 2007 14:23:35 -0000 1.2 *************** *** 1,25 **** package net.sf.tail.indicator.tracker; import net.sf.tail.Indicator; public class SMAIndicator implements Indicator<Double> { ! private final Indicator<? extends Number> indicator; ! private final int timeFrame; ! public SMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { ! this.indicator = indicator; ! this.timeFrame = timeFrame; ! } ! public Double calculate(int index) { ! double sum = 0.0; ! for (int i = Math.max(0, index - timeFrame + 1); i <= index; i++) { ! sum += indicator.calculate(i).doubleValue(); ! } ! return sum / Math.min(timeFrame, index + 1); ! } } --- 1,45 ---- package net.sf.tail.indicator.tracker; + import java.util.ArrayList; + import java.util.List; import net.sf.tail.Indicator; public class SMAIndicator implements Indicator<Double> { ! private final Indicator<? extends Number> indicator; ! private final int timeFrame; ! private List<Double> resultsList; ! public SMAIndicator(Indicator<? extends Number> indicator, int timeFrame) { ! this.indicator = indicator; ! this.timeFrame = timeFrame; ! resultsList = new ArrayList<Double>(); ! } ! public Double getValue(int index) { ! if(resultsList.get(index) != null) { ! return resultsList.get(index); ! } ! return calculate(index); ! ! } ! private Double calculate(int index) { ! double sum = 0.0; ! for (int i = Math.max(0, index - timeFrame + 1); i <= index; i++) { ! sum += indicator.getValue(i).doubleValue(); ! } ! double result = sum / Math.min(timeFrame, index + 1); ! ! /** Armazenando todos resultados já calculados na lista. **/ ! resultsList.add(index, result); ! ! return result; ! } ! ! public List<Double> getResultsList() { ! return resultsList; ! } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-05-12 13:21:15
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18587/src/java/net/sf/tail Modified Files: Tick.java Log Message: Tick mesclado Index: Tick.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/Tick.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tick.java 12 May 2007 12:59:36 -0000 1.2 --- Tick.java 12 May 2007 13:21:14 -0000 1.3 *************** *** 1,41 **** package net.sf.tail; ! public class Tick { ! private double openPrice; ! private double closePrice; ! private double maxPrice; ! ! private double minPrice; ! ! private double change; ! ! private double previousPrice; ! ! private double volumeAmount; ! ! private double volumeFinancier; ! ! private int trades; ! public Tick(double closePrice) { ! super(); ! this.closePrice = closePrice; ! } ! public double getClosePrice() { ! return closePrice; ! } ! public double getOpenPrice() { ! return openPrice; ! } ! public int getTrades() { ! return trades; ! } --- 1,51 ---- package net.sf.tail; ! import java.sql.Timestamp; ! public class Tick { ! private Timestamp data; ! private double openPrice; ! private double closePrice; ! private double maxPrice; ! private double minPrice; ! private double change; ! private double previousPrice; ! private double volumeAmount; ! private double volumeFinancier; ! private int trades; ! public Tick(double closePrice) { ! super(); ! this.closePrice = closePrice; ! } ! public Tick(Timestamp data, double openPrice, double closePrice, double maxPrice, double minPrice, ! double change,double previousPrice,double volumeAmount,double volumeFinancier,int trades) { ! super(); ! this.data = data; ! this.openPrice = openPrice; ! this.closePrice = closePrice; ! this.maxPrice = maxPrice; ! this.minPrice = minPrice; ! this.change = change; ! this.previousPrice = previousPrice; ! this.volumeAmount = volumeAmount; ! this.volumeFinancier = volumeFinancier; ! this.trades = trades; ! } ! public double getClosePrice() { ! return closePrice; ! } ! public double getOpenPrice() { ! return openPrice; ! } ! public int getTrades() { ! return trades; ! } *************** *** 69,72 **** --- 79,86 ---- } + public Timestamp getData() { + return data; + } + } |
