Tests and QT cleanup

Quantower/Indicators/AAA_chart.cs

@@ -13,47 +13,45 @@ public class AAA_chart : Indicator {
     #endregion Parameters
 
     private TBars bars;
-    private TSeries series;
-    private JMA_Series jma;
-	private DWMA_Series dwma;
+    private JMA_Series ind_a;
+	private DWMA_Series ind_b;
+
+	public override string ShortName => $"AAA ({this.Period})";
 
 	public AAA_chart() : base()
     {
-        this.SeparateWindow = true;
+        this.SeparateWindow = false;
+
         this.Name = "AAA - Test indicator";
         this.Description = "Test indicator";
 
 		this.AddLineSeries("JMA", Color.RoyalBlue, 3, LineStyle.Solid);
 		this.AddLineSeries("DWMA", Color.OrangeRed, 3, LineStyle.Solid);
+
 		this.SeparateWindow = false;
 	}
 
     protected override void OnInit()
     {
-        this.ShortName = "AAA (" + this.Period + ")";
         this.bars = new();
-        this.series = new();
 
-        this.jma = new(source: bars.HLC3, period: this.Period, useNaN: false);
-		this.dwma = new(source: bars.HLC3, period: this.Period, useNaN: false);
+        this.ind_a = new(source: bars.Close, period: this.Period, useNaN: false);
+		this.ind_b = new(source: bars.OHLC4, period: this.Period, useNaN: false);
 	}
 
 	protected override void OnUpdate(UpdateArgs args)
     {
-		Debug.WriteLine($"{args.Reason}");
 		bool update = !(args.Reason == UpdateReason.NewBar || args.Reason == UpdateReason.HistoricalBar);
 
-        this.bars.Add(this.Time(), 
+        this.bars.Add(this.Time(),
             this.GetPrice(PriceType.Open),
             this.GetPrice(PriceType.High),
             this.GetPrice(PriceType.Low),
             this.GetPrice(PriceType.Close),
-            this.GetPrice(PriceType.Volume), 
+            this.GetPrice(PriceType.Volume),
             update);
 
-        //this.series.Add(0.25*(this.GetPrice(PriceType.Open)+ this.GetPrice(PriceType.High)+ this.GetPrice(PriceType.Low)+ this.GetPrice(PriceType.Close)), update);
-
-		this.SetValue(this.jma.v.Last(), 0);
-		this.SetValue(this.dwma.v.Last(), 1);
+		this.SetValue(this.ind_a.v.Last(), 0);
+		this.SetValue(this.ind_b.v.Last(), 1);
 	}
 }

Quantower/Indicators/ATR_chart.cs

@@ -27,7 +27,6 @@ public class ATR_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "ATR (" + this.Period + ")";
         this.bars = new();
 this.indicator = new(source: bars, period: this.Period, useNaN: false);
     }

Quantower/Indicators/BIAS_chart.cs

@@ -32,7 +32,6 @@ public class BIAS_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "BIAS (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 			this.indicator = new(source: bars.Select(this.DataSource), period: this.Period);
     }

Quantower/Indicators/CCI_chart.cs

@@ -28,10 +28,10 @@ public class CCI_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "CCI (" + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars, period: this.Period, useNaN: false);
-    }␍
+    }
+
 	protected override void OnUpdate(UpdateArgs args)
 	{
         bool update = (args.Reason != UpdateReason.NewBar && args.Reason != UpdateReason.HistoricalBar);

Quantower/Indicators/DEMA_chart.cs

@@ -32,8 +32,6 @@ public class DEMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "DEMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);

Quantower/Indicators/EMA_chart.cs

@@ -32,7 +32,6 @@ public class EMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "EMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource), period: this.Period, useNaN: false);
     }

Quantower/Indicators/ENTP_chart.cs

@@ -32,7 +32,6 @@ public class ENTP_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "ENTP (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource), period: this.Period, useNaN: true);
     }

Quantower/Indicators/HEMA_chart.cs

@@ -32,8 +32,6 @@ public class HEMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "HEMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);

Quantower/Indicators/HMA_chart.cs

@@ -33,8 +33,6 @@ public class HMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "HMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
 		    this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);

Quantower/Indicators/JMA_chart.cs

@@ -1,4 +1,5 @@
 using System.Drawing;
+using System.Linq;
 using TradingPlatform.BusinessLayer;
 namespace QuanTAlib;
 
@@ -32,21 +33,18 @@ public class JMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "JMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
-				this.indicator = new(source: bars.Select(this.DataSource),
-                             period: this.Period, useNaN: false);
+		this.indicator = new(source: bars.Select(this.DataSource), period: this.Period, useNaN: false);
     }
     protected override void OnUpdate(UpdateArgs args)
     {
-        bool update = !(args.Reason == UpdateReason.NewBar ||
-                        args.Reason == UpdateReason.HistoricalBar);
+        bool update = !(args.Reason == UpdateReason.NewBar || args.Reason == UpdateReason.HistoricalBar);
         this.bars.Add(this.Time(), this.GetPrice(PriceType.Open),
                       this.GetPrice(PriceType.High), this.GetPrice(PriceType.Low),
                       this.GetPrice(PriceType.Close),
                       this.GetPrice(PriceType.Volume), update);
-        double result = this.indicator[this.indicator.Count - 1].v;
+
+        double result = this.indicator.v.Last();
         this.SetValue(result);
     }
 }

Quantower/Indicators/KAMA_chart.cs

@@ -37,7 +37,6 @@ public class KAMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "KAMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ":" + this.Fast + ":" + this.Slow + ")";
       this.bars = new();
 			this.indicator = new(source: bars.Select(this.DataSource), period: this.Period, fast: this.Fast, slow: this.Slow, useNaN: false);
 		}

Quantower/Indicators/KURT_chart.cs

@@ -32,8 +32,6 @@ public class KURT_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "KURT (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);

Quantower/Indicators/MAD_chart.cs

@@ -32,8 +32,6 @@ public class MAD_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName =
-            "MAD (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);

Quantower/Indicators/MAPE_chart.cs

@@ -32,9 +32,7 @@ public class MAPE_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "MAPE (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }

Quantower/Indicators/MAX_chart.cs

@@ -32,9 +32,7 @@ public class MAX_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "MAX (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator =
             new(source: bars.Select(this.DataSource), period: this.Period);
     }

Quantower/Indicators/MED_chart.cs

@@ -32,9 +32,7 @@ public class MED_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "MED (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator =
             new(source: bars.Select(this.DataSource), period: this.Period);
     }

Quantower/Indicators/MIN_chart.cs

@@ -33,8 +33,6 @@ public class MIN_chart : Indicator
     protected override void OnInit()
     {
 	    this.bars = new();
-	    this.ShortName =
-            "MIN (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.indicator =
             new(source: bars.Select(this.DataSource), period: this.Period);
     }

Quantower/Indicators/MSE_chart.cs

@@ -32,9 +32,7 @@ public class MSE_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "MSE (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }

Quantower/Indicators/RMA_chart.cs

@@ -32,9 +32,7 @@ public class RMA_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "RMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);
     }

Quantower/Indicators/RSI_chart.cs

@@ -32,9 +32,7 @@ public class RSI_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "RSI (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }

Quantower/Indicators/SDEV_chart.cs

@@ -32,9 +32,7 @@ public class SDEV_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "SDEV (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }

Quantower/Indicators/SMAPE_chart.cs

@@ -32,9 +32,7 @@ public class SMAPE_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "SMAPE (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }

Quantower/Indicators/SMA_chart.cs

@@ -32,13 +32,11 @@ public class SMA_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "SMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);
-    }
-
+    }
+
 	protected override void OnUpdate(UpdateArgs args)
     {
         bool update = !(args.Reason == UpdateReason.NewBar ||

Quantower/Indicators/SMMA_chart.cs

@@ -32,7 +32,6 @@ public class SMMA_chart : Indicator
 
     protected override void OnInit()
     {
-        this.ShortName = "SMMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
         this.bars = new();
 				this.indicator = new(source: bars.Select(this.DataSource), period: this.Period, useNaN: false);
     }

Quantower/Indicators/TEMA_chart.cs

@@ -32,9 +32,7 @@ public class TEMA_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "TEMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);
     }

Quantower/Indicators/VAR_chart.cs

@@ -32,13 +32,11 @@ public class VAR_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "VAR (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: true);
     }
-  
+
     protected override void OnUpdate(UpdateArgs args)
     {
         bool update = !(args.Reason == UpdateReason.NewBar ||

Quantower/Indicators/WMAPE_chart.cs

@@ -41,8 +41,7 @@ public class WMAPE_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName = "WMAPE (" + QuanTAlib.TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
       this.indicator = new(source: this.bars.Select(this.DataSource), period: this.Period, useNaN: true);
     }
 	protected override void OnUpdate(UpdateArgs args)

Quantower/Indicators/WMA_chart.cs

@@ -32,9 +32,7 @@ public class WMA_chart : Indicator
 
     protected override void OnInit()
     {
-	    this.bars = new(); 
-	    this.ShortName =
-            "WMA (" + TBars.SelectStr(this.DataSource) + ", " + this.Period + ")";
+	    this.bars = new();
         this.indicator = new(source: bars.Select(this.DataSource),
                              period: this.Period, useNaN: false);
     }

Quantower/Quantower.csproj

@@ -1,52 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net48</TargetFramework>
-		<LangVersion>preview</LangVersion>
-		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-		<Platforms>AnyCPU</Platforms>
-		<AlgoType>Indicator</AlgoType>
-		<AssemblyName>Quantower_QTAlib</AssemblyName>
-		<RootNamespace>QuanTAlib</RootNamespace>
-		<DebugType>embedded</DebugType>
-		<LangVersion>preview</LangVersion>
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<Nullable>disable</Nullable>
-		<SignAssembly>False</SignAssembly>
-		<CodeAnalysisRuleSet>..\.sonarlint\mihakralj_quantalibcsharp.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<Optimize>True</Optimize>
-		<WarningLevel>3</WarningLevel>
-		<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-		<PlatformTarget>anycpu</PlatformTarget>
-		<DebugType>full</DebugType>
-		<OutputPath>C:\Quantower\TradingPlatform\v1.128.18\..\..\Settings\Scripts\Indicators\Quantower</OutputPath>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-		<DebugType>embedded</DebugType>
-		<Optimize>True</Optimize>
-		<WarningLevel>3</WarningLevel>
-		<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-		<PlatformTarget>anycpu</PlatformTarget>
-		<OutputPath>C:\Quantower\TradingPlatform\v1.128.18\..\..\Settings\Scripts\Indicators\Quantower</OutputPath>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Include="..\Source\**\*.cs" Exclude="..\Source\obj\**;..\Source\Feeds\**">
-			<Link>QuanTAlib\%(RecursiveDir)%(Filename)%(Extension)</Link>
-		</Compile>
-	</ItemGroup>
-	<!--
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <LangVersion>preview</LangVersion>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <Platforms>AnyCPU</Platforms>
+    <AlgoType>Indicator</AlgoType>
+    <AssemblyName>Quantower_QTAlib</AssemblyName>
+    <RootNamespace>QuanTAlib</RootNamespace>
+    <DebugType>embedded</DebugType>
+    <LangVersion>preview</LangVersion>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Nullable>disable</Nullable>
+    <SignAssembly>False</SignAssembly>
+    <CodeAnalysisRuleSet>..\.sonarlint\mihakralj_quantalibcsharp.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <Optimize>True</Optimize>
+    <WarningLevel>3</WarningLevel>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <PlatformTarget>anycpu</PlatformTarget>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+    <Optimize>True</Optimize>
+    <WarningLevel>3</WarningLevel>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <PlatformTarget>anycpu</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Source\**\*.cs" Exclude="..\Source\obj\**;..\Source\Feeds\**">
+      <Link>QuanTAlib\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
   <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
     <Copy SourceFiles=".\bin\$(Configuration)\net48\Quantower_QTAlib.dll" DestinationFolder="\Quantower\Settings\Scripts\Indicators\QuanTAlib" />
   </Target>
-  -->
-	<ItemGroup>
-		<AdditionalFiles Include="..\.sonarlint\mihakralj_quantalib\CSharp\SonarLint.xml" Link="SonarLint.xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<Reference Include="TradingPlatform.BusinessLayer">
-			<HintPath>C:\Quantower\TradingPlatform\v1.128.18\bin\TradingPlatform.BusinessLayer.dll</HintPath>
-		</Reference>
-	</ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="TradingPlatform.BusinessLayer">
+      <HintPath>C:\Quantower\TradingPlatform\v1.128.20\bin\TradingPlatform.BusinessLayer.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>