Removed max positions
This commit is contained in:
@@ -65,6 +65,5 @@ pub struct EngineConfig {
|
|||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
|
|
||||||
pub risk_per_trade: String,
|
pub risk_per_trade: String,
|
||||||
pub max_open_positions: u32,
|
|
||||||
pub max_daily_loss: String,
|
pub max_daily_loss: String,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ impl Engine {
|
|||||||
|
|
||||||
risk_per_trade: config.risk.risk_per_trade.to_string(),
|
risk_per_trade: config.risk.risk_per_trade.to_string(),
|
||||||
max_daily_loss: config.risk.max_daily_loss.to_string(),
|
max_daily_loss: config.risk.max_daily_loss.to_string(),
|
||||||
max_open_positions: config.risk.max_open_positions,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ use crate::{engine::Engine, store::config::RiskConfig};
|
|||||||
pub struct RiskState {
|
pub struct RiskState {
|
||||||
pub starting_equity: Decimal,
|
pub starting_equity: Decimal,
|
||||||
pub pnl: Decimal,
|
pub pnl: Decimal,
|
||||||
pub open_positions: usize,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct RiskEngine {
|
pub struct RiskEngine {
|
||||||
@@ -35,7 +34,6 @@ impl RiskEngine {
|
|||||||
state: Mutex::new(RiskState {
|
state: Mutex::new(RiskState {
|
||||||
starting_equity: 0.into(),
|
starting_equity: 0.into(),
|
||||||
pnl: 0.into(),
|
pnl: 0.into(),
|
||||||
open_positions: 0,
|
|
||||||
}),
|
}),
|
||||||
engine,
|
engine,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ use std::collections::HashMap;
|
|||||||
pub struct RiskConfig {
|
pub struct RiskConfig {
|
||||||
pub size_per_trade: Allocation,
|
pub size_per_trade: Allocation,
|
||||||
pub risk_per_trade: Allocation,
|
pub risk_per_trade: Allocation,
|
||||||
pub max_open_positions: u32,
|
|
||||||
pub max_daily_loss: Allocation,
|
pub max_daily_loss: Allocation,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,7 +31,6 @@ impl Default for RiskConfig {
|
|||||||
size_per_trade: Allocation::Percent(20.into()),
|
size_per_trade: Allocation::Percent(20.into()),
|
||||||
risk_per_trade: Allocation::Percent(10.into()),
|
risk_per_trade: Allocation::Percent(10.into()),
|
||||||
max_daily_loss: Allocation::Percent(20.into()),
|
max_daily_loss: Allocation::Percent(20.into()),
|
||||||
max_open_positions: 1,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -229,14 +229,10 @@ impl Formatted for EngineConfig {
|
|||||||
Triple("", "", ""),
|
Triple("", "", ""),
|
||||||
Triple(
|
Triple(
|
||||||
"\x1b[2mRisk/Trade\x1b[0m",
|
"\x1b[2mRisk/Trade\x1b[0m",
|
||||||
"\x1b[2mMax Positions\x1b[0m",
|
"\x1b[2m..\x1b[0m",
|
||||||
"\x1b[2mMax daily loss\x1b[0m",
|
"\x1b[2mMax daily loss\x1b[0m",
|
||||||
),
|
),
|
||||||
Triple(
|
Triple(&self.risk_per_trade, "..", &self.max_daily_loss),
|
||||||
&self.risk_per_trade,
|
|
||||||
&self.max_open_positions.to_string(),
|
|
||||||
&self.max_daily_loss,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
.get_formatted()
|
.get_formatted()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user