gavindiaz/EA_with_Python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harden pending cancellation and startup state handling

Browse Source
This commit is contained in:
Hiroaki86
2026-05-31 17:17:54 +09:00
parent bbc8ea1a80
commit 33cfc2597c
14 changed files with 4196 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Include/MyLib/Signals/HITEntrySignal.mqh
+23 -5
View File
@@ -198,6 +198,22 @@ string TargetCandidateAgeText(EAState &state)
return IntegerToString(age_seconds) + "s";
}
//+------------------------------------------------------------------+
//| pending注文コメントへ付与するH1候補IDを返す関数
//+------------------------------------------------------------------+
/**
* @brief 復元済みのH1確定足時刻がある場合だけ候補IDをコメントへ付与します。
*/
string TargetCandidateCommentSuffix(EAState &state)
{
if(state.target_candidate_at <= 0 ||
state.zone_candidate_id == "" ||
state.zone_candidate_id == "0")
return "";
return "Z" + state.zone_candidate_id;
}
//+------------------------------------------------------------------+
//| 許可された注文タイプだけを順番に送信する関数
//+------------------------------------------------------------------+
@@ -267,9 +283,10 @@ string TwoDigit(const int value)
//+------------------------------------------------------------------+
//| 分割slot識別子を作る関数
//+------------------------------------------------------------------+
string SplitSlotKey(const string candidate_id, const int slot_index, const int split_count)
string SplitSlotKey(const int orderType, const string candidate_id, const int slot_index, const int split_count)
{
return "Z" + candidate_id + "#" + TwoDigit(slot_index) + "/" + TwoDigit(split_count);
return "Z" + candidate_id + "#T" + IntegerToString(orderType) + "-" +
TwoDigit(slot_index) + "/" + TwoDigit(split_count);
}
//+------------------------------------------------------------------+
@@ -482,7 +499,7 @@ int TrySendSplitEntryOrders(const int orderType, EAState &state, TickContext &ct
break;
}
string slot_key = SplitSlotKey(state.zone_candidate_id, slot, split_count);
string slot_key = SplitSlotKey(orderType, state.zone_candidate_id, slot, split_count);
if(HasExistingSplitSlot(slot_key))
{
Print("[Split Skip] slot already exists. key=", slot_key);
@@ -503,7 +520,7 @@ int TrySendSplitEntryOrders(const int orderType, EAState &state, TickContext &ct
Print("[Split ", entry_type, " Order Try] key=", slot_key,
" en=", en, " tp=", tp, " sl=", sl, " volume=", volume);
if(SendOrder(orderType, en, tp, sl, volume, slot_key))
if(SendOrder(orderType, en, tp, sl, volume, slot_key, TargetCandidateReferenceTime(state)))
{
Print("[Split ", entry_type, " Order Sent] key=", slot_key,
" en=", en, " tp=", tp, " sl=", sl, " volume=", volume);
@@ -568,7 +585,8 @@ bool TrySendEntryOrder(const int orderType, EAState &state, TickContext &ctx)
Print("[", entry_type, " Order Try at ", cur_price, "] en=", en, " tp=", tp, " sl=", sl);
if(SendOrder(orderType, en, tp, sl, lot_size, ""))
if(SendOrder(orderType, en, tp, sl, lot_size,
TargetCandidateCommentSuffix(state), TargetCandidateReferenceTime(state)))
{
Print("[", entry_type, " Order Sent] ticket ok. en=", en, " tp=", tp, " sl=", sl);
return true;