gavindiaz/QuanTAlib
1
0
Fork 0
mirror of https://github.com/mihakralj/QuanTAlib.git synced 2026-08-18 02:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor COMPARE and CROSS classes, plus add xMA chart

Browse Source
This commit is contained in:
Miha Kralj
2023-04-06 11:39:53 -07:00
parent 69fae888d5
commit 90fa331e0e
32 changed files with 245 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Calculations/Basics/TBars.cs
+3 -3
View File
@@ -70,9 +70,9 @@ public class TBars : System.Collections.Generic.List<(DateTime t, double o, doub
4 => "HL2",
5 => "OC2",
6 => "OHL3",
7 => "Typical",
8 => "Mean",
_ => "Weighted",
7 => "HLC3",
8 => "OHLC4",
_ => "HLCC4",
};
}
Calculations/Logic/COMPARE_Series.cs
+34
View File
@@ -0,0 +1,34 @@
namespace QuanTAlib;
using System;
/* <summary>
COMPARE - Generates +1 if A is above B, -1 if A is below B and 0 if A=B
</summary> */
public class COMPARE_Series : Pair_TSeries_Indicator {
public COMPARE_Series(TSeries d1, TSeries d2) : base(d1, d2) {
if (base._d1.Count > 0 && base._d2.Count > 0) { for (int i = 0; i < base._d1.Count; i++) { this.Add(base._d1[i], base._d2[i], false); } }
}
public COMPARE_Series(TSeries d1, double dd2) : base(d1, dd2) {
if (base._d1.Count > 0) { for (int i = 0; i < base._d1.Count; i++) { this.Add(base._d1[i], (base._d1[i].t, dd2), false); } }
}
public COMPARE_Series(double dd1, TSeries d2) : base(dd1, d2) {
if (base._d2.Count > 0) { for (int i = 0; i < base._d2.Count; i++) { this.Add((base._d2[i].t, dd1), base._d2[i], false); } }
}
public override void Add((System.DateTime t, double v) TValue1, (System.DateTime t, double v) TValue2, bool update) {
double val = TValue1.v > TValue2.v ? 1 : -1;
val = TValue1.v == TValue2.v ? 0 : val;
(System.DateTime t, double v) over = ((TValue1.t > TValue2.t) ? TValue1.t : TValue2.t, TValue1.v > TValue2.v ? 1 : val);
if (update) { base[^1] = over; }
else { base.Add(over); }
}
}
Calculations/Basics/ABOVE_Series.cs → Calculations/Logic/CROSS_Series.cs
+8 -10
View File
@@ -9,17 +9,17 @@ Remarks:
</summary> */
public class OVER_Series : Pair_TSeries_Indicator {
public class CROSS_Series : Pair_TSeries_Indicator {
public TSeries Cross { get; set; } = new();
private double _previous = double.NaN;
public OVER_Series(TSeries d1, TSeries d2) : base(d1, d2) {
public CROSS_Series(TSeries d1, TSeries d2) : base(d1, d2) {
if (base._d1.Count > 0 && base._d2.Count > 0) { for (int i = 0; i < base._d1.Count; i++) { this.Add(base._d1[i], base._d2[i], false); } }
}
public OVER_Series(TSeries d1, double dd2) : base(d1, dd2) {
public CROSS_Series(TSeries d1, double dd2) : base(d1, dd2) {
if (base._d1.Count > 0) { for (int i = 0; i < base._d1.Count; i++) { this.Add(base._d1[i], (base._d1[i].t, dd2), false); } }
}
public OVER_Series(double dd1, TSeries d2) : base(dd1, d2) {
public CROSS_Series(double dd1, TSeries d2) : base(dd1, d2) {
if (base._d2.Count > 0) { for (int i = 0; i < base._d2.Count; i++) { this.Add((base._d2[i].t, dd1), base._d2[i], false); } }
}
@@ -27,15 +27,13 @@ public class OVER_Series : Pair_TSeries_Indicator {
double val = TValue1.v > TValue2.v ? 1 : -1;
val = TValue1.v == TValue2.v ? 0 : val;
(System.DateTime t, double v) over = ((TValue1.t > TValue2.t) ? TValue1.t : TValue2.t, TValue1.v > TValue2.v ? 1 : val);
if (update) { this.Cross[^1] = over; }
else { this.Cross.Add(over); }
double over = TValue1.v > TValue2.v ? 1 : val;
val = (this._previous < over.v) ? 1 : -1;
val = (this._previous < over) ? 1 : -1;
(System.DateTime t, double v) result = ((TValue1.t > TValue2.t) ? TValue1.t : TValue2.t,
((this._previous == over.v) || Double.IsNaN(this._previous) || (this._previous == 0)) ? 0 : val);
((this._previous == over) || Double.IsNaN(this._previous) || (this._previous == 0)) ? 0 : val);
this._previous = over.v;
this._previous = over;
if (update) { base[^1] = result; }
else { base.Add(result); }