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

Strengthen Python timeout recovery and candidate freshness

Browse Source
This commit is contained in:
Hiroaki86
2026-05-30 08:59:40 +09:00
parent 265d378e07
commit 321431d8ec
17 changed files with 454 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Include/MyLib/Signals/HITEntrySignal.mqh
+28 -10
View File
@@ -80,8 +80,9 @@ bool ValidateEntryPreconditions(EAState &state)
if(IsTargetCandidateExpired(state))
{
Print("[Entry Skip] H1 target candidate expired. loaded_at=",
TimeToString(state.target_loaded_at, TIME_DATE | TIME_SECONDS));
Print("[Entry Skip] H1 target candidate expired. candidate_at=",
TimeToString(TargetCandidateReferenceTime(state), TIME_DATE | TIME_SECONDS),
" loaded_at=", TimeToString(state.target_loaded_at, TIME_DATE | TIME_SECONDS));
state.chk_cnt = 0;
return false;
}
@@ -91,6 +92,7 @@ bool ValidateEntryPreconditions(EAState &state)
Print("[Entry Skip] H1 target candidate is too old for new execution. age=",
TargetCandidateAgeText(state),
" max_age_minutes=", input_entry_max_candidate_age_minutes,
" candidate_at=", TimeToString(TargetCandidateReferenceTime(state), TIME_DATE | TIME_SECONDS),
" loaded_at=", TimeToString(state.target_loaded_at, TIME_DATE | TIME_SECONDS));
state.chk_cnt = 0;
return false;
@@ -113,19 +115,20 @@ bool ValidateEntryPreconditions(EAState &state)
/**
* @brief H1候補価格がENTRY_H1_LIMIT時間を超えて古くなっていないか判定します。
*
* @param state EA全体の状態。H1候補価格の読込時刻を参照します。
* @param state EA全体の状態。H1候補価格の元になった確定足時刻を参照します。
* @return 候補価格が期限切れの場合はtrue。
*/
bool IsTargetCandidateExpired(EAState &state)
{
if(state.target_loaded_at <= 0)
datetime reference_time = TargetCandidateReferenceTime(state);
if(reference_time <= 0)
return false;
int expiration_seconds = ENTRY_H1_LIMIT * PeriodSeconds(PERIOD_H1);
if(expiration_seconds <= 0)
return false;
return (TimeCurrent() - state.target_loaded_at >= expiration_seconds);
return (TimeCurrent() - reference_time >= expiration_seconds);
}
//+------------------------------------------------------------------+
@@ -134,14 +137,14 @@ bool IsTargetCandidateExpired(EAState &state)
/**
* @brief M15確認が遅れて整った古いH1候補で新規注文しないように判定します。
*
* @param state EA全体の状態。H1候補価格の読込時刻を参照します。
* @param state EA全体の状態。H1候補価格の元になった確定足時刻を参照します。
* @return 入力で指定した最大経過分数を超えている場合はtrue。
*/
bool IsTargetCandidateTooOldForExecution(EAState &state)
{
if(input_entry_max_candidate_age_minutes <= 0)
return false;
if(state.target_loaded_at <= 0)
if(TargetCandidateReferenceTime(state) <= 0)
return false;
int max_age_seconds = input_entry_max_candidate_age_minutes * 60;
@@ -151,18 +154,33 @@ bool IsTargetCandidateTooOldForExecution(EAState &state)
return (TargetCandidateAgeSeconds(state) > max_age_seconds);
}
//+------------------------------------------------------------------+
//| H1候補価格の鮮度判定に使う基準時刻を返す関数
//+------------------------------------------------------------------+
/**
* @brief Python結果の読込時刻ではなく、H1確定足由来の候補時刻を優先します。
*/
datetime TargetCandidateReferenceTime(EAState &state)
{
if(state.target_candidate_at > 0)
return state.target_candidate_at;
return state.target_loaded_at;
}
//+------------------------------------------------------------------+
//| H1候補価格の経過秒数を返す関数
//+------------------------------------------------------------------+
/**
* @brief H1候補価格をEAへ読み込んでからの経過秒数を返します。
* @brief H1候補価格の元になった確定足からの経過秒数を返します。
*/
int TargetCandidateAgeSeconds(EAState &state)
{
if(state.target_loaded_at <= 0)
datetime reference_time = TargetCandidateReferenceTime(state);
if(reference_time <= 0)
return -1;
return (int)(TimeCurrent() - state.target_loaded_at);
return (int)(TimeCurrent() - reference_time);
}
//+------------------------------------------------------------------+
Include/MyLib/Signals/HITPythonSignalGateway.mqh
+79 -3
View File
@@ -214,6 +214,71 @@ bool TryParseStrictDouble(const string value, double &parsed)
return true;
}
//+------------------------------------------------------------------+
//| H1候補IDを安全な12桁時刻トークンへ正規化する関数
//+------------------------------------------------------------------+
/**
* @brief Pythonから受け取ったcandidate_idを注文コメントに使える数字だけへ丸めます。
*/
string NormalizeTargetCandidateId(const string value)
{
string text = TrimText(value);
string output = "";
int length = StringLen(text);
for(int i = 0; i < length && StringLen(output) < 12; i++)
{
int ch = StringGetCharacter(text, i);
if(IsDecimalDigit(ch))
output += StringSubstr(text, i, 1);
}
if(StringLen(output) <= 0)
return "0";
return output;
}
//+------------------------------------------------------------------+
//| H1候補IDから確定足時刻を復元する関数
//+------------------------------------------------------------------+
/**
* @brief `yyyyMMddHHmm` 形式のcandidate_idをdatetimeへ変換します。
*/
bool TryParseTargetCandidateTime(const string candidate_id, datetime &candidate_at)
{
candidate_at = 0;
string text = NormalizeTargetCandidateId(candidate_id);
if(StringLen(text) != 12)
return false;
int year = (int)StringToInteger(StringSubstr(text, 0, 4));
int month = (int)StringToInteger(StringSubstr(text, 4, 2));
int day = (int)StringToInteger(StringSubstr(text, 6, 2));
int hour = (int)StringToInteger(StringSubstr(text, 8, 2));
int minute = (int)StringToInteger(StringSubstr(text, 10, 2));
if(year < 2000 || month < 1 || month > 12 ||
day < 1 || day > 31 || hour < 0 || hour > 23 ||
minute < 0 || minute > 59)
return false;
string datetime_text = StringFormat("%04d.%02d.%02d %02d:%02d",
year, month, day, hour, minute);
datetime parsed = StringToTime(datetime_text);
if(parsed <= 0)
return false;
MqlDateTime parts;
TimeToStruct(parsed, parts);
if(parts.year != year || parts.mon != month || parts.day != day ||
parts.hour != hour || parts.min != minute)
return false;
candidate_at = parsed;
return true;
}
//+------------------------------------------------------------------+
//| バッチファイル（Pythonスクリプト）を実行する関数
//+------------------------------------------------------------------+
@@ -230,7 +295,9 @@ bool ExecuteBatchTrend()
return false;
DeleteDoneFile(done_trend_file);
return StartBatchProcess(get_trend_reply_bat, running_trend_file, "trend", g_trend_process, mt5_file_prefix);
int price_digits = (int)SymbolInfoInteger(_Symbol, SYMBOL_DIGITS);
return StartBatchProcess(get_trend_reply_bat, running_trend_file, "trend",
g_trend_process, mt5_file_prefix, price_digits);
}
//+------------------------------------------------------------------+
@@ -249,7 +316,9 @@ bool ExecuteBatchEntry()
return false;
DeleteDoneFile(done_entry_file);
return StartBatchProcess(get_entry_reply_bat, running_entry_file, "entry", g_entry_process, mt5_file_prefix);
int price_digits = (int)SymbolInfoInteger(_Symbol, SYMBOL_DIGITS);
return StartBatchProcess(get_entry_reply_bat, running_entry_file, "entry",
g_entry_process, mt5_file_prefix, price_digits);
}
@@ -504,6 +573,7 @@ void ResetTargetZones(EAState &state)
{
state.zone_res_chk = 0;
state.zone_candidate_id = "0";
state.target_candidate_at = 0;
for(int t = 1; t <= 4; t++)
{
@@ -611,7 +681,12 @@ void LoadTargetZones(EAState &state)
if(line_index == 3)
{
state.zone_candidate_id = line;
state.zone_candidate_id = NormalizeTargetCandidateId(line);
datetime candidate_at = 0;
if(TryParseTargetCandidateTime(state.zone_candidate_id, candidate_at))
state.target_candidate_at = candidate_at;
else
state.target_candidate_at = 0;
continue;
}
@@ -634,6 +709,7 @@ void LoadTargetZones(EAState &state)
Print("target_zones: res=", state.zone_res_chk,
" id=", state.zone_candidate_id,
" candidate_at=", TimeToString(state.target_candidate_at, TIME_DATE | TIME_MINUTES),
" | T1 zone=", state.zone_low[1], "-", state.zone_high[1],
" tp=", state.zone_tp[1], " sl=", state.zone_sl[1],
" | T2 zone=", state.zone_low[2], "-", state.zone_high[2],