Skip to content

Commit 41af1af

Browse files
MDUYNMDUYN
committed
Fix result columns style
1 parent 0855605 commit 41af1af

17 files changed

+50
-34
lines changed

‎pyindicators/indicators/adx.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ def adx(
1212
high_column="High",
1313
low_column="Low",
1414
close_column="Close",
15-
result_adx_column="ADX",
16-
result_pdi_column="+DI",
17-
result_ndi_column="-DI",
15+
result_adx_column="adx",
16+
result_pdi_column="+di",
17+
result_ndi_column="-di",
1818
) -> Union[pd.DataFrame, pl.DataFrame]:
1919
"""
2020
Calculate the Average Directional Index (ADX) for a given DataFrame.

‎pyindicators/indicators/exponential_moving_average.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def ema(
3434
)
3535

3636
if result_column is None:
37-
result_column = f"EMA_{source_column}_{period}"
37+
result_column = f"ema_{source_column}_{period}"
3838

3939
if isinstance(data, PdDataFrame):
4040
data[result_column] = data[source_column]\

‎pyindicators/indicators/macd.py

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,17 @@ def macd(
4848

4949
if isinstance(data, PdDataFrame):
5050
# Calculate the short-term and long-term EMAs
51-
data = ema(data, source_column, short_period, f"EMA_{short_period}")
52-
data = ema(data, source_column, long_period, f"EMA_{long_period}")
51+
data = ema(
52+
data, source_column, short_period, f"EMA_MACD_TEMP_{short_period}"
53+
)
54+
data = ema(
55+
data, source_column, long_period, f"EMA_MACD_TEMP_{long_period}"
56+
)
5357

5458
# Calculate the MACD line
5559
data[macd_column] = \
56-
data[f"EMA_{short_period}"] - data[f"EMA_{long_period}"]
60+
data[f"EMA_MACD_TEMP_{short_period}"] \
61+
- data[f"EMA_MACD_TEMP_{long_period}"]
5762

5863
# Calculate the Signal Line
5964
data = ema(data, macd_column, signal_period, signal_column)
@@ -62,7 +67,12 @@ def macd(
6267
data[histogram_column] = data[macd_column] - data[signal_column]
6368

6469
# Delete the temporary EMA columns
65-
data = data.drop(columns=[f"EMA_{short_period}", f"EMA_{long_period}"])
70+
data = data.drop(
71+
columns=[
72+
f"EMA_MACD_TEMP_{short_period}",
73+
f"EMA_MACD_TEMP_{long_period}"
74+
]
75+
)
6676
return data
6777
elif isinstance(data, pl.DataFrame):
6878
# Polars implementation
@@ -71,19 +81,22 @@ def macd(
7181
data,
7282
source_column,
7383
short_period,
74-
f"EMA_{short_period}"
75-
)[f"EMA_{short_period}"],
84+
f"EMA_MACD_TEMP_{short_period}"
85+
)[f"EMA_MACD_TEMP_{short_period}"],
7686
ema(
7787
data,
7888
source_column,
7989
long_period,
80-
f"EMA_{long_period}"
81-
)[f"EMA_{long_period}"]
90+
f"EMA_MACD_TEMP_{long_period}"
91+
)[f"EMA_MACD_TEMP_{long_period}"]
8292
])
8393

8494
data = data.with_columns(
8595
(
86-
pl.col(f"EMA_{short_period}") - pl.col(f"EMA_{long_period}")
96+
pl.col(
97+
f"EMA_MACD_TEMP_{short_period}")
98+
- pl.col(f"EMA_MACD_TEMP_{long_period}"
99+
)
87100
).alias(macd_column)
88101
)
89102

@@ -98,7 +111,12 @@ def macd(
98111
)
99112

100113
# Delete the temporary EMA columns
101-
data = data.drop([f"EMA_{short_period}", f"EMA_{long_period}"])
114+
data = data.drop(
115+
[
116+
f"EMA_MACD_TEMP_{short_period}",
117+
f"EMA_MACD_TEMP_{long_period}"
118+
]
119+
)
102120
return data
103121
else:
104122
raise PyIndicatorException(

‎pyindicators/indicators/rsi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def rsi(
2626
"""
2727

2828
if result_column is None:
29-
result_column = f"RSI_{period}"
29+
result_column = f"rsi_{period}"
3030

3131
if isinstance(data, pd.DataFrame):
3232
# Compute price changes
@@ -98,7 +98,7 @@ def wilders_rsi(
9898
"""
9999

100100
if result_column is None:
101-
result_column = f"RSI_{period}"
101+
result_column = f"rsi_{period}"
102102

103103
if isinstance(data, pd.DataFrame):
104104
delta = data[source_column].diff()

‎pyindicators/indicators/simple_moving_average.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def sma(
3333
)
3434

3535
if result_column is None:
36-
result_column = f"SMA_{source_column}_{period}"
36+
result_column = f"sma_{source_column}_{period}"
3737

3838
if isinstance(data, PdDataFrame):
3939
data[result_column] = data[source_column].rolling(window=period).mean()

‎pyindicators/indicators/weighted_moving_average.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def wma(
3636
f"only contains {len(data)} data points."
3737
)
3838
if result_column is None:
39-
result_column = f"WMA_{period}"
39+
result_column = f"wma_{period}"
4040

4141
weights = np.arange(1, period + 1)
4242

‎pyindicators/indicators/williams_percent_range.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
def willr(
88
data: Union[pd.DataFrame, pl.DataFrame],
99
period: int = 14,
10-
result_column: str = "WILLR",
10+
result_column: str = "willr",
1111
high_column: str = "High",
1212
low_column: str = "Low",
1313
close_column: str = "Close"

‎tests/indicators/test_ema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def generate_pandas_df(self, polars_source_df):
1515
polars_source_df = ema(
1616
data=polars_source_df,
1717
period=200,
18-
result_column="EMA_200",
18+
result_column="ema_200",
1919
source_column="Close"
2020
)
2121
return polars_source_df
@@ -24,7 +24,7 @@ def generate_polars_df(self, pandas_source_df):
2424
pandas_source_df = ema(
2525
data=pandas_source_df,
2626
period=200,
27-
result_column="EMA_200",
27+
result_column="ema_200",
2828
source_column="Close"
2929
)
3030
return pandas_source_df

‎tests/indicators/test_rsi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def generate_pandas_df(self, polars_source_df):
1515
polars_source_df = rsi(
1616
data=polars_source_df,
1717
period=14,
18-
result_column="RSI_14",
18+
result_column="rsi_14",
1919
source_column="Close"
2020
)
2121
return polars_source_df
@@ -24,7 +24,7 @@ def generate_polars_df(self, pandas_source_df):
2424
pandas_source_df = rsi(
2525
data=pandas_source_df,
2626
period=14,
27-
result_column="RSI_14",
27+
result_column="rsi_14",
2828
source_column="Close"
2929
)
3030
return pandas_source_df

‎tests/indicators/test_wilders_rsi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def generate_pandas_df(self, polars_source_df):
1515
polars_source_df = wilders_rsi(
1616
data=polars_source_df,
1717
period=14,
18-
result_column="RSI_14",
18+
result_column="rsi_14",
1919
source_column="Close"
2020
)
2121
return polars_source_df
@@ -24,7 +24,7 @@ def generate_polars_df(self, pandas_source_df):
2424
pandas_source_df = wilders_rsi(
2525
data=pandas_source_df,
2626
period=14,
27-
result_column="RSI_14",
27+
result_column="rsi_14",
2828
source_column="Close"
2929
)
3030
return pandas_source_df

‎tests/indicators/test_wma.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ def generate_pandas_df(self, polars_source_df):
1515
polars_source_df = wma(
1616
data=polars_source_df,
1717
period=200,
18-
result_column="WMA_200",
1918
source_column="Close"
2019
)
2120
return polars_source_df
@@ -24,7 +23,6 @@ def generate_polars_df(self, pandas_source_df):
2423
pandas_source_df = wma(
2524
data=pandas_source_df,
2625
period=200,
27-
result_column="WMA_200",
2826
source_column="Close"
2927
)
3028
return pandas_source_df
@@ -52,7 +50,7 @@ def test_comparison_polars(self):
5250
# Load the correct output in a polars dataframe
5351
correct_output_pl = pl.read_csv(
5452
self.get_correct_output_csv_path(),
55-
schema_overrides={"WMA_200": pl.Float64}
53+
schema_overrides={"wma_200": pl.Float64}
5654
)
5755

5856
# Load the source in a polars dataframe

‎tests/test_data/correct_test_data/EMA_200_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,EMA_200
1+
Open,High,Low,Close,Volume,Datetime,ema_200
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,34577.25
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,34577.09487562189
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,34577.27452860078

‎tests/test_data/correct_test_data/RSI_14_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,RSI_14
1+
Open,High,Low,Close,Volume,Datetime,rsi_14
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,

‎tests/test_data/correct_test_data/SMA_200_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,SMA_200
1+
Open,High,Low,Close,Volume,Datetime,sma_200
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,

‎tests/test_data/correct_test_data/WILDERS_RSI_14_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,RSI_14
1+
Open,High,Low,Close,Volume,Datetime,rsi_14
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,

‎tests/test_data/correct_test_data/WILLR_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,WILLR
1+
Open,High,Low,Close,Volume,Datetime,willr
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,0.0
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,0.0
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,0.0

‎tests/test_data/correct_test_data/WMA_200_BTC-EUR_BINANCE_15m_2023-12-01-00-00_2023-12-25-00-00.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open,High,Low,Close,Volume,Datetime,WMA_200
1+
Open,High,Low,Close,Volume,Datetime,wma_200
22
34663.82,34688.46,34577.25,34577.25,1.92881,2023-12-01 00:00:00+00:00,
33
34577.25,34579.51,34551.8,34561.66,0.83687,2023-12-01 00:15:00+00:00,
44
34563.31,34602.65,34549.51,34595.15,2.8434,2023-12-01 00:30:00+00:00,

0 commit comments

Comments
 (0)