Skip to content

Commit 97d84df

Browse files
authored
Merge branch 'QuantConnect:master' into feature-7135-trailing-stop-limit-order
2 parents b448c20 + 085476a commit 97d84df

File tree

188 files changed

+8470
-1287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+8470
-1287
lines changed

Algorithm.CSharp/AddFutureContractWithContinuousRegressionAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public override void OnSecuritiesChanged(SecurityChanges changes)
115115
/// <summary>
116116
/// Data Points count of all timeslices of algorithm
117117
/// </summary>
118-
public long DataPoints => 73;
118+
public long DataPoints => 76;
119119

120120
/// <summary>
121121
/// Data Points count of the algorithm history

Algorithm.CSharp/AddFutureOptionContractDataStreamingRegressionAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public override void OnEndOfAlgorithm()
164164
/// <summary>
165165
/// Data Points count of all timeslices of algorithm
166166
/// </summary>
167-
public long DataPoints => 311879;
167+
public long DataPoints => 311881;
168168

169169
/// <summary>
170170
/// Data Points count of the algorithm history

Algorithm.CSharp/AddFutureOptionContractFromFutureChainRegressionAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public override void OnData(Slice slice)
9393
/// <summary>
9494
/// Data Points count of all timeslices of algorithm
9595
/// </summary>
96-
public long DataPoints => 12169;
96+
public long DataPoints => 12172;
9797

9898
/// <summary>
9999
/// Data Points count of the algorithm history

Algorithm.CSharp/AddFutureOptionSingleOptionChainSelectedInUniverseFilterRegressionAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public override void OnEndOfAlgorithm()
220220
/// <summary>
221221
/// Data Points count of all timeslices of algorithm
222222
/// </summary>
223-
public long DataPoints => 608377;
223+
public long DataPoints => 608380;
224224

225225
/// <summary>
226226
/// Data Points count of the algorithm history

Algorithm.CSharp/AddOptionContractFromUniverseRegressionAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public override void OnSecuritiesChanged(SecurityChanges changes)
117117
&& optionContract.ID.OptionStyle == OptionStyle.American);
118118
AddOptionContract(option);
119119

120-
foreach (var symbol in new[] { option.Symbol, option.Underlying.Symbol })
120+
foreach (var symbol in new[] { option.Symbol, option.UnderlyingSymbol })
121121
{
122122
var config = SubscriptionManager.SubscriptionDataConfigService.GetSubscriptionDataConfigs(symbol).ToList();
123123

Algorithm.CSharp/BasicTemplateContinuousFutureAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public override void OnSecuritiesChanged(SecurityChanges changes)
118118
/// <summary>
119119
/// Data Points count of all timeslices of algorithm
120120
/// </summary>
121-
public long DataPoints => 713369;
121+
public long DataPoints => 713371;
122122

123123
/// <summary>
124124
/// Data Points count of the algorithm history

Algorithm.CSharp/BasicTemplateContinuousFutureWithExtendedMarketAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public override void OnSecuritiesChanged(SecurityChanges changes)
123123
/// <summary>
124124
/// Data Points count of all timeslices of algorithm
125125
/// </summary>
126-
public long DataPoints => 2217299;
126+
public long DataPoints => 2217326;
127127

128128
/// <summary>
129129
/// Data Points count of the algorithm history

Algorithm.CSharp/BasicTemplateFutureRolloverAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void Dispose()
176176
/// <summary>
177177
/// Data Points count of all timeslices of algorithm
178178
/// </summary>
179-
public long DataPoints => 1190;
179+
public long DataPoints => 1199;
180180

181181
/// <summary>
182182
/// Data Points count of the algorithm history

Algorithm.CSharp/BasicTemplateFuturesDailyAlgorithm.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ select futuresContract
117117
/// <summary>
118118
/// Data Points count of all timeslices of algorithm
119119
/// </summary>
120-
public virtual long DataPoints => 12452;
120+
public virtual long DataPoints => 12453;
121121

122122
/// <summary>
123123
/// Data Points count of the algorithm history
@@ -134,33 +134,33 @@ select futuresContract
134134
/// </summary>
135135
public virtual Dictionary<string, string> ExpectedStatistics => new Dictionary<string, string>
136136
{
137-
{"Total Orders", "32"},
137+
{"Total Orders", "34"},
138138
{"Average Win", "0.33%"},
139139
{"Average Loss", "-0.04%"},
140-
{"Compounding Annual Return", "0.110%"},
140+
{"Compounding Annual Return", "0.106%"},
141141
{"Drawdown", "0.300%"},
142-
{"Expectancy", "0.184"},
142+
{"Expectancy", "0.178"},
143143
{"Start Equity", "1000000"},
144-
{"End Equity", "1001108"},
145-
{"Net Profit", "0.111%"},
146-
{"Sharpe Ratio", "-1.688"},
147-
{"Sortino Ratio", "-0.772"},
148-
{"Probabilistic Sharpe Ratio", "14.944%"},
144+
{"End Equity", "1001066.2"},
145+
{"Net Profit", "0.107%"},
146+
{"Sharpe Ratio", "-1.695"},
147+
{"Sortino Ratio", "-0.804"},
148+
{"Probabilistic Sharpe Ratio", "14.797%"},
149149
{"Loss Rate", "88%"},
150150
{"Win Rate", "12%"},
151-
{"Profit-Loss Ratio", "8.47"},
151+
{"Profit-Loss Ratio", "9.01"},
152152
{"Alpha", "-0.007"},
153153
{"Beta", "0.002"},
154154
{"Annual Standard Deviation", "0.004"},
155155
{"Annual Variance", "0"},
156156
{"Information Ratio", "-1.353"},
157157
{"Tracking Error", "0.089"},
158-
{"Treynor Ratio", "-4.099"},
159-
{"Total Fees", "$72.00"},
158+
{"Treynor Ratio", "-4.112"},
159+
{"Total Fees", "$76.30"},
160160
{"Estimated Strategy Capacity", "$0"},
161161
{"Lowest Capacity Asset", "ES VRJST036ZY0X"},
162-
{"Portfolio Turnover", "0.87%"},
163-
{"OrderListHash", "168731c8f3a19f230cc1410818b3b573"}
162+
{"Portfolio Turnover", "0.92%"},
163+
{"OrderListHash", "7afa589d648c3f24253cd59156a2014e"}
164164
};
165165
}
166166
}

Algorithm.CSharp/BasicTemplateFuturesFrameworkWithExtendedMarketAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class BasicTemplateFuturesFrameworkWithExtendedMarketAlgorithm : BasicTem
4141
/// <summary>
4242
/// Data Points count of all timeslices of algorithm
4343
/// </summary>
44-
public override long DataPoints => 163415;
44+
public override long DataPoints => 163416;
4545

4646
/// <summary>
4747
/// This is used by the regression test system to indicate what the expected statistics are from running the algorithm

0 commit comments

Comments
 (0)