Skip to content

Commit

Permalink
#22 Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Bouquet committed Oct 1, 2018
1 parent 6392d40 commit 61382f4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Evaluator/RealTime/InstantRegulatedMarketEvaluator.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"regulated_market_price": 1,
"regulated_market_range": 0.03
"regulated_market_range": 0.003
}
6 changes: 4 additions & 2 deletions Evaluator/RealTime/instant_fluctuations_evaluator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,13 @@ def eval_impl(self):

# TODO
# should sell
if last_price > self.specific_config[self.MARKET_PRICE] + self.specific_config[self.MARKET_RANGE]:
if last_price > self.specific_config[self.MARKET_PRICE] + \
self.specific_config[self.MARKET_PRICE] * self.specific_config[self.MARKET_RANGE]:
self.eval_note = 1

# should buy
elif last_price < self.specific_config[self.MARKET_PRICE] + self.specific_config[self.MARKET_RANGE]:
elif last_price < self.specific_config[self.MARKET_PRICE] - \
self.specific_config[self.MARKET_PRICE] * self.specific_config[self.MARKET_RANGE]:
self.eval_note = -1

else:
Expand Down
2 changes: 1 addition & 1 deletion tentacles_list.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"instant_fluctuations_evaluator": {"name": "instant_fluctuations_evaluator", "type": "Evaluator", "subtype": "RealTime", "version": "1.0.0", "requirements": [], "config_files": ["InstantRegulatedMarketEvaluator.json"]}, "orderbook_evaluator": {"name": "orderbook_evaluator", "type": "Evaluator", "subtype": "RealTime", "version": "1.0.0", "requirements": []}, "forum_evaluator": {"name": "forum_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["RedditForumEvaluator.json"]}, "news_evaluator": {"name": "news_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["TwitterNewsEvaluator.json"]}, "stats_evaluator": {"name": "stats_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["GoogleTrendStatsEvaluator.json"]}, "high_frequency_strategy_evaluator": {"name": "high_frequency_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator"], "config_files": ["HighFrequencyStrategiesEvaluator.json"]}, "market_stability_strategy_evaluator": {"name": "market_stability_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator"], "config_files": ["MarketStabilityStrategiesEvaluator.json"]}, "mixed_strategies_evaluator": {"name": "mixed_strategies_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator", "news_evaluator"], "config_files": ["FullMixedStrategiesEvaluator.json", "InstantSocialReactionMixedStrategiesEvaluator.json", "SimpleMixedStrategiesEvaluator.json"], "tests": ["test_full_mixed_strategies_evaluator"]}, "move_signals_strategy_evaluator": {"name": "move_signals_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["momentum_evaluator", "trend_evaluator", "instant_fluctuations_evaluator"], "config_files": ["MoveSignalsStrategyEvaluator.json"], "tests": ["test_move_signals_strategy_evaluator"]}, "momentum_evaluator": {"name": "momentum_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": [], "tests": ["test_adx_TA_evaluator", "test_bollinger_bands_momentum_TA_evaluator", "test_macd_TA_evaluator", "test_rsi_TA_evaluator", "test_klinger_TA_evaluator"]}, "trend_evaluator": {"name": "trend_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": [], "tests": ["test_double_moving_averages_TA_evaluator"]}, "volatility_evaluator": {"name": "volatility_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": []}, "overall_state_analysis": {"name": "overall_state_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "pattern_analysis": {"name": "pattern_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "statistics_analysis": {"name": "statistics_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "text_analysis": {"name": "text_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "trend_analysis": {"name": "trend_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "daily_trading_mode": {"name": "daily_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["mixed_strategies_evaluator"], "config_files": ["DailyTradingMode.json"], "tests": ["test_daily_trading_mode_creator", "test_daily_trading_mode_decider"]}, "high_frequency_mode": {"name": "high_frequency_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["high_frequency_strategy_evaluator"], "config_files": ["HighFrequencyMode.json"], "developing": true}, "hybrid_trading_mode": {"name": "hybrid_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["daily_trading_mode", "high_frequency_mode", "market_stability_strategy_evaluator"], "config_files": ["HybridTradingMode.json"], "developing": true}, "investor_mode": {"name": "investor_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["InvestorMode.json"], "developing": true}, "objective_mode": {"name": "objective_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["ObjectiveMode.json"], "developing": true}, "opportunity_mode": {"name": "opportunity_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["OpportunityMode.json"], "developing": true}, "safe_profit_mode": {"name": "safe_profit_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["SafeProfitMode.json"], "developing": true}, "signal_trading_mode": {"name": "signal_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["move_signals_strategy_evaluator", "daily_trading_mode"], "config_files": ["SignalTradingMode.json"], "developing": true}, "simple_trading_mode": {"name": "simple_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["mixed_strategies_evaluator"], "config_files": ["SimpleTradingMode.json"], "tests": [], "developing": true}}
{"instant_fluctuations_evaluator": {"package_name": "OctoBot-Tentacles", "name": "instant_fluctuations_evaluator", "type": "Evaluator", "subtype": "RealTime", "version": "1.0.0", "requirements": [], "config_files": ["InstantRegulatedMarketEvaluator.json"]}, "orderbook_evaluator": {"name": "orderbook_evaluator", "type": "Evaluator", "subtype": "RealTime", "version": "1.0.0", "requirements": []}, "forum_evaluator": {"name": "forum_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["RedditForumEvaluator.json"]}, "news_evaluator": {"name": "news_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["TwitterNewsEvaluator.json"]}, "stats_evaluator": {"name": "stats_evaluator", "type": "Evaluator", "subtype": "Social", "version": "1.0.0", "requirements": [], "config_files": ["GoogleTrendStatsEvaluator.json"]}, "high_frequency_strategy_evaluator": {"name": "high_frequency_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator"], "config_files": ["HighFrequencyStrategiesEvaluator.json"]}, "market_stability_strategy_evaluator": {"name": "market_stability_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator"], "config_files": ["MarketStabilityStrategiesEvaluator.json"]}, "mixed_strategies_evaluator": {"name": "mixed_strategies_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["instant_fluctuations_evaluator", "news_evaluator"], "config_files": ["FullMixedStrategiesEvaluator.json", "InstantSocialReactionMixedStrategiesEvaluator.json", "SimpleMixedStrategiesEvaluator.json"], "tests": ["test_full_mixed_strategies_evaluator"]}, "move_signals_strategy_evaluator": {"name": "move_signals_strategy_evaluator", "type": "Evaluator", "subtype": "Strategies", "version": "1.0.0", "requirements": ["momentum_evaluator", "trend_evaluator", "instant_fluctuations_evaluator"], "config_files": ["MoveSignalsStrategyEvaluator.json"], "tests": ["test_move_signals_strategy_evaluator"]}, "momentum_evaluator": {"name": "momentum_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": [], "tests": ["test_adx_TA_evaluator", "test_bollinger_bands_momentum_TA_evaluator", "test_macd_TA_evaluator", "test_rsi_TA_evaluator", "test_klinger_TA_evaluator"]}, "trend_evaluator": {"name": "trend_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": [], "tests": ["test_double_moving_averages_TA_evaluator"]}, "volatility_evaluator": {"name": "volatility_evaluator", "type": "Evaluator", "subtype": "TA", "version": "1.0.0", "requirements": []}, "overall_state_analysis": {"name": "overall_state_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "pattern_analysis": {"name": "pattern_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "statistics_analysis": {"name": "statistics_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "text_analysis": {"name": "text_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "trend_analysis": {"name": "trend_analysis", "type": "Evaluator", "subtype": "Util", "version": "1.0.0", "requirements": []}, "daily_trading_mode": {"name": "daily_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["mixed_strategies_evaluator"], "config_files": ["DailyTradingMode.json"], "tests": ["test_daily_trading_mode_creator", "test_daily_trading_mode_decider"]}, "high_frequency_mode": {"name": "high_frequency_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["high_frequency_strategy_evaluator"], "config_files": ["HighFrequencyMode.json"], "developing": true}, "hybrid_trading_mode": {"name": "hybrid_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["daily_trading_mode", "high_frequency_mode", "market_stability_strategy_evaluator"], "config_files": ["HybridTradingMode.json"], "developing": true}, "investor_mode": {"name": "investor_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["InvestorMode.json"], "developing": true}, "objective_mode": {"name": "objective_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["ObjectiveMode.json"], "developing": true}, "opportunity_mode": {"name": "opportunity_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["OpportunityMode.json"], "developing": true}, "safe_profit_mode": {"name": "safe_profit_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": [], "config_files": ["SafeProfitMode.json"], "developing": true}, "signal_trading_mode": {"name": "signal_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["move_signals_strategy_evaluator", "daily_trading_mode"], "config_files": ["SignalTradingMode.json"], "developing": true}, "simple_trading_mode": {"name": "simple_trading_mode", "type": "Trading", "subtype": "Mode", "version": "1.0.0", "requirements": ["mixed_strategies_evaluator"], "config_files": ["SimpleTradingMode.json"], "tests": [], "developing": true}}

0 comments on commit 61382f4

Please sign in to comment.