Merge pull request #40 from nerap/feature/buying_selling_order

update(printing): new printing and configuration file
nerap · Oct 20, 2021 · 16931e1 · 16931e1
2 parents 32f47ef + 31af489
commit 16931e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/config_files/basic_config b/config_files/basic_config
@@ -2,24 +2,21 @@
     "symbols": [
         {
             "symbol": "ETHUSDT",
-            "quantity": 20,
-            "risk": 25,
-            "interval": "1m",
-            "lookback": "100m"
+            "risk": 5,
+            "interval": "30m",
+            "lookback": "14 day ago UTC"
         },
         {
             "symbol": "BTCUSDT",
-            "quantity": 20,
-            "risk": 25,
-            "interval": "1m",
-            "lookback": "100m"
+            "risk": 7,
+            "interval": "30m",
+            "lookback": "14 day ago UTC"
         },
         {
-            "symbol": "COMPUSDT",
-            "quantity": 20,
-            "risk": 25,
-            "interval": "1m",
-            "lookback": "100m"
+            "symbol": "XRPUSDT",
+            "risk": 5,
+            "interval": "30m",
+            "lookback": "14 day ago UTC"
         }
     ]
 }
diff --git a/srcs/placing_order/Symbol.py b/srcs/placing_order/Symbol.py
@@ -359,7 +359,11 @@ def strategy(self):
 
         # Printing last row of the data frame
 
-        print(self.data_frame.iloc[-1])
+        print("\t\t" + self.symbol)
+        print("Close -> " + str(self.data_frame.Close.iloc[-1]))
+        print("K -> " + str(round(self.data_frame['K'].iloc[-1], 2)) + " D -> " + str(round(self.data_frame['D'].iloc[-1], 2)))
+        print("RSI -> " + str(round(self.data_frame.RSI.iloc[-1], 2)) + " MACD -> " + str(round(self.data_frame.MACD.iloc[-1], 3)))
+        print(str(self.data_frame.Buy_trigger.iloc[-1]) + " | " + str(self.data_frame.Sell_trigger.iloc[-1]))
 
         # Making sure if we are not in open_position and we want to place an order with .Buy or .Sell