From 5e6aadc8341f911d90fa967afbf8df0d74ed24e2 Mon Sep 17 00:00:00 2001 From: djbadders <34887832+djbadders@users.noreply.github.com> Date: Tue, 16 Apr 2019 21:23:54 +0100 Subject: [PATCH] Revert "Make Trend sortable" This reverts commit cfa5e0f4af4e5f952ef2839be26e87831c8607e4. --- Monitor/Pages/BagAnalyzer.cshtml | 2 +- PTMagic/_presets/Default/DCA.PROPERTIES | 126 ++++++++------- .../_presets/Default/INDICATORS.PROPERTIES | 46 +++--- PTMagic/_presets/Default/PAIRS.PROPERTIES | 145 +++++++----------- .../ElDorado-V4-INDICATORS.properties | 78 ---------- .../ElDorado-V4-INDICATORS.properties | 78 ---------- 6 files changed, 135 insertions(+), 340 deletions(-) delete mode 100644 PTMagic/_presets/Sideways/ElDorado-V4-INDICATORS.properties delete mode 100644 PTMagic/_presets/SidewaysUp/ElDorado-V4-INDICATORS.properties diff --git a/Monitor/Pages/BagAnalyzer.cshtml b/Monitor/Pages/BagAnalyzer.cshtml index e2a3e3f..2bac085 100644 --- a/Monitor/Pages/BagAnalyzer.cshtml +++ b/Monitor/Pages/BagAnalyzer.cshtml @@ -28,7 +28,7 @@ Market - Trend + Trend Amount Value DCA diff --git a/PTMagic/_presets/Default/DCA.PROPERTIES b/PTMagic/_presets/Default/DCA.PROPERTIES index db11b4d..7fac35f 100644 --- a/PTMagic/_presets/Default/DCA.PROPERTIES +++ b/PTMagic/_presets/Default/DCA.PROPERTIES @@ -1,74 +1,68 @@ # #################################### # ####### PTMagic Current Setting ######## # PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 17/02/2019 18:11 +# PTMagic_LastChanged = 3/26/2018 11:52 AM # #################################### - -############################ -##### General Settings ##### -DEFAULT_DCA_ignore_sell_only_mode = true -SOM_DCA_buy_trigger = 0 -DEFAULT_DCA_enabled = true +# DCA_keep_balance = 0 DCA_keep_balance_percentage = 0 - -############################ -##### Selling Strategy ##### - -# Find the best price with enough volume -DCA_orderbook_profit_calculation = true -# Sell at this percentage always -DEFAULT_DCA_max_profit = 0 -DEFAULT_DCA_stop_loss_trigger = 0 -DEFAULT_DCA_pending_order_wait_time = 0 - -# Sell if stalled -DEFAULT_DCA_take_profit_percentage = 1.0 -DEFAULT_DCA_take_profit_reset_percentage_move = 0.1 -DEFAULT_DCA_take_profit_wait_time = 15 - -# Sell strat A -DEFAULT_DCA_A_sell_strategy = GAIN -DEFAULT_DCA_A_sell_value = 0.25 -DEFAULT_DCA_trailing_profit = 0.1 - -#DEFAULT_DCA_B_sell_strategy = STOCHRSI -#DEFAULT_DCA_B_sell_value = 0.9 - -######################## -##### Buy Strategy ##### -DEFAULT_DCA_buy_trigger = -2 -DEFAULT_DCA_buy_trigger_1 = -1 -DEFAULT_DCA_buy_trigger_2 = -1 -DEFAULT_DCA_buy_trigger_3 = -1 -DEFAULT_DCA_buy_trigger_4 = -1 -DEFAULT_DCA_buy_trigger_5 = -5 -DEFAULT_DCA_buy_trigger_6 = -5 - -DEFAULT_DCA_buy_percentage = 100 -DEFAULT_DCA_buy_percentage_1 = 100 -DEFAULT_DCA_buy_percentage_2 = 100 -DEFAULT_DCA_buy_percentage_3 = 100 -DEFAULT_DCA_buy_percentage_4 = 100 -DEFAULT_DCA_buy_percentage_5 = 100 -DEFAULT_DCA_buy_percentage_6 = 100 - -DEFAULT_DCA_min_buy_balance_percentage = 0 +# DEFAULT_DCA_max_cost = 0 -DEFAULT_DCA_max_buy_times = 5 -DEFAULT_DCA_rebuy_timeout = 0 +DEFAULT_DCA_max_buy_times = 20 +# +DEFAULT_DCA_A_buy_strategy = LOWBB +DEFAULT_DCA_A_buy_value = 5 +DEFAULT_DCA_A_buy_value_limit = -2.5 +# +DEFAULT_DCA_B_buy_strategy = RSI +DEFAULT_DCA_B_buy_value = 33 +DEFAULT_DCA_B_buy_value_limit = 5 +# DEFAULT_DCA_trailing_buy = 0 -DEFAULT_DCA_min_buy_volume = 0 -DEFAULT_DCA_max_buy_spread = 0 -DEFAULT_DCA_buy_min_change_percentage = 0 -DEFAULT_DCA_buy_max_change_percentage = 0 - -# Buy strat A -DEFAULT_DCA_A_buy_strategy = EMAGAIN -DEFAULT_DCA_A_buy_value = -0.2 -DEFAULT_DCA_A_buy_value_limit = 0 - -# Buy strat B -DEFAULT_DCA_B_buy_strategy = STOCHRSI -DEFAULT_DCA_B_buy_value = 0.2 -DEFAULT_DCA_B_buy_value_limit = 0 \ No newline at end of file +# +DEFAULT_DCA_buy_trigger = 0 +# +DEFAULT_DCA_buy_percentage_1 = 100 +DEFAULT_DCA_buy_percentage_2 = 50 +DEFAULT_DCA_buy_percentage_3 = 50 +DEFAULT_DCA_buy_percentage_4 = 25 +DEFAULT_DCA_buy_percentage_5 = 30 +DEFAULT_DCA_buy_percentage_6 = 25 +DEFAULT_DCA_buy_percentage_7 = 20 +DEFAULT_DCA_buy_percentage_8 = 15.5 +DEFAULT_DCA_buy_percentage_9 = 12.11 +DEFAULT_DCA_buy_percentage_10 = 10 +DEFAULT_DCA_buy_percentage_11 = 8 +DEFAULT_DCA_buy_percentage_12 = 7 +DEFAULT_DCA_buy_percentage_13 = 6 +DEFAULT_DCA_buy_percentage_14 = 6 +DEFAULT_DCA_buy_percentage_15 = 5 +DEFAULT_DCA_buy_percentage_16 = 5 +DEFAULT_DCA_buy_percentage_17 = 5 +DEFAULT_DCA_buy_percentage_18 = 5 +DEFAULT_DCA_buy_percentage_19 = 5 +DEFAULT_DCA_buy_percentage_20 = 5 +# +DEFAULT_DCA_A_sell_strategy = GAIN +DEFAULT_DCA_A_sell_value = 1 +# +DEFAULT_DCA_B_sell_strategy = RSI +DEFAULT_DCA_B_sell_value = 40 +# +DEFAULT_DCA_trailing_profit = 0.147 +DEFAULT_DCA_max_profit = 0 +# +DEFAULT_DCA_min_order_book_volume_percentage = 100 +# +DEFAULT_DCA_ignore_sell_only_mode = true +# +DEFAULT_DCA_max_buy_spread = 2 +DEFAULT_DCA_rebuy_timeout = 10 +# +DEFAULT_DCA_stop_loss_trigger = 0 +DEFAULT_DCA_stop_loss_timeout = 0 +DEFAULT_DCA_pending_order_wait_time = 0 +# +DEFAULT_DCA_buy_min_price_increase = 0 +DEFAULT_DCA_buy_max_price_increase = 0 +# \ No newline at end of file diff --git a/PTMagic/_presets/Default/INDICATORS.PROPERTIES b/PTMagic/_presets/Default/INDICATORS.PROPERTIES index 6054d72..a6ecba4 100644 --- a/PTMagic/_presets/Default/INDICATORS.PROPERTIES +++ b/PTMagic/_presets/Default/INDICATORS.PROPERTIES @@ -1,34 +1,30 @@ # #################################### # ####### PTMagic Current Setting ######## # PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 17/02/2019 18:11 +# PTMagic_LastChanged = 3/26/2018 11:52 AM # #################################### - -OBV_candle_period = 300 -OBV_length = 5 -OBV_signal = 1 - +# +BB_std = 2 +BB_candle_period = 300 +BB_length = 20 +# +SMA_cross_candles = 2 +SMA_candle_period = 300 +SMA_fast_length = 12 +SMA_slow_length = 24 +# +EMA_cross_candles = 3 +EMA_candle_period = 300 +EMA_fast_length = 3 +EMA_slow_length = 24 +# RSI_candle_period = 300 RSI_length = 14 +# STOCH_length = 14 - +# MACD_candle_period = 300 -MACD_fast_Length = 12 -MACD_slow_Length = 26 +MACD_fast_length = 12 +MACD_slow_length = 26 MACD_signal = 9 - -BB_std = 2 -BB_length = 20 -BB_candle_period = 300 - -SMA_cross_candles = 1 -SMA_candle_period = 300 -SMA_fast_length = 3 -SMA_slow_length = 13 - -EMA_cross_candles = 1 -EMA_candle_period = 300 -EMA_slow_length = 20 -EMA_fast_length = 5 - -SOM_trigger_length = 288 +# \ No newline at end of file diff --git a/PTMagic/_presets/Default/PAIRS.PROPERTIES b/PTMagic/_presets/Default/PAIRS.PROPERTIES index 38ca0c4..35670dc 100644 --- a/PTMagic/_presets/Default/PAIRS.PROPERTIES +++ b/PTMagic/_presets/Default/PAIRS.PROPERTIES @@ -1,106 +1,67 @@ # #################################### # ####### PTMagic Current Setting ######## # PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 17/02/2019 18:11 +# PTMagic_LastChanged = 23.05.2018 07:29 # #################################### -############################ -##### General Settings ##### -market = BTC -price_trigger_market = BTC -DEFAULT_sell_only_mode_enabled = false -DEFAULT_panic_sell_enabled = false -enabled_pairs = ALL -start_balance = 1.5 +# +market = USDT +# +start_balance = 1105.17429444 +USDT_dust = 3.50 +# +enabled_pairs = ADA, BCC, BTC, BTG, ETH, LTC, NEO, OMG, XMR, XRP, ZEC +hidden_pairs = ALL +# +max_trading_pairs = 5 +# keep_balance = 0 keep_balance_percentage = 0 - -max_trading_pairs = 14 -pair_min_listed_days = 0 -DEFAULT_DCA_enabled = -2.0 - -#DEFAULT_pending_order_wait_time = 2880 -DEFAULT_combined_cancel_pending_trigger = 0.1 - -#----- Protection ----- -#price_drop_trigger = 10 -#price_drop_recover_trigger = 8 - -#price_rise_trigger = 10 -#price_rise_recover_trigger = 8 - +# consecutive_buy_trigger = 0 consecutive_sell_trigger = 0 - -######################## -##### Buy Strategy ##### -DEFAULT_A_buy_strategy = EMAGAIN -DEFAULT_A_buy_value = -0.2 -DEFAULT_A_buy_value_limit = 0 - -DEFAULT_B_buy_strategy = STOCHRSI -DEFAULT_B_buy_value = 0.2 -DEFAULT_B_buy_value_limit = 0 - -DEFAULT_initial_cost = 0 -DEFAULT_initial_cost_percentage = 0.25 -DEFAULT_trailing_buy = 0 -DEFAULT_rebuy_timeout = 0 -DEFAULT_buy_min_change_percentage = 0 -DEFAULT_buy_max_change_percentage = 0 - -orderbook_profit_calculation = true -DEFAULT_min_orderbook_volume_percentage = 105 - -DEFAULT_trading_enabled = false -BNB_trading_enabled = true - -####################### -# Black list +# DEFAULT_trading_enabled = true -BNB_trading_enabled = false - -BCN_sell_only_mode_enabled = true -CHAT_sell_only_mode_enabled = true -ICN_sell_only_mode_enabled = true -ICX_sell_only_mode_enabled = true -NCASH_sell_only_mode_enabled = true -TRIG_sell_only_mode_enabled = true -XVG_sell_only_mode_enabled = true - -hidden_pairs = CTR -pair_min_listed_days = 7 - -############################ -##### Selling Strategy ##### -DEFAULT_trailing_profit = 0.1 +DEFAULT_sell_only_mode_enabled = true +# +pair_min_listed_days = 14 +DEFAULT_DCA_enabled = true +# +DEFAULT_initial_cost = 10 +DEFAULT_initial_cost_percentage = 0 +DEFAULT_min_buy_volume = 300000 +DEFAULT_min_buy_price = 0 +DEFAULT_max_buy_spread = 1 +DEFAULT_min_order_book_volume_percentage = 100 +# +DEFAULT_A_buy_strategy = LOWBB +DEFAULT_A_buy_value = 5 +DEFAULT_A_buy_value_limit = -2.5 +# +DEFAULT_B_buy_strategy = RSI +DEFAULT_B_buy_value = 33 +DEFAULT_B_buy_value_limit = 0 +# +DEFAULT_trailing_buy = 0 +# +DEFAULT_A_sell_strategy = GAIN +DEFAULT_A_sell_value = 1 +# +DEFAULT_B_sell_strategy = RSI +DEFAULT_B_sell_value = 40 +# +DEFAULT_trailing_profit = 0.16 DEFAULT_max_profit = 0 +# DEFAULT_stop_loss_trigger = 0 DEFAULT_stop_loss_timeout = 0 - -#------- Stalled coins ------- -DEFAULT_take_profit_percentage = 1.0 -DEFAULT_take_profit_reset_percentage_move = 0.01 -DEFAULT_take_profit_wait_time = 15 - -#------- Pair minimums ------ -DEFAULT_min_buy_volume = 250 -DEFAULT_min_buy_price = 0.0 - -#------- Optional ------ -DEFAULT_max_buy_spread = 0 - -#------- Sell Strat A ------- -DEFAULT_A_sell_strategy = GAIN -DEFAULT_A_sell_value = 0.25 - -#DEFAULT_B_sell_strategy = STOCHRSI -#DEFAULT_B_sell_value = 0.9 - -################ -##### Dust ##### -BTC_dust = 0.000999 -ETH_dust = 0.00999 -BNB_dust = 0.0105 -USDT_dust = 9.99 \ No newline at end of file +DEFAULT_panic_sell_enabled = false +DEFAULT_rebuy_timeout = 5 +# +DEFAULT_buy_min_price_increase = 0 +DEFAULT_buy_max_price_increase = 0 +# +DEFAULT_pending_order_wait_time = 0 +DEFAULT_combined_cancel_pending_trigger = 0 +# diff --git a/PTMagic/_presets/Sideways/ElDorado-V4-INDICATORS.properties b/PTMagic/_presets/Sideways/ElDorado-V4-INDICATORS.properties deleted file mode 100644 index 6c56eb3..0000000 --- a/PTMagic/_presets/Sideways/ElDorado-V4-INDICATORS.properties +++ /dev/null @@ -1,78 +0,0 @@ -# #################################### -# ####### PTMagic Current Setting ######## -# PTMagic_ActiveSetting = ElDorado-V4 -# PTMagic_LastChanged = 11/30/2018 16:41 -# #################################### -# -# Standard Deviation -BB_std = 2 -# Define how many candles back to look back -BB_length = 20 -# Define the period (in seconds) used by all BB calculation of ProfitTrailer. -BB_candle_period = 900 -# Define how many candles back to look and see if the SMA lines just crossed. -SMA_cross_candles = 4 -# Define the period (in seconds) used to calculate the SMA lines -SMA_candle_period = 3600 -# Define the SMA time frame (in candles) used to calculate the fast SMA line. -SMA_fast_length = 21 -# Define the SMA time frame (in candles) used to calculate the slow SMA line. -SMA_slow_length = 55 -# Define how many candles back to look and see if the EMA lines just crossed. -EMA_cross_candles = 12 -# Define the period (in seconds) used to calculate the EMA lines. -EMA_candle_period = 900 -# Define the EMA time frame (in candles) used to calculate the fast EMA line. -EMA_fast_length = 8 -# Define the EMA time frame (in candles) used to calculate the slow EMA line. -EMA_slow_length = 13 -# Define the period (in seconds) used to calculate the RSI lines. -RSI_candle_period = 900 -# Define the RSI time frame (in candles) used by all RSI calculations -RSI_length = 2 -# Define the period (in seconds) used to calculate the STOCH. -STOCH_candle_period = 900 -# Define the Stochastics RSI time frame (in candles) used by all STOCHRSI calculations -STOCH_length = 14 -# The Stochastic Oscillator (STOCH) is range bound between 0 and 100. -# Both K and D represent lines on a price action chart. -# The first line (known as K) displays the current close (ie. the percentage of the -# price at closing) in relation to the price range (high/low) along the number of -# candles used to look back along the price action chart. -STOCH_K = 1 -# The second line (known as D) is a simple moving average of the first line, typically -# based on the last three candle periods for smoothing. -STOCH_D = 1 -# Define the period (in seconds) used to calculate the MACD lines. -MACD_candle_period = 900 -# Define the MA time frame (in candles) used to calculate the fast MACD line. -MACD_fast_length = 12 -# Define the MA time frame (in candles) used to calculate the slow MACD line. -MACD_slow_length = 26 -# Define the time frame (in days) of the EMA (Exponential Moving Average) of the MACD -MACD_signal = 9 -# Define the period (in seconds) used to calculate the RSI lines. -OBV_candle_period = 900 -# Total count of candles used to calculate the OBV values, e.g. 15 means we have 15 OBV values -OBV_length = 50 -# The number (integer) of the first OBV value used for the calculation of the percentage change. -OBV_signal = 1 -# Always uses 5 minute candles -SOM_trigger_length = 288 -# -# -STOCHRSI_candle_period = 900 -STOCHRSIK_candle_period = 900 -STOCHRSID_candle_period = 900 -# -STOCHRSI_stoch_length = 14 -STOCHRSIK_stoch_length = 14 -STOCHRSID_stoch_length = 14 -# -STOCHRSI_rsi_length = 14 -STOCHRSIK_rsi_length = 14 -STOCHRSID_rsi_length = 14 -# -STOCHRSIK_K = 3 -STOCHRSID_K = 3 -STOCHRSID_D = 3 \ No newline at end of file diff --git a/PTMagic/_presets/SidewaysUp/ElDorado-V4-INDICATORS.properties b/PTMagic/_presets/SidewaysUp/ElDorado-V4-INDICATORS.properties deleted file mode 100644 index d47a85b..0000000 --- a/PTMagic/_presets/SidewaysUp/ElDorado-V4-INDICATORS.properties +++ /dev/null @@ -1,78 +0,0 @@ -# #################################### -# ####### PTMagic Current Setting #### -# PTMagic_ActiveSetting = ElDorado-V4 -# PTMagic_LastChanged = 11/30/2018 16:41 -# #################################### - -# Standard Deviation -BB_std = 2 -# Define how many candles back to look back -BB_length = 20 -# Define the period (in seconds) used by all BB calculation of ProfitTrailer. -BB_candle_period = 900 -# Define how many candles back to look and see if the SMA lines just crossed. -SMA_cross_candles = 4 -# Define the period (in seconds) used to calculate the SMA lines -SMA_candle_period = 3600 -# Define the SMA time frame (in candles) used to calculate the fast SMA line. -SMA_fast_length = 21 -# Define the SMA time frame (in candles) used to calculate the slow SMA line. -SMA_slow_length = 55 -# Define how many candles back to look and see if the EMA lines just crossed. -EMA_cross_candles = 12 -# Define the period (in seconds) used to calculate the EMA lines. -EMA_candle_period = 900 -# Define the EMA time frame (in candles) used to calculate the fast EMA line. -EMA_fast_length = 8 -# Define the EMA time frame (in candles) used to calculate the slow EMA line. -EMA_slow_length = 13 -# Define the period (in seconds) used to calculate the RSI lines. -RSI_candle_period = 900 -# Define the RSI time frame (in candles) used by all RSI calculations -RSI_length = 2 -# Define the period (in seconds) used to calculate the STOCH. -STOCH_candle_period = 900 -# Define the Stochastics RSI time frame (in candles) used by all STOCHRSI calculations -STOCH_length = 14 -# The Stochastic Oscillator (STOCH) is range bound between 0 and 100. -# Both K and D represent lines on a price action chart. -# The first line (known as K) displays the current close (ie. the percentage of the -# price at closing) in relation to the price range (high/low) along the number of -# candles used to look back along the price action chart. -STOCH_K = 1 -# The second line (known as D) is a simple moving average of the first line, typically -# based on the last three candle periods for smoothing. -STOCH_D = 1 -# Define the period (in seconds) used to calculate the MACD lines. -MACD_candle_period = 900 -# Define the MA time frame (in candles) used to calculate the fast MACD line. -MACD_fast_length = 12 -# Define the MA time frame (in candles) used to calculate the slow MACD line. -MACD_slow_length = 26 -# Define the time frame (in days) of the EMA (Exponential Moving Average) of the MACD -MACD_signal = 9 -# Define the period (in seconds) used to calculate the RSI lines. -OBV_candle_period = 900 -# Total count of candles used to calculate the OBV values, e.g. 15 means we have 15 OBV values -OBV_length = 50 -# The number (integer) of the first OBV value used for the calculation of the percentage change. -OBV_signal = 1 -# Always uses 5 minute candles -SOM_trigger_length = 288 -# -# -STOCHRSI_candle_period = 900 -STOCHRSIK_candle_period = 900 -STOCHRSID_candle_period = 900 -# -STOCHRSI_stoch_length = 14 -STOCHRSIK_stoch_length = 14 -STOCHRSID_stoch_length = 14 -# -STOCHRSI_rsi_length = 14 -STOCHRSIK_rsi_length = 14 -STOCHRSID_rsi_length = 14 -# -STOCHRSIK_K = 3 -STOCHRSID_K = 3 -STOCHRSID_D = 3