Skip to content

Commit

Permalink
Updated functions
Browse files Browse the repository at this point in the history
  • Loading branch information
mccaffers committed Feb 15, 2024
1 parent 1171eb7 commit df6ca3d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/Interfaces/IRequestOpenTrade.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ namespace backtesting_engine.interfaces;

public interface IRequestOpenTrade
{
Task Request(RequestObject reqObj);
Task<bool> Request(RequestObject reqObj);
}
18 changes: 9 additions & 9 deletions src/Models/IEnvironmentVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ public interface IEnvironmentVariables
string strategy { get; init; }
string runID { get; init; }
string symbolFolder { get; init; }
string stopDistanceInPips { get; init; }
string limitDistanceInPips { get; init; }
string stopDistanceInPips { get; set; }
string limitDistanceInPips { get; set; }
string elasticPassword { get; init; }
string elasticUser { get; init; }
string elasticCloudID { get; init; }
Expand All @@ -19,9 +19,9 @@ public interface IEnvironmentVariables
string s3Path { get; init; }
string hostname { get; init; }
string runIteration { get; init; }
string scalingFactor { get; init; }
string scalingFactor { get; set; }
string tickDataFolder { get; init; }
string tradingSize { get; init; }
string tradingSize { get; set; }
int instanceCount { get; init;}
bool reportingEnabled { get; init; }
string[] symbols { get; init; }
Expand All @@ -33,11 +33,11 @@ public interface IEnvironmentVariables
bool doNotCleanUpDataFolder {get;init;}
bool fasterProcessingBySkippingSomeTickData {get;init;}

decimal? variableA {get;init;}
decimal? variableB {get;init;}
decimal? variableC {get;init;}
decimal? variableD {get;init;}
decimal? variableE {get;init;}
decimal? variableA {get;set;}
decimal? variableB {get;set;}
decimal? variableC {get;set;}
decimal? variableD {get;set;}
decimal? variableE {get;set;}

Dictionary<string, decimal> getScalingFactorDictionary();
decimal GetScalingFactor(string symbol);
Expand Down
4 changes: 2 additions & 2 deletions src/backtesting/Operations/RequestOpenTrade.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public RequestOpenTrade(IOpenOrder openOrder)
this.openOrder = openOrder;
}

public Task Request(RequestObject reqObj)
public Task<bool> Request(RequestObject reqObj)
{

// Open trade validation
Expand All @@ -24,7 +24,7 @@ public Task Request(RequestObject reqObj)

this.openOrder.Request(reqObj);

return Task.CompletedTask;
return Task.FromResult(true);
}

}
22 changes: 11 additions & 11 deletions src/utilities/EnvironmentVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

namespace Utilities;

public class EnvironmentVariables : IEnvironmentVariables
{
public class EnvironmentVariables : IEnvironmentVariables {
// Enables the override of the constructor
public virtual bool loadFromEnvironmnet { get; } = true;

Expand Down Expand Up @@ -85,8 +85,8 @@ public static string Get(string envName, bool optional = false)
public virtual string strategy { get; init; } = string.Empty;
public virtual string runID { get; init; } = string.Empty;
public virtual string symbolFolder { get; init; } = string.Empty;
public virtual string stopDistanceInPips { get; init; } = string.Empty;
public virtual string limitDistanceInPips { get; init; } = string.Empty;
public virtual string stopDistanceInPips { get; set; } = string.Empty;
public virtual string limitDistanceInPips { get; set; } = string.Empty;
public virtual string elasticPassword { get; init; } = string.Empty;
public virtual string elasticUser { get; init; } = string.Empty;
public virtual string elasticCloudID { get; init; } = string.Empty;
Expand All @@ -96,19 +96,19 @@ public static string Get(string envName, bool optional = false)
public virtual string s3Path { get; init; } = string.Empty;
public virtual string hostname { get; init; } = string.Empty;
public virtual string runIteration { get; init; } = string.Empty;
public virtual string scalingFactor { get; init; } = string.Empty;
public virtual string tradingSize { get; init; } = string.Empty;
public virtual string scalingFactor { get; set; } = string.Empty;
public virtual string tradingSize { get; set; } = string.Empty;
public virtual int yearsStart { get;init ; }
public virtual int yearsEnd { get; init; }
public virtual bool doNotCleanUpDataFolder {get;init;}
public virtual int kineticStopLoss {get;init;}
public virtual int kineticLimit {get;init;}

public virtual decimal? variableA {get; init;}
public virtual decimal? variableB {get; init;}
public virtual decimal? variableC {get; init;}
public virtual decimal? variableD {get; init;}
public virtual decimal? variableE {get; init;}
public virtual decimal? variableA {get; set;}
public virtual decimal? variableB {get; set;}
public virtual decimal? variableC {get; set;}
public virtual decimal? variableD {get; set;}
public virtual decimal? variableE {get; set;}

// Custom environment variables
public virtual string tickDataFolder { get; init; } = string.Empty;
Expand Down

0 comments on commit df6ca3d

Please sign in to comment.