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

refactor libraries issues for new version compiling ...

Browse Source
This commit is contained in:
saherelm
2025-08-05 16:56:38 +03:30
parent 6db303b53f
commit f260ccc8de
21 changed files with 636 additions and 4026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/x-saherelm.x-trade.lib.mq5
+135 -65
View File
@@ -353,7 +353,7 @@ struct XRR
type = X_POSITION_TYPE_NONE;
//
Clean(tps);
SpecifiedClean(tps);
//
ZeroMemory(this);
@@ -376,8 +376,8 @@ struct XRR
result =
_sl > 0 &&
_entry > 0 &&
IsValid(_symbol) &&
IsValid(_period) &&
IsSpecifiedValid(_symbol) &&
IsSpecifiedValid(_period) &&
_type != X_POSITION_TYPE_ALL &&
_type != X_POSITION_TYPE_NONE &&
(_type == X_POSITION_TYPE_LONG
@@ -453,9 +453,9 @@ struct XRR
result =
sl > 0 &&
entry > 0 &&
IsValid(time) &&
IsValid(symbol) &&
IsValid(period) &&
IsSpecifiedValid(time) &&
IsSpecifiedValid(symbol) &&
IsSpecifiedValid(period) &&
IsValidSize(ArraySize(tps)) &&
type != X_POSITION_TYPE_ALL &&
type != X_POSITION_TYPE_NONE &&
@@ -486,7 +486,7 @@ struct XRR
//
result =
GetTypeName(this) + sep + (IsValid(prefix) ? prefix + sep : "") + symbol + sep + ToString(period) + sep + ToFormatString(time) + sep + ToString(type);
GetTypeName(this) + sep + (IsSpecifiedValid(prefix) ? prefix + sep : "") + symbol + sep + ToXString(period) + sep + ToFormatString(time) + sep + ToString(type);
//
return result;
@@ -864,7 +864,7 @@ struct XPosition
//
result =
//
IsValid(symbol) &&
IsSpecifiedValid(symbol) &&
NotEmpty(ticket)
//
;
@@ -887,7 +887,7 @@ struct XPosition
}
//
result = GetEntry(
result = GetXEntry(
symbol,
type
//
@@ -911,7 +911,7 @@ struct XPosition
}
//
result = GetExit(
result = GetXExit(
symbol,
type
//
@@ -935,7 +935,7 @@ struct XPosition
}
//
result = PriceToPoint(GetSpread(symbol));
result = PriceToPoint(GetXSpread(symbol));
//
return result;
@@ -1067,7 +1067,7 @@ struct XPosition
int result = 0;
//
Clean(tps);
SpecifiedClean(tps);
//
bool isValid = IsValid();
@@ -1175,7 +1175,7 @@ struct XPosition
ENUM_TIMEFRAMES mPeriod // Calculate Age based on this period
)
{
return GetAge(this, mPeriod);
return GetXAge(this, mPeriod);
}
//
@@ -1207,11 +1207,11 @@ struct XPosition
//
// Find index in a Collection ...
int FindIndex(
const XPosition &values[] // Collection to Find
XPosition &values[] // Collection to Find
)
{
//
return FindIndex(
return FindXIndex(
this,
values
//
@@ -1358,7 +1358,7 @@ struct XSignal
conditions = NULL;
//
Clean(targets);
SpecifiedClean(targets);
appliedTargetIDX = -1;
ignoreEAVolume = false;
isTargetApplied = false;
@@ -1387,7 +1387,7 @@ struct XSignal
conditions = NULL;
//
Clean(targets);
SpecifiedClean(targets);
appliedTargetIDX = -1;
ignoreEAVolume = false;
isTargetApplied = false;
@@ -1403,8 +1403,8 @@ struct XSignal
//
result =
//
IsValid(period) &&
IsValid(symbol) &&
IsSpecifiedValid(period) &&
IsSpecifiedValid(symbol) &&
NotEmpty(volume) &&
NotEmpty(entry)
//
@@ -1481,7 +1481,7 @@ struct XSignal
}
//
if (IsValid(provider))
if (IsSpecifiedValid(provider))
{
//
// Generate Provider Tag ...
@@ -1489,7 +1489,7 @@ struct XSignal
}
//
if (IsValid(period))
if (IsSpecifiedValid(period))
{
//
// Generate Period Tag ...
@@ -1504,7 +1504,7 @@ struct XSignal
int GetAge()
{
//
return GetAge(
return GetXAge(
this,
this.period //
);
@@ -1579,11 +1579,11 @@ struct XSignal
//
result = "XSignal_" +
symbol + "_" +
ToString(period) + "_" +
ToString(type) + "_" +
ToString(sl) + "_" +
ToString(tp) + "_" +
ToString(entry);
ToXString(period) + "_" +
ToXString(type) + "_" +
ToXString(sl) + "_" +
ToXString(tp) + "_" +
ToXString(entry);
//
return result;
@@ -1599,17 +1599,17 @@ struct XSignal
//
result =
//
ToString("Symbol", symbol) +
ToString("Period", period) +
ToString("Provider", provider) +
ToString("Type", type) +
ToString("Mode", mode) +
ToString("Volume", volume) +
ToString("Entry", entry) +
ToString("TP", tp) +
ToString("SL", sl) +
ToString("Time", time) +
ToString("Comment", comment) +
ToXString("Symbol", symbol) +
ToXString("Period", period) +
ToXString("Provider", provider) +
ToXString("Type", type) +
ToXString("Mode", mode) +
ToXString("Volume", volume) +
ToXString("Entry", entry) +
ToXString("TP", tp) +
ToXString("SL", sl) +
ToXString("Time", time) +
ToXString("Comment", comment) +
//
""
//
@@ -1660,14 +1660,14 @@ struct XSignal
}
//
result = ToString(type) +
result = ToXString(type) +
" Signal" +
(!IsValid(action)
(!IsSpecifiedValid(action)
? ""
: " " + action) +
" by: " + provider +
" on (" + symbol + ")" +
" in: " + ToString(period);
" in: " + ToXString(period);
//
return result;
@@ -1689,8 +1689,8 @@ struct XSignal
result =
//
symbol + "\\" +
ToString(type) + "\\" +
ToString(period) + "_" +
ToXString(type) + "\\" +
ToXString(period) + "_" +
ToFormatString(time)
//
;
@@ -1978,7 +1978,7 @@ struct XOrder
//
result =
//
IsValid(symbol) &&
IsSpecifiedValid(symbol) &&
NotEmpty(ticket) &&
NotEmpty(positionId)
//
@@ -1994,7 +1994,7 @@ struct XOrder
ENUM_TIMEFRAMES mPeriod // Calculate Age based on this period
)
{
return GetAge(this, mPeriod);
return GetXAge(this, mPeriod);
}
//
@@ -2026,11 +2026,11 @@ struct XOrder
//
// Find index in a Collection ...
int FindIndex(
const XOrder &values[] // Collection to Find
XOrder &values[] // Collection to Find
)
{
//
return FindIndex(
return FindXIndex(
this,
values
//
@@ -2338,7 +2338,7 @@ struct XDeal
//
result =
//
IsValid(symbol) &&
IsSpecifiedValid(symbol) &&
NotEmpty(ticket) &&
NotEmpty(positionId)
//
@@ -2354,7 +2354,7 @@ struct XDeal
ENUM_TIMEFRAMES mPeriod // Calculate Age based on this period
)
{
return GetAge(this, mPeriod);
return GetXAge(this, mPeriod);
}
//
@@ -2388,11 +2388,11 @@ struct XDeal
//
// Find index in a Collection ...
int FindIndex(
const XDeal &values[] // Collection to Find
XDeal &values[] // Collection to Find
)
{
//
return FindIndex(
return FindXIndex(
this,
values
//
@@ -2668,7 +2668,7 @@ struct XSymbolPositions
);
//
Clean(positions);
SpecifiedClean(positions);
//
int tmpsCount = ArraySize(_tmp);
@@ -2698,14 +2698,14 @@ struct XSymbolPositions
}
//
Clean(_tmp);
SpecifiedClean(_tmp);
//
Copy(
_positions,
positions //
);
Clean(_positions);
SpecifiedClean(_positions);
//
// Extract Types ...
@@ -2720,7 +2720,7 @@ struct XSymbolPositions
_supports,
supports //
);
Clean(_supports);
SpecifiedClean(_supports);
//
// Extract Types ...
@@ -2779,7 +2779,7 @@ struct XSymbolPositions
);
//
Clean(_allPositions);
SpecifiedClean(_allPositions);
//
result = true;
@@ -2813,9 +2813,9 @@ struct XSymbolPositions
requiredProfitForHedge = 0;
//
Clean(longs);
Clean(shorts);
Clean(positions);
SpecifiedClean(longs);
SpecifiedClean(shorts);
SpecifiedClean(positions);
//
ZeroMemory(this);
@@ -2829,7 +2829,7 @@ struct XSymbolPositions
bool result = false;
//
result = IsValid(symbol);
result = IsSpecifiedValid(symbol);
//
return result;
@@ -2920,7 +2920,7 @@ struct XSymbolPositions
if (isLong)
{
//
result = GetOldest(
result = GetXOldest(
_oldest,
longs //
);
@@ -2928,7 +2928,7 @@ struct XSymbolPositions
else
{
//
result = GetOldest(
result = GetXOldest(
_oldest,
shorts //
);
@@ -2964,7 +2964,7 @@ struct XSymbolPositions
if (isLong)
{
//
result = GetYoungest(
result = GetXYoungest(
_youngest,
longs //
);
@@ -2972,7 +2972,7 @@ struct XSymbolPositions
else
{
//
result = GetYoungest(
result = GetXYoungest(
_youngest,
shorts //
);
@@ -3284,6 +3284,13 @@ int GetAge(
//
return result;
}
int GetXAge(
XSignal &signal, // Selected Signal ...
ENUM_TIMEFRAMES period = NULL // Dest Time Frame ...
)
{
return GetAge(signal, period);
}
//
// Retrieve a Position Age ...
@@ -3310,6 +3317,13 @@ int GetAge(
//
return result;
}
int GetXAge(
XPosition &position, // Selected Position ...
ENUM_TIMEFRAMES period = NULL // Dest Time Frame ...
)
{
return GetAge(position, period);
}
//
// Retrieve an Order Age ...
@@ -3336,6 +3350,13 @@ int GetAge(
//
return result;
}
int GetXAge(
XOrder &order, // Selected Order ...
ENUM_TIMEFRAMES period = NULL // Dest Time Frame ...
)
{
return GetAge(order, period);
}
//
// Retrieve a Deal Age ...
@@ -3362,6 +3383,13 @@ int GetAge(
//
return result;
}
int GetXAge(
XDeal &deal, // Selected Deal ...
ENUM_TIMEFRAMES period = NULL // Dest Time Frame ...
)
{
return GetAge(deal, period);
}
//
// Get Oldest Deal ...
@@ -3410,6 +3438,13 @@ int GetOldest(
//
return result;
}
int GetXOldest(
XDeal &item, // Hold Result ...
XDeal &items[] // Source Array ...
)
{
return GetOldest(item, items);
}
//
// Get Youngest Deal ...
@@ -3458,6 +3493,13 @@ int GetYoungest(
//
return result;
}
int GetXYoungest(
XDeal &item, // Hold Result ...
XDeal &items[] // Source Array ...
)
{
return GetYoungest(item, items);
}
//
// Get Oldest Order ...
@@ -3506,6 +3548,13 @@ int GetOldest(
//
return result;
}
int GetXOldest(
XOrder &item, // Hold Result ...
XOrder &items[] // Source Array ...
)
{
return GetOldest(item, items);
}
//
// Get Youngest Order ...
@@ -3554,6 +3603,13 @@ int GetYoungest(
//
return result;
}
int GetXYoungest(
XOrder &item, // Hold Result ...
XOrder &items[] // Source Array ...
)
{
return GetYoungest(item, items);
}
//
// Get Oldes Position ...
@@ -3602,6 +3658,13 @@ int GetOldest(
//
return result;
}
int GetXOldest(
XPosition &item, // Hold Result ...
XPosition &items[] // Source Array ...
)
{
return GetOldest(item, items);
}
//
// Get Youngest Position ...
@@ -3650,6 +3713,13 @@ int GetYoungest(
//
return result;
}
int GetXYoungest(
XPosition &item, // Hold Result ...
XPosition &items[] // Source Array ...
)
{
return GetYoungest(item, items);
}
//
int FindMaxProfitIndex(
@@ -4481,7 +4551,7 @@ ENUM_ORDER_TYPE ToOrderType(ENUM_X_POSITION_TYPES value)
string GeneratePeriodTag(ENUM_TIMEFRAMES period)
{
//
string strPeriod = ToString(period);
string strPeriod = ToXString(period);
return Surround(
XPeriodToken,
strPeriod