Merge pull request #210 from Drakkar-Software/dev

#198 [Order Creation] Implement new architecture : Feature/trading modes

.coveralls.yml

@@ -1,3 +1,3 @@
 service_name: travis-pro
-repo_token: JQVHIBvfdoD1tVTbKPVz1zWPYF4dfR14i
+repo_token: 1cFP5IeydNWl3yFJ9bj7cWegFHbkYdVZe
 parallel: true # if the CI is running your build in parallel

config/cst.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 SHORT_VERSION = "0.1.0"
-REV_VERSION = "1"
+REV_VERSION = "2"
 VERSION_DEV_PHASE = "beta"
 VERSION = "{0}-{1}".format(SHORT_VERSION, VERSION_DEV_PHASE)
 LONG_VERSION = "{0}_{1}-{2}".format(SHORT_VERSION, REV_VERSION, VERSION_DEV_PHASE)
@@ -45,6 +45,7 @@
 CONFIG_SIMULATOR = "trader_simulator"
 CONFIG_STARTING_PORTFOLIO = "starting_portfolio"
 CONFIG_TRADER_RISK = "risk"
+CONFIG_TRADER_MODE = "mode"
 CONFIG_TRADER_RISK_MIN = 0.05
 CONFIG_TRADER_RISK_MAX = 1
 ORDER_REFRESHER_TIME = 15
@@ -147,6 +148,15 @@
 TENTACLE_DESCRIPTION_LOCALISATION = "localisation"
 TENTACLE_DESCRIPTION_IS_URL = "is_url"
 
+TENTACLE_TYPES = {"Evaluator": "evaluator",
+                  "Social": "Social",
+                  "RealTime": "RealTime",
+                  "Util": "Util",
+                  "TA": "TA",
+                  "Strategies": "Strategies",
+                  "Trading": "trading",
+                  "Mode": "trader/modes"}
+
 
 class EvaluatorMatrixTypes(Enum):
     TA = "TA"
@@ -205,7 +215,6 @@ class TimeFrames(Enum):
 
 MIN_EVAL_TIME_FRAME = TimeFrames.FIVE_MINUTES
 
-
 TimeFramesMinutes = {
     TimeFrames.ONE_MINUTE: 1,
     TimeFrames.THREE_MINUTES: 3,

config/default_config.json

@@ -14,7 +14,9 @@
   },
   "trader":{
     "enabled": false,
-    "risk": 0.5
+    "risk": 0.5,
+    "reference_market": "BTC",
+    "mode": "DailyTradingMode"
   },
   "trader_simulator":{
     "enabled": true,

docs/CHANGELOG.md

@@ -1,3 +1,16 @@
+Changelog for 0.1.0_2-beta
+====================
+*Released date : June 3 2018*
+
+**Info** : 
+- Config : "mode" key added to "trader"
+
+# Concerned issues :
+    #198 [Order Creation] Implement new architecture
+
+# New features :
+    - Trading modes
+
 Changelog for 0.1.0_1-beta
 ====================
 *Released date : June 2 2018*