1.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ADXFunction.scala Tue Nov 03 22:41:34 2009 +0800
1.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ADXFunction.scala Wed Nov 04 01:43:13 2009 +0800
1.3 @@ -31,7 +31,6 @@
1.4 package org.aiotrade.lib.indicator.function
1.5
1.6 import org.aiotrade.lib.math.timeseries.TSer
1.7 -import org.aiotrade.lib.math.timeseries.TVar
1.8 import org.aiotrade.lib.math.timeseries.computable.Factor
1.9
1.10 /**
2.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ADXRFunction.scala Tue Nov 03 22:41:34 2009 +0800
2.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ADXRFunction.scala Wed Nov 04 01:43:13 2009 +0800
2.3 @@ -28,10 +28,9 @@
2.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2.6 */
2.7 -package org.aiotrade.lib.indicator.function;
2.8 +package org.aiotrade.lib.indicator.function
2.9
2.10 -import org.aiotrade.lib.math.timeseries.TSer;
2.11 -import org.aiotrade.lib.math.timeseries.TVar;
2.12 +import org.aiotrade.lib.math.timeseries.TSer
2.13 import org.aiotrade.lib.math.timeseries.computable.Factor
2.14
2.15 /**
3.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/CCIFunction.scala Tue Nov 03 22:41:34 2009 +0800
3.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/CCIFunction.scala Wed Nov 04 01:43:13 2009 +0800
3.3 @@ -28,11 +28,10 @@
3.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3.6 */
3.7 -package org.aiotrade.lib.indicator.function;
3.8 +package org.aiotrade.lib.indicator.function
3.9
3.10 -import org.aiotrade.lib.math.timeseries.TSer;
3.11 -import org.aiotrade.lib.math.timeseries.TVar;
3.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
3.13 +import org.aiotrade.lib.math.timeseries.TSer
3.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
3.15
3.16 /**
3.17 *
3.18 @@ -42,10 +41,10 @@
3.19
3.20 var alpha, period: Factor = _
3.21
3.22 - val _tp = TVar[Float]
3.23 - val _deviation = TVar[Float]
3.24 + val _tp = TVar[Float]()
3.25 + val _deviation = TVar[Float]()
3.26
3.27 - val _cci = TVar[Float]
3.28 + val _cci = TVar[Float]()
3.29
3.30 override def set(baseSer: TSer, args: Any*): Unit = {
3.31 super.set(baseSer)
4.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DIFunction.scala Tue Nov 03 22:41:34 2009 +0800
4.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DIFunction.scala Wed Nov 04 01:43:13 2009 +0800
4.3 @@ -28,11 +28,10 @@
4.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
4.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4.6 */
4.7 -package org.aiotrade.lib.indicator.function;
4.8 +package org.aiotrade.lib.indicator.function
4.9
4.10 -import org.aiotrade.lib.math.timeseries.TSer;
4.11 -import org.aiotrade.lib.math.timeseries.TVar;
4.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
4.13 +import org.aiotrade.lib.math.timeseries.TSer
4.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
4.15
4.16 /**
4.17 *
4.18 @@ -42,12 +41,12 @@
4.19
4.20 var period: Factor = _
4.21
4.22 - val _dmPlus = TVar[Float]
4.23 - val _dmMinus = TVar[Float]
4.24 - val _tr = TVar[Float]
4.25 + val _dmPlus = TVar[Float]()
4.26 + val _dmMinus = TVar[Float]()
4.27 + val _tr = TVar[Float]()
4.28
4.29 - val _diPlus = TVar[Float]
4.30 - val _diMinus = TVar[Float]
4.31 + val _diPlus = TVar[Float]()
4.32 + val _diMinus = TVar[Float]()
4.33
4.34 override def set(baseSer: TSer, args: Any*): Unit = {
4.35 super.set(baseSer)
5.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DMFunction.scala Tue Nov 03 22:41:34 2009 +0800
5.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DMFunction.scala Wed Nov 04 01:43:13 2009 +0800
5.3 @@ -28,10 +28,9 @@
5.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
5.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5.6 */
5.7 -package org.aiotrade.lib.indicator.function;
5.8 +package org.aiotrade.lib.indicator.function
5.9
5.10 -import org.aiotrade.lib.math.timeseries.TSer;
5.11 -import org.aiotrade.lib.math.timeseries.TVar;
5.12 +import org.aiotrade.lib.math.timeseries.TSer
5.13
5.14 /**
5.15 *
5.16 @@ -39,8 +38,8 @@
5.17 */
5.18 class DMFunction extends AbstractFunction {
5.19
5.20 - val _dmPlus = TVar[Float]
5.21 - val _dmMinus = TVar[Float]
5.22 + val _dmPlus = TVar[Float]()
5.23 + val _dmMinus = TVar[Float]()
5.24
5.25 override def set(baseSer: TSer, args: Any*): Unit = {
5.26 super.set(baseSer)
6.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DXFunction.scala Tue Nov 03 22:41:34 2009 +0800
6.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/DXFunction.scala Wed Nov 04 01:43:13 2009 +0800
6.3 @@ -30,9 +30,8 @@
6.4 */
6.5 package org.aiotrade.lib.indicator.function;
6.6
6.7 -import org.aiotrade.lib.math.timeseries.TSer;
6.8 -import org.aiotrade.lib.math.timeseries.TVar;
6.9 -import org.aiotrade.lib.math.timeseries.computable.Factor;
6.10 +import org.aiotrade.lib.math.timeseries.TSer
6.11 +import org.aiotrade.lib.math.timeseries.computable.Factor
6.12
6.13 /**
6.14 *
6.15 @@ -42,10 +41,10 @@
6.16
6.17 var period: Factor = _
6.18
6.19 - val _diPlus = TVar[Float]
6.20 - val _diMinus = TVar[Float]
6.21 + val _diPlus = TVar[Float]()
6.22 + val _diMinus = TVar[Float]()
6.23
6.24 - val _dx = TVar[Float]
6.25 + val _dx = TVar[Float]()
6.26
6.27 override def set(baseSer: TSer, args: Any*): Unit = {
6.28 super.set(baseSer)
7.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/EMAFunction.scala Tue Nov 03 22:41:34 2009 +0800
7.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/EMAFunction.scala Wed Nov 04 01:43:13 2009 +0800
7.3 @@ -43,15 +43,13 @@
7.4 protected def iema(idx: Int, var1: TVar[Float], period: Float, prev: Float): Float = {
7.5 StatisticFunction.iema(idx, var1.values, period.toInt, prev)
7.6 }
7.7 -
7.8 -
7.9 }
7.10 class EMAFunction extends AbstractFunction {
7.11
7.12 var period: Factor = _
7.13 var baseVar: TVar[Float] = _
7.14
7.15 - val _ema = TVar[Float]
7.16 + val _ema = TVar[Float]()
7.17
7.18 override def set(baseSer: TSer, args: Any*): Unit = {
7.19 super.set(baseSer)
8.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MACDFunction.scala Tue Nov 03 22:41:34 2009 +0800
8.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MACDFunction.scala Wed Nov 04 01:43:13 2009 +0800
8.3 @@ -28,11 +28,11 @@
8.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
8.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8.6 */
8.7 -package org.aiotrade.lib.indicator.function;
8.8 +package org.aiotrade.lib.indicator.function
8.9
8.10 -import org.aiotrade.lib.math.timeseries.TSer;
8.11 -import org.aiotrade.lib.math.timeseries.TVar;
8.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
8.13 +import org.aiotrade.lib.math.timeseries.TSer
8.14 +import org.aiotrade.lib.math.timeseries.TVar
8.15 +import org.aiotrade.lib.math.timeseries.computable.Factor
8.16
8.17 /**
8.18 *
8.19 @@ -46,7 +46,7 @@
8.20 val _emaFast = TVar[Float]()
8.21 val _emaSlow = TVar[Float]()
8.22
8.23 - val _macd = TVar[Float]
8.24 + val _macd = TVar[Float]()
8.25
8.26 override def set(baseSer: TSer, args: Any*): Unit = {
8.27 super.set(baseSer)
9.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MAFunction.scala Tue Nov 03 22:41:34 2009 +0800
9.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MAFunction.scala Wed Nov 04 01:43:13 2009 +0800
9.3 @@ -50,7 +50,7 @@
9.4 var period: Factor = _
9.5 var baseVar: TVar[Float] = _
9.6
9.7 - val _ma = TVar[Float]
9.8 + val _ma = TVar[Float]()
9.9
9.10 override def set(baseSer: TSer, args: Any*): Unit = {
9.11 super.set(baseSer)
10.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MAXFunction.scala Tue Nov 03 22:41:34 2009 +0800
10.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MAXFunction.scala Wed Nov 04 01:43:13 2009 +0800
10.3 @@ -28,12 +28,12 @@
10.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
10.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10.6 */
10.7 -package org.aiotrade.lib.indicator.function;
10.8 +package org.aiotrade.lib.indicator.function
10.9
10.10 -import org.aiotrade.lib.math.StatisticFunction;
10.11 -import org.aiotrade.lib.math.timeseries.TSer;
10.12 -import org.aiotrade.lib.math.timeseries.TVar;
10.13 -import org.aiotrade.lib.math.timeseries.computable.Factor;
10.14 +import org.aiotrade.lib.math.StatisticFunction
10.15 +import org.aiotrade.lib.math.timeseries.TSer
10.16 +import org.aiotrade.lib.math.timeseries.TVar
10.17 +import org.aiotrade.lib.math.timeseries.computable.Factor
10.18
10.19 /**
10.20 *
11.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MFIFunction.scala Tue Nov 03 22:41:34 2009 +0800
11.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MFIFunction.scala Wed Nov 04 01:43:13 2009 +0800
11.3 @@ -28,11 +28,10 @@
11.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
11.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11.6 */
11.7 -package org.aiotrade.lib.indicator.function;
11.8 +package org.aiotrade.lib.indicator.function
11.9
11.10 -import org.aiotrade.lib.math.timeseries.TSer;
11.11 -import org.aiotrade.lib.math.timeseries.TVar;
11.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
11.13 +import org.aiotrade.lib.math.timeseries.TSer
11.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
11.15
11.16 /**
11.17 *
11.18 @@ -42,9 +41,9 @@
11.19
11.20 var period: Factor = _
11.21
11.22 - val _tp = TVar[Float]
11.23 - val _mfPos = TVar[Float]
11.24 - val _mfNeg = TVar[Float]
11.25 + val _tp = TVar[Float]()
11.26 + val _mfPos = TVar[Float]()
11.27 + val _mfNeg = TVar[Float]()
11.28
11.29 val _mfi = TVar[Float]
11.30
12.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MINFunction.scala Tue Nov 03 22:41:34 2009 +0800
12.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MINFunction.scala Wed Nov 04 01:43:13 2009 +0800
12.3 @@ -28,12 +28,12 @@
12.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
12.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12.6 */
12.7 -package org.aiotrade.lib.indicator.function;
12.8 +package org.aiotrade.lib.indicator.function
12.9
12.10 -import org.aiotrade.lib.math.StatisticFunction;
12.11 -import org.aiotrade.lib.math.timeseries.TSer;
12.12 -import org.aiotrade.lib.math.timeseries.TVar;
12.13 -import org.aiotrade.lib.math.timeseries.computable.Factor;
12.14 +import org.aiotrade.lib.math.StatisticFunction
12.15 +import org.aiotrade.lib.math.timeseries.TSer
12.16 +import org.aiotrade.lib.math.timeseries.TVar
12.17 +import org.aiotrade.lib.math.timeseries.computable.Factor
12.18
12.19 /**
12.20 *
12.21 @@ -51,7 +51,7 @@
12.22 var period: Factor = _
12.23 var baseVar: TVar[Float] = _
12.24
12.25 - val _min = TVar[Float]
12.26 + val _min = TVar[Float]()
12.27
12.28 override def set(baseSer: TSer, args: Any*): Unit = {
12.29 super.set(baseSer)
13.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MTMFunction.scala Tue Nov 03 22:41:34 2009 +0800
13.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/MTMFunction.scala Wed Nov 04 01:43:13 2009 +0800
13.3 @@ -28,7 +28,7 @@
13.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
13.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13.6 */
13.7 -package org.aiotrade.lib.indicator.function;
13.8 +package org.aiotrade.lib.indicator.function
13.9
13.10 import org.aiotrade.lib.math.timeseries.TSer
13.11 import org.aiotrade.lib.math.timeseries.TVar
14.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/OBVFunction.scala Tue Nov 03 22:41:34 2009 +0800
14.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/OBVFunction.scala Wed Nov 04 01:43:13 2009 +0800
14.3 @@ -31,7 +31,6 @@
14.4 package org.aiotrade.lib.indicator.function
14.5
14.6 import org.aiotrade.lib.math.timeseries.TSer
14.7 -import org.aiotrade.lib.math.timeseries.TVar
14.8
14.9 /**
14.10 *
14.11 @@ -39,7 +38,7 @@
14.12 */
14.13 class OBVFunction extends AbstractFunction {
14.14
14.15 - val _obv = TVar[Float]
14.16 + val _obv = TVar[Float]()
14.17
14.18 override def set(baseSer: TSer, args: Any*): Unit = {
14.19 super.set(baseSer)
15.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ROCFunction.scala Tue Nov 03 22:41:34 2009 +0800
15.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ROCFunction.scala Wed Nov 04 01:43:13 2009 +0800
15.3 @@ -43,7 +43,7 @@
15.4 var period: Factor = _
15.5 var baseVar: TVar[Float] = _
15.6
15.7 - val _roc = TVar[Float]
15.8 + val _roc = TVar[Float]()
15.9
15.10 override def set(baseSer: TSer, args: Any*): Unit = {
15.11 super.set(baseSer)
16.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/RSIFunction.scala Tue Nov 03 22:41:34 2009 +0800
16.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/RSIFunction.scala Wed Nov 04 01:43:13 2009 +0800
16.3 @@ -28,11 +28,10 @@
16.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
16.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16.6 */
16.7 -package org.aiotrade.lib.indicator.function;
16.8 +package org.aiotrade.lib.indicator.function
16.9
16.10 -import org.aiotrade.lib.math.timeseries.TSer;
16.11 -import org.aiotrade.lib.math.timeseries.TVar;
16.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
16.13 +import org.aiotrade.lib.math.timeseries.TSer
16.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
16.15
16.16 /**
16.17 *
16.18 @@ -42,10 +41,10 @@
16.19
16.20 var period: Factor = _
16.21
16.22 - val _up = TVar[Float]
16.23 - val _dn = TVar[Float]
16.24 + val _up = TVar[Float]()
16.25 + val _dn = TVar[Float]()
16.26
16.27 - val _rsi = TVar[Float]
16.28 + val _rsi = TVar[Float]()
16.29
16.30 override def set(baseSer: TSer, args: Any*): Unit = {
16.31 super.set(baseSer)
17.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/SARFunction.scala Tue Nov 03 22:41:34 2009 +0800
17.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/SARFunction.scala Wed Nov 04 01:43:13 2009 +0800
17.3 @@ -28,11 +28,10 @@
17.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
17.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
17.6 */
17.7 -package org.aiotrade.lib.indicator.function;
17.8 +package org.aiotrade.lib.indicator.function
17.9
17.10 -import org.aiotrade.lib.math.timeseries.TSer;
17.11 -import org.aiotrade.lib.math.timeseries.TVar;
17.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
17.13 +import org.aiotrade.lib.math.timeseries.TSer
17.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
17.15
17.16 /**
17.17 *
18.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STDDEVFunction.scala Tue Nov 03 22:41:34 2009 +0800
18.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STDDEVFunction.scala Wed Nov 04 01:43:13 2009 +0800
18.3 @@ -54,7 +54,7 @@
18.4 var period: Factor = _
18.5 var baseVar: TVar[Float] = _
18.6
18.7 - val _stdDev = TVar[Float]
18.8 + val _stdDev = TVar[Float]()
18.9
18.10 override def set(baseSer: TSer, args: Any*): Unit = {
18.11 super.set(baseSer)
19.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STOCHJFunction.scala Tue Nov 03 22:41:34 2009 +0800
19.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STOCHJFunction.scala Wed Nov 04 01:43:13 2009 +0800
19.3 @@ -31,7 +31,6 @@
19.4 package org.aiotrade.lib.indicator.function
19.5
19.6 import org.aiotrade.lib.math.timeseries.TSer
19.7 -import org.aiotrade.lib.math.timeseries.TVar
19.8 import org.aiotrade.lib.math.timeseries.computable.Factor
19.9
19.10 /**
19.11 @@ -42,10 +41,10 @@
19.12
19.13 var period, periodK, periodD: Factor = _
19.14
19.15 - val _stochK = TVar[Float]
19.16 - val _stochD = TVar[Float]
19.17 + val _stochK = TVar[Float]()
19.18 + val _stochD = TVar[Float]()
19.19
19.20 - val _stochJ = TVar[Float]
19.21 + val _stochJ = TVar[Float]()
19.22
19.23 override def set(baseSer: TSer, args: Any*): Unit = {
19.24 super.set(baseSer)
20.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STOCHKFunction.scala Tue Nov 03 22:41:34 2009 +0800
20.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/STOCHKFunction.scala Wed Nov 04 01:43:13 2009 +0800
20.3 @@ -31,7 +31,6 @@
20.4 package org.aiotrade.lib.indicator.function
20.5
20.6 import org.aiotrade.lib.math.timeseries.TSer
20.7 -import org.aiotrade.lib.math.timeseries.TVar
20.8 import org.aiotrade.lib.math.timeseries.computable.Factor
20.9
20.10 /**
20.11 @@ -42,9 +41,9 @@
20.12
20.13 var period, periodK: Factor = _
20.14
20.15 - val _elementK = TVar[Float]
20.16 + val _elementK = TVar[Float]()
20.17
20.18 - val _stochK = TVar[Float]
20.19 + val _stochK = TVar[Float]()
20.20
20.21 override def set(baseSer: TSer, args: Any*): Unit = {
20.22 super.set(baseSer)
21.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/SUMFunction.scala Tue Nov 03 22:41:34 2009 +0800
21.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/SUMFunction.scala Wed Nov 04 01:43:13 2009 +0800
21.3 @@ -28,12 +28,12 @@
21.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
21.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21.6 */
21.7 -package org.aiotrade.lib.indicator.function;
21.8 +package org.aiotrade.lib.indicator.function
21.9
21.10 -import org.aiotrade.lib.math.StatisticFunction;
21.11 -import org.aiotrade.lib.math.timeseries.TSer;
21.12 -import org.aiotrade.lib.math.timeseries.TVar;
21.13 -import org.aiotrade.lib.math.timeseries.computable.Factor;
21.14 +import org.aiotrade.lib.math.StatisticFunction
21.15 +import org.aiotrade.lib.math.timeseries.TSer
21.16 +import org.aiotrade.lib.math.timeseries.TVar
21.17 +import org.aiotrade.lib.math.timeseries.computable.Factor
21.18
21.19 /**
21.20 *
21.21 @@ -50,7 +50,7 @@
21.22 var period: Factor = _
21.23 var baseVar: TVar[Float] = _
21.24
21.25 - val _sum = TVar[Float]
21.26 + val _sum = TVar[Float]()
21.27
21.28 override def set(baseSer: TSer, args: Any*): Unit = {
21.29 super.set(baseSer)
22.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/TRFunction.scala Tue Nov 03 22:41:34 2009 +0800
22.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/TRFunction.scala Wed Nov 04 01:43:13 2009 +0800
22.3 @@ -28,10 +28,9 @@
22.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
22.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22.6 */
22.7 -package org.aiotrade.lib.indicator.function;
22.8 +package org.aiotrade.lib.indicator.function
22.9
22.10 -import org.aiotrade.lib.math.timeseries.TSer;
22.11 -import org.aiotrade.lib.math.timeseries.TVar;
22.12 +import org.aiotrade.lib.math.timeseries.TSer
22.13
22.14 /**
22.15 *
22.16 @@ -39,7 +38,7 @@
22.17 */
22.18 class TRFunction extends AbstractFunction {
22.19
22.20 - val _tr = TVar[Float]
22.21 + val _tr = TVar[Float]()
22.22
22.23 override def set(baseSer: TSer, args: Any*): Unit = {
22.24 super.set(baseSer)
23.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/WMSFunction.scala Tue Nov 03 22:41:34 2009 +0800
23.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/WMSFunction.scala Wed Nov 04 01:43:13 2009 +0800
23.3 @@ -28,11 +28,10 @@
23.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
23.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23.6 */
23.7 -package org.aiotrade.lib.indicator.function;
23.8 +package org.aiotrade.lib.indicator.function
23.9
23.10 -import org.aiotrade.lib.math.timeseries.TSer;
23.11 -import org.aiotrade.lib.math.timeseries.TVar;
23.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
23.13 +import org.aiotrade.lib.math.timeseries.TSer
23.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
23.15
23.16 /**
23.17 *
24.1 --- a/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ZIGZAGFunction.scala Tue Nov 03 22:41:34 2009 +0800
24.2 +++ b/modules/lib.indicator/src/org/aiotrade/lib/indicator/function/ZIGZAGFunction.scala Wed Nov 04 01:43:13 2009 +0800
24.3 @@ -28,11 +28,10 @@
24.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
24.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.6 */
24.7 -package org.aiotrade.lib.indicator.function;
24.8 +package org.aiotrade.lib.indicator.function
24.9
24.10 -import org.aiotrade.lib.math.timeseries.TSer;
24.11 -import org.aiotrade.lib.math.timeseries.TVar;
24.12 -import org.aiotrade.lib.math.timeseries.computable.Factor;
24.13 +import org.aiotrade.lib.math.timeseries.TSer
24.14 +import org.aiotrade.lib.math.timeseries.computable.Factor
24.15
24.16 /**
24.17 *
25.1 --- a/modules/lib.math/src/org/aiotrade/lib/math/StatisticFunction.scala Tue Nov 03 22:41:34 2009 +0800
25.2 +++ b/modules/lib.math/src/org/aiotrade/lib/math/StatisticFunction.scala Wed Nov 04 01:43:13 2009 +0800
25.3 @@ -137,13 +137,11 @@
25.4 * = (1 - a) * ema(t) + a * x(t) // let a = 1/N
25.5 */
25.6 def iema(idx: Int, values: ArrayList[Float], period: Int, prev: Float): Float = {
25.7 - val value = values(idx) match {
25.8 - case x if x.isNaN => 0f
25.9 - case x => x
25.10 - }
25.11 + var value = values(idx)
25.12 + value = if (value.isNaN) 0F else value
25.13
25.14 - val a = 1f / (period * 1f)
25.15 - (1f - a) * prev + a * value
25.16 + val a = 1F / (period * 1F)
25.17 + (1F - a) * prev + a * value
25.18 //return ((period - 1.0f) / (period + 1.0f)) * prevEma + (2.0f / (period + 1.0f)) * value;
25.19 }
25.20
26.1 --- a/modules/lib.math/src/org/aiotrade/lib/math/timeseries/DefaultTSer.scala Tue Nov 03 22:41:34 2009 +0800
26.2 +++ b/modules/lib.math/src/org/aiotrade/lib/math/timeseries/DefaultTSer.scala Wed Nov 04 01:43:13 2009 +0800
26.3 @@ -58,12 +58,8 @@
26.4 *
26.5 * @author Caoyuan Deng
26.6 */
26.7 -object DefaultTSer {
26.8 - val logger = Logger.getLogger(classOf[DefaultTSer].getName)
26.9 -}
26.10 -
26.11 class DefaultTSer(freq: TFreq) extends AbstractTSer(freq) {
26.12 - import DefaultTSer._
26.13 + val logger = Logger.getLogger(this.getClass.getName)
26.14
26.15 private val INIT_CAPACITY = 400
26.16 /**
26.17 @@ -77,7 +73,7 @@
26.18 */
26.19 private var _timestamps: TStamps = TStampsFactory.createInstance(INIT_CAPACITY)
26.20
26.21 - private val _items = new ArrayList[TItem]//{override val initialSize = INIT_CAPACITY}// this will cause timestamps' lock deadlock?
26.22 + private val _items = new ArrayList[TItem](INIT_CAPACITY)// this will cause timestamps' lock deadlock?
26.23
26.24 private var tsLog = timestamps.log
26.25 private var tsLogCheckedCursor = 0
26.26 @@ -248,24 +244,24 @@
26.27 try {
26.28 timestamps.readLock.lock
26.29
26.30 - val log = timestamps.log
26.31 - val logCursor = log.logCursor
26.32 + val tlog = timestamps.log
26.33 + val tlogCursor = tlog.logCursor
26.34 var checkingCursor = tsLogCheckedCursor
26.35 - while (logCursor > -1 && checkingCursor <= logCursor) {
26.36 + while (tlogCursor > -1 && checkingCursor <= tlogCursor) {
26.37 val cursorMoved = if (checkingCursor != tsLogCheckedCursor) {
26.38 // * Is checking a new log, should reset tsLogCheckedSize
26.39 tsLogCheckedSize = 0
26.40 true
26.41 } else false
26.42
26.43 - val logFlag = log(checkingCursor)
26.44 - val logCurrSize = log.checkSize(logFlag)
26.45 - if (!cursorMoved && logCurrSize == tsLogCheckedSize) {
26.46 + val tlogFlag = tlog(checkingCursor)
26.47 + val tlogCurrSize = tlog.checkSize(tlogFlag)
26.48 + if (!cursorMoved && tlogCurrSize == tsLogCheckedSize) {
26.49 // * same log with same size, actually nothing changed
26.50 } else {
26.51 - log.checkKind(logFlag) match {
26.52 + tlog.checkKind(tlogFlag) match {
26.53 case TStampsLog.INSERT =>
26.54 - var begIdx = log.insertIndexOfLog(checkingCursor)
26.55 + val begIdx = tlog.insertIndexOfLog(checkingCursor)
26.56
26.57 val begIdx1 = if (!cursorMoved) {
26.58 // * if insert log is a merged one, means the inserts were continually happening one behind one
26.59 @@ -273,10 +269,9 @@
26.60 } else begIdx
26.61
26.62 val insertSize = if (!cursorMoved) {
26.63 - logCurrSize - tsLogCheckedSize
26.64 - } else logCurrSize
26.65 + tlogCurrSize - tsLogCheckedSize
26.66 + } else tlogCurrSize
26.67
26.68 - logger.info(shortDescription + "(" + freq + ")" + " Log check: cursor=" + checkingCursor + ", insertSize=" + insertSize + ", begIdx=" + begIdx1 + ", currentSize=" + items.size)
26.69 val newItems = new Array[TItem](insertSize)
26.70 var i = 0
26.71 while (i < insertSize) {
26.72 @@ -286,16 +281,15 @@
26.73 i += 1
26.74 }
26.75 items.insertAll(begIdx1, newItems)
26.76 - logger.info(shortDescription + "(" + freq + ") => newSize=" + items.size)
26.77 + logger.info(shortDescription + "(" + freq + ") Log check: cursor=" + checkingCursor + ", insertSize=" + insertSize + ", begIdx=" + begIdx1 + " => newSize=" + items.size)
26.78
26.79 case TStampsLog.APPEND =>
26.80 val begIdx = items.size
26.81
26.82 val appendSize = if (!cursorMoved) {
26.83 - logCurrSize - tsLogCheckedSize
26.84 - } else logCurrSize
26.85 + tlogCurrSize - tsLogCheckedSize
26.86 + } else tlogCurrSize
26.87
26.88 - logger.info(shortDescription + "(" + freq + ")" + " Log check: cursor=" + checkingCursor + ", appendSize=" + appendSize + ", begIdx=" + begIdx + ", currentSize=" + items.size)
26.89 val newItems = new Array[TItem](appendSize)
26.90 var i = 0
26.91 while (i < appendSize) {
26.92 @@ -305,21 +299,21 @@
26.93 i += 1
26.94 }
26.95 items ++= newItems
26.96 - logger.info(shortDescription + "(" + freq + ") => newSize=" + items.size)
26.97 + logger.info(shortDescription + "(" + freq + ") Log check: cursor=" + checkingCursor + ", appendSize=" + appendSize + ", begIdx=" + begIdx + " => newSize=" + items.size)
26.98
26.99 case x => assert(false, "Unknown log type: " + x)
26.100 }
26.101 }
26.102
26.103 tsLogCheckedCursor = checkingCursor
26.104 - tsLogCheckedSize = logCurrSize
26.105 - checkingCursor = log.nextCursor(checkingCursor)
26.106 + tsLogCheckedSize = tlogCurrSize
26.107 + checkingCursor = tlog.nextCursor(checkingCursor)
26.108 }
26.109
26.110 assert(timestamps.size == items.size,
26.111 "Timestamps size=" + timestamps.size + " vs items size=" + items.size +
26.112 ", checkedCursor=" + tsLogCheckedCursor +
26.113 - ", log=" + log)
26.114 + ", log=" + tlog)
26.115 } finally {
26.116 timestamps.readLock.unlock
26.117 }
26.118 @@ -442,7 +436,7 @@
26.119 protected class InnerTVar[V: Manifest](name: String, plot: Plot
26.120 ) extends AbstractInnerTVar[V](name, plot) {
26.121
26.122 - var values = new ArrayList[V]
26.123 + var values = new ArrayList[V](INIT_CAPACITY)
26.124
26.125 def add(time: Long, value: V): Boolean = {
26.126 val idx = timestamps.indexOfOccurredTime(time)
26.127 @@ -471,7 +465,7 @@
26.128 }
26.129
26.130 def validate: Unit = {
26.131 - val newValues = new ArrayList[V] {override val initialSize = INIT_CAPACITY}
26.132 + val newValues = new ArrayList[V](INIT_CAPACITY)
26.133
26.134 var i = 0
26.135 var j = 0
26.136 @@ -531,16 +525,18 @@
26.137
26.138 def setByTime(time: Long, value: V): V = values.setByTime(time, value)
26.139
26.140 - def validate: Unit = {}
26.141 + def validate {}
26.142
26.143 /**
26.144 * All those instances of SparseVar or extended class will be equals if
26.145 * they have the same values, this prevent the duplicated manage of values.
26.146 * @See AbstractIndicator.injectVarsToSer()
26.147 */
26.148 - override def equals(o: Any): Boolean = o match {
26.149 - case x: SparseTVar[_] => this.values == x.values
26.150 - case _ => false
26.151 + override def equals(o: Any): Boolean = {
26.152 + o match {
26.153 + case x: SparseTVar[_] => this.values == x.values
26.154 + case _ => false
26.155 + }
26.156 }
26.157 }
26.158
27.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ARBRIndicator.scala Tue Nov 03 22:41:34 2009 +0800
27.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ARBRIndicator.scala Wed Nov 04 01:43:13 2009 +0800
27.3 @@ -30,8 +30,6 @@
27.4 */
27.5 package org.aiotrade.platform.modules.indicator.basic;
27.6
27.7 -import org.aiotrade.lib.math.timeseries.{TSer,TVar}
27.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
27.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
27.10 import org.aiotrade.lib.indicator.ContIndicator
27.11
28.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/BOLLIndicator.scala Tue Nov 03 22:41:34 2009 +0800
28.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/BOLLIndicator.scala Wed Nov 04 01:43:13 2009 +0800
28.3 @@ -28,12 +28,10 @@
28.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28.6 */
28.7 -package org.aiotrade.platform.modules.indicator.basic;
28.8 +package org.aiotrade.platform.modules.indicator.basic
28.9
28.10 -import org.aiotrade.lib.math.timeseries.TVar;
28.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
28.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
28.13 -import org.aiotrade.lib.indicator.ContIndicator;
28.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
28.15 +import org.aiotrade.lib.indicator.ContIndicator
28.16
28.17 /**
28.18 *
29.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/CCIIndicator.scala Tue Nov 03 22:41:34 2009 +0800
29.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/CCIIndicator.scala Wed Nov 04 01:43:13 2009 +0800
29.3 @@ -30,8 +30,6 @@
29.4 */
29.5 package org.aiotrade.platform.modules.indicator.basic
29.6
29.7 -import org.aiotrade.lib.math.timeseries.TVar
29.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
29.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
29.10 import org.aiotrade.lib.indicator.ContIndicator
29.11
30.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/DMIIndicator.scala Tue Nov 03 22:41:34 2009 +0800
30.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/DMIIndicator.scala Wed Nov 04 01:43:13 2009 +0800
30.3 @@ -28,12 +28,10 @@
30.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
30.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30.6 */
30.7 -package org.aiotrade.platform.modules.indicator.basic;
30.8 +package org.aiotrade.platform.modules.indicator.basic
30.9
30.10 -import org.aiotrade.lib.math.timeseries.TVar;
30.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
30.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
30.13 -import org.aiotrade.lib.indicator.ContIndicator;
30.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
30.15 +import org.aiotrade.lib.indicator.ContIndicator
30.16
30.17 /**
30.18 *
31.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/EMAIndicator.scala Tue Nov 03 22:41:34 2009 +0800
31.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/EMAIndicator.scala Wed Nov 04 01:43:13 2009 +0800
31.3 @@ -30,10 +30,8 @@
31.4 */
31.5 package org.aiotrade.platform.modules.indicator.basic;
31.6
31.7 -import org.aiotrade.lib.math.timeseries.TVar;
31.8 -import org.aiotrade.lib.math.timeseries.computable.Factor;
31.9 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
31.10 -import org.aiotrade.lib.indicator.ContIndicator;
31.11 +import org.aiotrade.lib.math.timeseries.plottable.Plot
31.12 +import org.aiotrade.lib.indicator.ContIndicator
31.13
31.14 /**
31.15 *
32.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/GMMAIndicator.scala Tue Nov 03 22:41:34 2009 +0800
32.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/GMMAIndicator.scala Wed Nov 04 01:43:13 2009 +0800
32.3 @@ -28,12 +28,10 @@
32.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
32.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32.6 */
32.7 -package org.aiotrade.platform.modules.indicator.basic;
32.8 +package org.aiotrade.platform.modules.indicator.basic
32.9
32.10 -import org.aiotrade.lib.math.timeseries.TVar;
32.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
32.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
32.13 -import org.aiotrade.lib.indicator.ContIndicator;
32.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
32.15 +import org.aiotrade.lib.indicator.ContIndicator
32.16
32.17 /**
32.18 * Guppy multiple Moving Average
33.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/HVDIndicator.scala Tue Nov 03 22:41:34 2009 +0800
33.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/HVDIndicator.scala Wed Nov 04 01:43:13 2009 +0800
33.3 @@ -31,8 +31,6 @@
33.4 package org.aiotrade.platform.modules.indicator.basic
33.5
33.6 import org.aiotrade.lib.math.timeseries.TItem
33.7 -import org.aiotrade.lib.math.timeseries.TVar
33.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
33.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
33.10 import org.aiotrade.lib.indicator.SpotIndicator
33.11
34.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/KDIndicator.scala Tue Nov 03 22:41:34 2009 +0800
34.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/KDIndicator.scala Wed Nov 04 01:43:13 2009 +0800
34.3 @@ -28,12 +28,10 @@
34.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
34.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34.6 */
34.7 -package org.aiotrade.platform.modules.indicator.basic;
34.8 +package org.aiotrade.platform.modules.indicator.basic
34.9
34.10 -import org.aiotrade.lib.math.timeseries.TVar;
34.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
34.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
34.13 -import org.aiotrade.lib.indicator.ContIndicator;
34.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
34.15 +import org.aiotrade.lib.indicator.ContIndicator
34.16
34.17 /**
34.18 *
35.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MACDIndicator.scala Tue Nov 03 22:41:34 2009 +0800
35.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MACDIndicator.scala Wed Nov 04 01:43:13 2009 +0800
35.3 @@ -30,8 +30,6 @@
35.4 */
35.5 package org.aiotrade.platform.modules.indicator.basic
35.6
35.7 -import org.aiotrade.lib.math.timeseries.TVar
35.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
35.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
35.10 import org.aiotrade.lib.indicator.ContIndicator
35.11
36.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MAIndicator.scala Tue Nov 03 22:41:34 2009 +0800
36.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MAIndicator.scala Wed Nov 04 01:43:13 2009 +0800
36.3 @@ -30,8 +30,6 @@
36.4 */
36.5 package org.aiotrade.platform.modules.indicator.basic
36.6
36.7 -import org.aiotrade.lib.math.timeseries.TVar
36.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
36.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
36.10 import org.aiotrade.lib.indicator.ContIndicator
36.11
37.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MFIIndicator.scala Tue Nov 03 22:41:34 2009 +0800
37.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MFIIndicator.scala Wed Nov 04 01:43:13 2009 +0800
37.3 @@ -28,12 +28,10 @@
37.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
37.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.6 */
37.7 -package org.aiotrade.platform.modules.indicator.basic;
37.8 +package org.aiotrade.platform.modules.indicator.basic
37.9
37.10 -import org.aiotrade.lib.math.timeseries.TVar;
37.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
37.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
37.13 -import org.aiotrade.lib.indicator.ContIndicator;
37.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
37.15 +import org.aiotrade.lib.indicator.ContIndicator
37.16
37.17 /**
37.18 *
38.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MTMIndicator.scala Tue Nov 03 22:41:34 2009 +0800
38.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/MTMIndicator.scala Wed Nov 04 01:43:13 2009 +0800
38.3 @@ -30,8 +30,6 @@
38.4 */
38.5 package org.aiotrade.platform.modules.indicator.basic
38.6
38.7 -import org.aiotrade.lib.math.timeseries.TVar
38.8 -import org.aiotrade.lib.math.timeseries.computable.Factor
38.9 import org.aiotrade.lib.math.timeseries.plottable.Plot
38.10 import org.aiotrade.lib.indicator.ContIndicator
38.11
39.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/OBVIndicator.scala Tue Nov 03 22:41:34 2009 +0800
39.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/OBVIndicator.scala Wed Nov 04 01:43:13 2009 +0800
39.3 @@ -30,7 +30,6 @@
39.4 */
39.5 package org.aiotrade.platform.modules.indicator.basic
39.6
39.7 -import org.aiotrade.lib.math.timeseries.TVar
39.8 import org.aiotrade.lib.math.timeseries.plottable.Plot
39.9 import org.aiotrade.lib.indicator.ContIndicator
39.10
40.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/RSIIndicator.scala Tue Nov 03 22:41:34 2009 +0800
40.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/RSIIndicator.scala Wed Nov 04 01:43:13 2009 +0800
40.3 @@ -28,12 +28,10 @@
40.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
40.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
40.6 */
40.7 -package org.aiotrade.platform.modules.indicator.basic;
40.8 +package org.aiotrade.platform.modules.indicator.basic
40.9
40.10 -import org.aiotrade.lib.math.timeseries.TVar;
40.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
40.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
40.13 -import org.aiotrade.lib.indicator.ContIndicator;
40.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
40.15 +import org.aiotrade.lib.indicator.ContIndicator
40.16
40.17 /**
40.18 *
41.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/SARIndicator.scala Tue Nov 03 22:41:34 2009 +0800
41.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/SARIndicator.scala Wed Nov 04 01:43:13 2009 +0800
41.3 @@ -28,12 +28,10 @@
41.4 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
41.5 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41.6 */
41.7 -package org.aiotrade.platform.modules.indicator.basic;
41.8 +package org.aiotrade.platform.modules.indicator.basic
41.9
41.10 -import org.aiotrade.lib.math.timeseries.TVar;
41.11 -import org.aiotrade.lib.math.timeseries.computable.Factor;
41.12 -import org.aiotrade.lib.math.timeseries.plottable.Plot;
41.13 -import org.aiotrade.lib.indicator.ContIndicator;
41.14 +import org.aiotrade.lib.math.timeseries.plottable.Plot
41.15 +import org.aiotrade.lib.indicator.ContIndicator
41.16
41.17 /**
41.18 *
42.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/WMSIndicator.scala Tue Nov 03 22:41:34 2009 +0800
42.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/WMSIndicator.scala Wed Nov 04 01:43:13 2009 +0800
42.3 @@ -30,7 +30,6 @@
42.4 */
42.5 package org.aiotrade.platform.modules.indicator.basic
42.6
42.7 -import org.aiotrade.lib.math.timeseries.TVar
42.8 import org.aiotrade.lib.math.timeseries.plottable.Plot
42.9 import org.aiotrade.lib.indicator.ContIndicator
42.10
43.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ZIGZAGFAIndicator.scala Tue Nov 03 22:41:34 2009 +0800
43.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ZIGZAGFAIndicator.scala Wed Nov 04 01:43:13 2009 +0800
43.3 @@ -30,7 +30,6 @@
43.4 */
43.5 package org.aiotrade.platform.modules.indicator.basic
43.6
43.7 -import org.aiotrade.lib.math.timeseries.computable.Factor
43.8 import org.aiotrade.lib.indicator.ContIndicator
43.9
43.10 /**
44.1 --- a/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ZIGZAGIndicator.scala Tue Nov 03 22:41:34 2009 +0800
44.2 +++ b/modules/p.m.indicator.basic/src/org/aiotrade/platform/modules/indicator/basic/ZIGZAGIndicator.scala Wed Nov 04 01:43:13 2009 +0800
44.3 @@ -30,7 +30,6 @@
44.4 */
44.5 package org.aiotrade.platform.modules.indicator.basic
44.6
44.7 -import org.aiotrade.lib.math.timeseries.TVar
44.8 import org.aiotrade.lib.math.timeseries.plottable.Plot
44.9 import org.aiotrade.lib.indicator.ContIndicator
44.10