saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last ...

Browse Source
This commit is contained in:
saherelm
2025-06-06 05:42:15 +03:30
parent 519dc3b59f
commit 555244a844
8 changed files with 1388 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/x-saherelm.x-alert.class.mq5
+1 -1
View File
@@ -294,7 +294,7 @@ class XCAlert : public XCBase
} }
// //
Print(GetPrefix(), " > ", message); Print(message);
} }
void Log(string tag, string message) void Log(string tag, string message)
{ {
Classes/x-saherelm.x-data.collector.class.mq5
+3 -12
View File
@@ -59,16 +59,7 @@ class XCDataCollector : public XCBase
// //
void Path(string value) void Path(string value)
{ {
// mPath = value;
// Normalizing Collector Path ...
if (IsValid(value))
{
mPath = value;
}
else
{
mPath = "XDataCollector";
}
} }
// //
@@ -83,7 +74,7 @@ class XCDataCollector : public XCBase
// //
result = result =
// //
mPath + "\\" + fileName + ".x121.log" (IsValid(mPath) ? mPath + "\\" : "") + fileName + ".x121.log"
// //
; ;
@@ -128,7 +119,7 @@ class XCDataCollector : public XCBase
// //
result = FileOpen( result = FileOpen(
filePath, filePath,
FILE_READ | FILE_TXT // FILE_READ | FILE_TXT | FILE_ANSI //
); );
// //
Documents/BKP/tmp.conditionalling.signalling.mq5
+24
View File
@@ -1407,3 +1407,27 @@
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
template <typename T>
bool IsBoolean(T value)
{
//
bool result = false;
//
string normalizedValue = ToString(value);
StringToLower(normalizedValue);
normalizedValue = Trim(normalizedValue);
//
result =
!IsValid(normalizedValue)
? false
: (normalizedValue == "true" ||
normalizedValue == "false");
//
return result;
}
///////////////////////////////////////////////////////////////////
Documents/XCATBEAInputs/inputs.config.filepath.txt
+1
View File
@@ -0,0 +1 @@
X121XCATBEA\X121XCATBEA_XAUUSDb_M5.x121.log
Documents/XCATBEAInputs/x-saherelm.xcatb.ea.base.optimization.inputs.set
BIN
View File
Binary file not shown.
Libraries/x-saherelm.common.extensions.lib.mq5
+42 -25
View File
@@ -1857,28 +1857,6 @@ string Trim(string value)
return result; return result;
} }
template <typename T>
bool IsBoolean(T value)
{
//
bool result = false;
//
string normalizedValue = ToString(value);
StringToLower(normalizedValue);
normalizedValue = Trim(normalizedValue);
//
result =
!IsValid(normalizedValue)
? false
: (normalizedValue == "true" ||
normalizedValue == "false");
//
return result;
}
// //
// Used In Report or Summary Generators ... // Used In Report or Summary Generators ...
string ToString( string ToString(
@@ -1894,7 +1872,7 @@ string ToString(
// //
bool canSet = bool canSet =
IsBoolean(value) IsBoolean(ToString(value))
? (bool)value || !ignoreFalseConditions ? (bool)value || !ignoreFalseConditions
: true; : true;
@@ -2023,6 +2001,35 @@ string ToString(
return result; return result;
} }
/**
* Check a String Value is Boolean or Not ...
*
* @param value: string representation of value ...
*
* @return ( bool )
*/
bool IsBoolean(string value)
{
//
bool result = false;
//
string istring = value;
string normalizedValue = ToString(istring);
StringToLower(normalizedValue);
normalizedValue = Trim(normalizedValue);
//
result =
!IsValid(normalizedValue)
? false
: (normalizedValue == "true" ||
normalizedValue == "false");
//
return result;
}
/** /**
* Converts String to boolean ... * Converts String to boolean ...
* *
@@ -2036,14 +2043,24 @@ bool ToBoolean(string value)
bool result = false; bool result = false;
// //
if (StringLen(value) <= 0) if (!IsBoolean(value) ||
StringLen(value) <= 0)
{ {
return result; return result;
} }
// //
value = Trim(value);
StringToLower(value); StringToLower(value);
result = value == "true";
//
bool isTrue = value == "true";
bool isFalse = value == "false";
//
result = isTrue
? true
: false;
// //
return result; return result;
XCATBEA/Classes/xcatbea.expert.class.mq5
+1298 -8
View File
File diff suppressed because it is too large Load Diff
XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5
+19 -50
View File
@@ -1647,10 +1647,13 @@ class XCXCATBEATradeManager : public XCBase
// //
collector = new XCDataCollector(); collector = new XCDataCollector();
// //
// Setting Collector Path ... // Setting Collector Path ...
string mPath = alert.GetPrefix() + "\\" + trader.mAccount.GetCompany(); string mPath = (IsValid(alert.GetPrefix())
? alert.GetPrefix() + "\\"
: "") +
trader.mAccount.GetCompany();
collector.Path(mPath); collector.Path(mPath);
} }
@@ -3066,14 +3069,8 @@ class XCXCATBEATradeManager : public XCBase
string result = NULL; string result = NULL;
// //
string mPath = collector.Path(); result = collector
.GetFilePath("Trades" + "\\" + fileName);
//
result =
//
mPath + "\\" + "Trades" + "\\" + fileName + ".x121.log"
//
;
// //
return result; return result;
@@ -3086,14 +3083,8 @@ class XCXCATBEATradeManager : public XCBase
string result = NULL; string result = NULL;
// //
string mPath = collector.Path(); result = collector
.GetFilePath("Signals" + "\\" + fileName);
//
result =
//
mPath + "\\" + "Signals" + "\\" + fileName + ".x121.log"
//
;
// //
return result; return result;
@@ -3106,17 +3097,10 @@ class XCXCATBEATradeManager : public XCBase
string result = NULL; string result = NULL;
// //
string mPath = collector.Path(); result = collector
.GetFilePath("Conditions" + "\\" +
// trade.signal.symbol + "\\" +
result = ToString(trade.signal.period) + "_wins");
//
mPath + "\\" +
"Conditions" + "\\" +
trade.signal.symbol + "\\" +
ToString(trade.signal.period) + "_wins.x121.log"
//
;
// //
return result; return result;
@@ -3129,17 +3113,10 @@ class XCXCATBEATradeManager : public XCBase
string result = NULL; string result = NULL;
// //
string mPath = collector.Path(); result = collector
.GetFilePath("Conditions" + "\\" +
// trade.signal.symbol + "\\" +
result = ToString(trade.signal.period) + "_losts");
//
mPath + "\\" +
"Conditions" + "\\" +
trade.signal.symbol + "\\" +
ToString(trade.signal.period) + "_losts.x121.log"
//
;
// //
return result; return result;
@@ -3158,16 +3135,8 @@ class XCXCATBEATradeManager : public XCBase
} }
// //
string mPath = collector.Path(); result = collector
.GetFilePath("Restrictions" + "\\" + symbol);
//
result =
//
mPath + "\\" +
"Restrictions" + "\\" +
symbol + ".x121.log"
//
;
// //
return result; return result;