revert: remove ineffective borrowed factor key optimization
This commit is contained in:
@@ -13,7 +13,7 @@ use crate::data::EligibleUniverseSnapshot;
|
||||
use crate::data::{
|
||||
BACKWARD_ADJUSTMENT_FACTOR_FIELD, CandidateEligibility, DailyFactorSnapshot,
|
||||
DailyMarketSnapshot, DailySnapshotView, DataSet, PriceField, decision_free_float_cap_bn,
|
||||
NumericFactorMap, decision_market_cap_bn,
|
||||
decision_market_cap_bn,
|
||||
};
|
||||
use crate::engine::BacktestError;
|
||||
use crate::events::OrderSide;
|
||||
@@ -954,7 +954,7 @@ struct StockExpressionState {
|
||||
stock_volume_ma60: f64,
|
||||
stock_volume_ma100: f64,
|
||||
current_series_end: Option<usize>,
|
||||
extra_factors: NumericFactorMap,
|
||||
extra_factors: BTreeMap<String, f64>,
|
||||
extra_text_factors: BTreeMap<String, String>,
|
||||
}
|
||||
|
||||
@@ -4767,7 +4767,7 @@ impl PlatformExprStrategy {
|
||||
self.stock_extra_factor_map_required
|
||||
|| self.stock_extra_factor_identifiers.contains(field.as_ref())
|
||||
})
|
||||
.map(|(field, value)| (field.clone(), *value))
|
||||
.map(|(field, value)| (field.to_string(), *value))
|
||||
.collect()
|
||||
} else {
|
||||
BTreeMap::new()
|
||||
@@ -4785,7 +4785,7 @@ impl PlatformExprStrategy {
|
||||
.and_then(|row| row.extra_factors.get(field.as_str()))
|
||||
.copied()
|
||||
.unwrap_or(f64::NAN);
|
||||
extra_factors.insert(field.clone().into(), value);
|
||||
extra_factors.insert(field.clone(), value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4796,10 +4796,7 @@ impl PlatformExprStrategy {
|
||||
.contains(BACKWARD_ADJUSTMENT_FACTOR_FIELD))
|
||||
&& let Some(value) = factor.adjustment_factor_backward1
|
||||
{
|
||||
extra_factors.insert(
|
||||
std::borrow::Cow::Borrowed(BACKWARD_ADJUSTMENT_FACTOR_FIELD),
|
||||
value,
|
||||
);
|
||||
extra_factors.insert(BACKWARD_ADJUSTMENT_FACTOR_FIELD.to_string(), value);
|
||||
}
|
||||
|
||||
let state = StockExpressionState {
|
||||
|
||||
Reference in New Issue
Block a user