Skip to content

Commit 5b9aa5b

Browse files
committed
Minor fixes
1 parent d3fa8d8 commit 5b9aa5b

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

Algorithm.CSharp/DelayedSettlementAfterManualSecurityRemovalAlgorithm.cs

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ public override void OnEndOfAlgorithm()
8989
{
9090
throw new Exception($"Expected no unsettled cash at end of algorithm, found {Portfolio.UnsettledCash}");
9191
}
92-
93-
if (Securities.ContainsKey(_optionSymbol))
94-
{
95-
throw new Exception($"Expected the option contract {_optionSymbol} to haven been removed from the securities at end of algorithm");
96-
}
9792
}
9893

9994
/// <summary>
@@ -109,7 +104,7 @@ public override void OnEndOfAlgorithm()
109104
/// <summary>
110105
/// Data Points count of all timeslices of algorithm
111106
/// </summary>
112-
public long DataPoints => 3943;
107+
public long DataPoints => 7122;
113108

114109
/// <summary>
115110
/// Data Points count of the algorithm history
@@ -121,31 +116,31 @@ public override void OnEndOfAlgorithm()
121116
/// </summary>
122117
public Dictionary<string, string> ExpectedStatistics => new Dictionary<string, string>
123118
{
124-
{"Total Trades", "1"},
119+
{"Total Trades", "2"},
125120
{"Average Win", "0%"},
126-
{"Average Loss", "0%"},
127-
{"Compounding Annual Return", "271.453%"},
128-
{"Drawdown", "2.200%"},
129-
{"Expectancy", "0"},
130-
{"Net Profit", "1.692%"},
131-
{"Sharpe Ratio", "8.854"},
121+
{"Average Loss", "-0.36%"},
122+
{"Compounding Annual Return", "-15.857%"},
123+
{"Drawdown", "0.400%"},
124+
{"Expectancy", "-1"},
125+
{"Net Profit", "-0.362%"},
126+
{"Sharpe Ratio", "0"},
132127
{"Sortino Ratio", "0"},
133-
{"Probabilistic Sharpe Ratio", "67.609%"},
134-
{"Loss Rate", "0%"},
128+
{"Probabilistic Sharpe Ratio", "0%"},
129+
{"Loss Rate", "100%"},
135130
{"Win Rate", "0%"},
136131
{"Profit-Loss Ratio", "0"},
137-
{"Alpha", "-0.005"},
138-
{"Beta", "0.996"},
139-
{"Annual Standard Deviation", "0.222"},
140-
{"Annual Variance", "0.049"},
141-
{"Information Ratio", "-14.565"},
142-
{"Tracking Error", "0.001"},
143-
{"Treynor Ratio", "1.97"},
144-
{"Total Fees", "$3.44"},
145-
{"Estimated Strategy Capacity", "$56000000.00"},
146-
{"Lowest Capacity Asset", "SPY R735QTJ8XC9X"},
147-
{"Portfolio Turnover", "19.93%"},
148-
{"OrderListHash", "0c0f9328786b0c9e8f88d271673d16c3"}
132+
{"Alpha", "0"},
133+
{"Beta", "0"},
134+
{"Annual Standard Deviation", "0"},
135+
{"Annual Variance", "0"},
136+
{"Information Ratio", "2.537"},
137+
{"Tracking Error", "0.104"},
138+
{"Treynor Ratio", "0"},
139+
{"Total Fees", "$2.00"},
140+
{"Estimated Strategy Capacity", "$150000.00"},
141+
{"Lowest Capacity Asset", "GOOCV WRCOZDXBITL2|GOOCV VP83T1ZUHROL"},
142+
{"Portfolio Turnover", "1.06%"},
143+
{"OrderListHash", "490dd9430dec6cb3daadcca495ff5f12"}
149144
};
150145
}
151146
}

Algorithm.Python/CustomSettlementModelRegressionAlgorithm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ def Scan(self, parameters):
5151
if parameters.UtcTime == datetime(2013, 10, 6):
5252
parameters.Portfolio.CashBook[self.currency].AddAmount(-self.amount)
5353

54+
def HasUnsettledFunds(self):
55+
return False
56+
5457
class CustomBrokerageModelWithCustomSettlementModel(CustomBrokerageModel):
5558
def GetSettlementModel(self, security):
5659
return CustomSettlementModel()

0 commit comments

Comments
 (0)