Skip to content

Commit

Permalink
Updating naming of variables for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
bvsam committed Sep 2, 2023
1 parent 1e027c8 commit c73b212
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.venv
.vscode
local/
notes.txt
__pycache__
46 changes: 27 additions & 19 deletions src/app/src/components/PerformanceChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ type PerformanceChartProps = {
darkMode?: boolean;
};

const defaultStratAccessors = {
const defaultStrategyAccessors = {
xAccessor: (d: performanceDataType) => d.date,
yAccessor: (d: performanceDataType) => d.changeTotal,
};

const tradingStratAccessors = {
const tradingStrategyAccessors = {
xAccessor: (d: performanceDataType) => d.date,
yAccessor: (d: performanceDataType) => d.impliedTotal,
};
Expand Down Expand Up @@ -107,12 +107,12 @@ export default function PerformanceChart({
<AnimatedLineSeries
dataKey={ticker}
data={perfData}
{...defaultStratAccessors}
{...defaultStrategyAccessors}
/>
<AnimatedLineSeries
dataKey="LSTM Bot"
data={perfData}
{...tradingStratAccessors}
{...tradingStrategyAccessors}
/>

{/* Tooltip */}
Expand All @@ -124,28 +124,28 @@ export default function PerformanceChart({
return null;
}

const date = defaultStratAccessors.xAccessor(
const date = defaultStrategyAccessors.xAccessor(
tooltipData.nearestDatum.datum
);

const tradingStratReturn = round(
tradingStratAccessors.yAccessor(
const tradingStrategyReturn = round(
tradingStrategyAccessors.yAccessor(
tooltipData.datumByKey["LSTM Bot"].datum
),
roundingDigits
);
const tradingStratChange = round(
const tradingStrategyChange = round(
tooltipData.datumByKey["LSTM Bot"].datum.change,
roundingDigits
);

const defaultStratReturn = round(
defaultStratAccessors.yAccessor(
const defaultStrategyReturn = round(
defaultStrategyAccessors.yAccessor(
tooltipData.datumByKey[ticker].datum
),
roundingDigits
);
const defaultStratChange = round(
const defaultStrategyChange = round(
tooltipData.datumByKey[ticker].datum.implied,
roundingDigits
);
Expand All @@ -159,11 +159,15 @@ export default function PerformanceChart({
}}
>
{ticker}:{" "}
<span style={colouredReturnValue(defaultStratReturn)}>
{defaultStratReturn}%
<span
style={colouredReturnValue(defaultStrategyReturn)}
>
{defaultStrategyReturn}%
</span>{" "}
<span style={colouredReturnValue(tradingStratChange)}>
({tradingStratChange}%)
<span
style={colouredReturnValue(tradingStrategyChange)}
>
({tradingStrategyChange}%)
</span>
</p>
<p
Expand All @@ -174,11 +178,15 @@ export default function PerformanceChart({
}}
>
LSTM Bot:{" "}
<span style={colouredReturnValue(tradingStratReturn)}>
{tradingStratReturn}%
<span
style={colouredReturnValue(tradingStrategyReturn)}
>
{tradingStrategyReturn}%
</span>{" "}
<span style={colouredReturnValue(defaultStratChange)}>
({defaultStratChange}%)
<span
style={colouredReturnValue(defaultStrategyChange)}
>
({defaultStrategyChange}%)
</span>
</p>
</div>
Expand Down

0 comments on commit c73b212

Please sign in to comment.