Merge branch 'feature/V1.1' of http://222.96.13.116/Million into feature/V1.1
This commit is contained in:
@@ -48,7 +48,7 @@ namespace Million.IndicatorConditionSetup
|
||||
|
||||
public override string GetKeyName(bool IndexStr = false)
|
||||
{
|
||||
var key = "Bol" + Period + Squared;
|
||||
var key = "Bol"+ (Indicator_BolingerOverLine==CommonProperty.Indicator_BolingerOverLine.하향선?"U":"") + Period + Squared;
|
||||
if (IndexStr)
|
||||
return IndexString + key;
|
||||
return key;
|
||||
@@ -115,10 +115,20 @@ namespace Million.IndicatorConditionSetup
|
||||
t_Low += Math.Pow(data[j].LowValue - average_Low, 2);
|
||||
t_Close += Math.Pow(data[j].EndValue - average, 2);
|
||||
|
||||
bol.startValue = average_Open + Squared * Math.Sqrt(t_Open / Period);
|
||||
bol.highValue = average_High + Squared * Math.Sqrt(t_High / Period);
|
||||
bol.lowValue = average_Low + Squared * Math.Sqrt(t_Low / Period);
|
||||
bol.value = average + Squared * Math.Sqrt(t_Close / Period);
|
||||
if(Indicator_BolingerOverLine == CommonProperty.Indicator_BolingerOverLine.하향선)
|
||||
{
|
||||
bol.startValue = average_Open - Squared * Math.Sqrt(t_Open / Period);
|
||||
bol.highValue = average_High - Squared * Math.Sqrt(t_High / Period);
|
||||
bol.lowValue = average_Low - Squared * Math.Sqrt(t_Low / Period);
|
||||
bol.value = average - Squared * Math.Sqrt(t_Close / Period);
|
||||
}
|
||||
else
|
||||
{
|
||||
bol.startValue = average_Open + Squared * Math.Sqrt(t_Open / Period);
|
||||
bol.highValue = average_High + Squared * Math.Sqrt(t_High / Period);
|
||||
bol.lowValue = average_Low + Squared * Math.Sqrt(t_Low / Period);
|
||||
bol.value = average + Squared * Math.Sqrt(t_Close / Period);
|
||||
}
|
||||
|
||||
IndicatorData.OverChecker(data[i], bol, data[i - 1].IndicatorDic[bolKeyName].indicator_over);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user