Update of /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21729/src/java/net/sf/tail/indicator/tracker
Modified Files:
WilliamsRIndicator.java StandardDeviationIndicator.java
HighestValueIndicator.java LowestValueIndicator.java
Removed Files:
CachedIndicator.java
Log Message:
refatoração de código (control + shift + f)
Index: WilliamsRIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/WilliamsRIndicator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WilliamsRIndicator.java 17 May 2007 23:06:56 -0000 1.6
--- WilliamsRIndicator.java 18 May 2007 01:07:44 -0000 1.7
***************
*** 18,27 ****
// TODO - ver a complexidade dos construtores.
! public WilliamsRIndicator(TimeSeries timeSeries, int timeFrame)
! {
! this(new ClosePriceIndicator(timeSeries), timeFrame, new MaxPriceIndicator(timeSeries), new MinPriceIndicator(timeSeries));
}
!
! public WilliamsRIndicator(Indicator<? extends Number> indicator, int timeFrame, MaxPriceIndicator maxPriceIndicator, MinPriceIndicator minPriceIndicator) {
this.indicator = indicator;
this.timeFrame = timeFrame;
--- 18,28 ----
// TODO - ver a complexidade dos construtores.
! public WilliamsRIndicator(TimeSeries timeSeries, int timeFrame) {
! this(new ClosePriceIndicator(timeSeries), timeFrame, new MaxPriceIndicator(timeSeries), new MinPriceIndicator(
! timeSeries));
}
!
! public WilliamsRIndicator(Indicator<? extends Number> indicator, int timeFrame,
! MaxPriceIndicator maxPriceIndicator, MinPriceIndicator minPriceIndicator) {
this.indicator = indicator;
this.timeFrame = timeFrame;
Index: HighestValueIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/HighestValueIndicator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HighestValueIndicator.java 17 May 2007 22:45:34 -0000 1.1
--- HighestValueIndicator.java 18 May 2007 01:07:44 -0000 1.2
***************
*** 6,21 ****
private final Indicator<? extends Number> indicator;
private final int timeFrame;
!
public HighestValueIndicator(Indicator<? extends Number> indicator, int timeFrame) {
this.indicator = indicator;
this.timeFrame = timeFrame;
}
!
public Double getValue(int index) {
int start = Math.max(0, index - timeFrame + 1);
Double highest = (Double) indicator.getValue(start);
for (int i = start + 1; i <= index; i++) {
! if(highest.doubleValue() < indicator.getValue(i).doubleValue())
highest = (Double) indicator.getValue(i);
}
--- 6,22 ----
private final Indicator<? extends Number> indicator;
+
private final int timeFrame;
!
public HighestValueIndicator(Indicator<? extends Number> indicator, int timeFrame) {
this.indicator = indicator;
this.timeFrame = timeFrame;
}
!
public Double getValue(int index) {
int start = Math.max(0, index - timeFrame + 1);
Double highest = (Double) indicator.getValue(start);
for (int i = start + 1; i <= index; i++) {
! if (highest.doubleValue() < indicator.getValue(i).doubleValue())
highest = (Double) indicator.getValue(i);
}
Index: StandardDeviationIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/StandardDeviationIndicator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StandardDeviationIndicator.java 17 May 2007 21:47:24 -0000 1.2
--- StandardDeviationIndicator.java 18 May 2007 01:07:44 -0000 1.3
***************
*** 6,20 ****
private Indicator<? extends Number> indicator;
private int timeFrame;
!
! public StandardDeviationIndicator(Indicator<? extends Number> indicator, int timeFrame)
! {
this.indicator = indicator;
this.timeFrame = timeFrame;
}
!
public Double getValue(int index) {
SMAIndicator sma = new SMAIndicator(indicator, timeFrame);
!
double standardDeviation = 0.0;
double avarage = sma.getValue(index);
--- 6,20 ----
private Indicator<? extends Number> indicator;
+
private int timeFrame;
!
! public StandardDeviationIndicator(Indicator<? extends Number> indicator, int timeFrame) {
this.indicator = indicator;
this.timeFrame = timeFrame;
}
!
public Double getValue(int index) {
SMAIndicator sma = new SMAIndicator(indicator, timeFrame);
!
double standardDeviation = 0.0;
double avarage = sma.getValue(index);
***************
*** 25,34 ****
}
-
-
-
-
-
-
-
}
--- 25,27 ----
--- CachedIndicator.java DELETED ---
Index: LowestValueIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/indicator/tracker/LowestValueIndicator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LowestValueIndicator.java 17 May 2007 22:45:34 -0000 1.1
--- LowestValueIndicator.java 18 May 2007 01:07:44 -0000 1.2
***************
*** 6,11 ****
private final Indicator<? extends Number> indicator;
private final int timeFrame;
!
public LowestValueIndicator(Indicator<? extends Number> indicator, int timeFrame) {
this.indicator = indicator;
--- 6,12 ----
private final Indicator<? extends Number> indicator;
+
private final int timeFrame;
!
public LowestValueIndicator(Indicator<? extends Number> indicator, int timeFrame) {
this.indicator = indicator;
***************
*** 17,21 ****
Double lowest = (Double) indicator.getValue(start);
for (int i = start + 1; i <= index; i++) {
! if(lowest.doubleValue() > indicator.getValue(i).doubleValue())
lowest = (Double) indicator.getValue(i);
}
--- 18,22 ----
Double lowest = (Double) indicator.getValue(start);
for (int i = start + 1; i <= index; i++) {
! if (lowest.doubleValue() > indicator.getValue(i).doubleValue())
lowest = (Double) indicator.getValue(i);
}
|
