Added functionality to go back to mode selection. (#14)

* Added functionality to go back to mode selection.

* Added currency closing

* Added checks for enough funds before buying logic and before checking

* Bump version number

Co-authored-by: Markus Aksli <markusaksli@hotmail.com>

Author: martentyrk

src/main/java/modes/Backtesting.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Scanner;
 
-//TODO: Clean up Backtesting class.
 public final class Backtesting {
     private static final List<Currency> currencies = new ArrayList<>();
     private static LocalAccount localAccount;

src/main/java/modes/Collection.java

@@ -94,18 +94,20 @@ public static void setLastMessage(String lastMessage) {
         printProgress();
     }
 
-    private static void collectionInterface() {
+    private static boolean collectionInterface() {
         if (backtestingFolder.exists() && backtestingFolder.isDirectory()) {
             String[] backtestingFiles = getDataFiles();
             if (backtestingFiles.length == 0) {
                 System.out.println("---No backtesting files detected");
-                return;
+                return true;
             }
 
             String input = "";
             while (!input.equalsIgnoreCase("new")) {
                 if (input.equalsIgnoreCase("quit")) {
                     System.exit(0);
+                } else if (input.equalsIgnoreCase("modes")) {
+                    return false;
                 }
                 if (input.matches("\\d+")) {
                     int index = Integer.parseInt(input);
@@ -118,12 +120,14 @@ private static void collectionInterface() {
                     System.out.println("[" + (i + 1) + "] " + backtestingFiles[i]);
                 }
                 System.out.println("\nEnter \"new\" to start collecting a new data file");
-                System.out.println("Enter \"quit\" to exit the program\n");
+                System.out.println("Enter \"quit\" to exit the program");
+                System.out.println("Enter \"modes\" to return to mode selection.\n");
                 input = sc.nextLine();
             }
         } else {
             System.out.println("---No backtesting files detected");
         }
+        return true;
     }
 
     public static String[] getDataFiles() {
@@ -162,21 +166,28 @@ public static void startCollection() {
 
                             System.out.println("\n---Collection completed, result in "
                                     + new File(filename).getAbsolutePath());
-                            System.out.println("---Files may only appear after quitting");
 
                             describe(filename);
                         } catch (Exception e) {
                             e.printStackTrace();
                             System.out.println("---Recovery failed, removing temp files");
                             deleteTemp();
+                            try {
+                                Files.deleteIfExists(Path.of(filename));
+                            } catch (IOException ioException) {
+                                ioException.printStackTrace();
+                            }
                         }
                     }
                 }
             } else {
                 deleteTemp();
             }
         }
-        collectionInterface();
+        boolean returnToModes = collectionInterface();
+        if (!returnToModes) {
+            return;
+        }
         System.out.println("Enter collectable currency (BTC, LINK, ETH...)");
         while (true) {
             try {
@@ -261,6 +272,8 @@ public void run() {
                 }
             }
         }, requestDelay, requestDelay);
+
+        Collection.setLastMessage("Sending requests...");
         int id = 0;
         while (true) {
             long diff = end - start;
@@ -294,7 +307,6 @@ public void run() {
         System.out.println("\n---Collection completed in "
                 + Formatter.formatDuration(System.currentTimeMillis() - initTime) + ", result in "
                 + new File(filename).getAbsolutePath());
-        System.out.println("---Files may only appear after quitting");
 
         describe(filename);
 

src/main/java/modes/Live.java

@@ -3,7 +3,6 @@
 import com.binance.api.client.domain.account.AssetBalance;
 import com.binance.api.client.domain.general.FilterType;
 import com.binance.api.client.domain.general.SymbolFilter;
-import com.binance.api.client.exception.BinanceApiException;
 import system.ConfigSetup;
 import system.Formatter;
 import trading.*;
@@ -16,7 +15,7 @@
 import java.util.Optional;
 import java.util.Scanner;
 
-//TODO: Clean up Live class
+
 public final class Live {
     private static LocalAccount localAccount;
     private static final List<Currency> currencies = new ArrayList<>();
@@ -34,6 +33,16 @@ public static List<Currency> getCurrencies() {
         return currencies;
     }
 
+    public static void close() {
+        for (Currency currency : currencies) {
+            try {
+                currency.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     public static void init() {
         boolean fileFailed = true;
         if (credentialsFile.exists()) {

src/main/java/modes/Simulation.java

@@ -6,6 +6,7 @@
 import trading.BuySell;
 import trading.Currency;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,6 +27,16 @@ public static LocalAccount getAccount() {
         return localAccount;
     }
 
+    public static void close() {
+        for (Currency currency : currencies) {
+            try {
+                currency.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     public static void init() {
         localAccount = new LocalAccount("Investor Toomas", STARTING_VALUE);
         BuySell.setAccount(localAccount);

src/main/java/system/ConfigSetup.java

@@ -4,7 +4,6 @@
 import com.binance.api.client.domain.general.RateLimitType;
 import indicators.MACD;
 import indicators.RSI;
-import modes.Backtesting;
 import modes.Simulation;
 import trading.BuySell;
 import trading.Currency;
@@ -99,7 +98,7 @@ public static void readConfig() {
                         Trade.TAKE_PROFIT = Double.parseDouble(arr[1]);
                         break;
                     case "Confluence":
-                        Currency.CONFLUENCE = Integer.parseInt(arr[1]);
+                        Currency.CONFLUENCE_TARGET = Integer.parseInt(arr[1]);
                         break;
                     case "Close confluence":
                         Trade.CLOSE_CONFLUENCE = Integer.parseInt(arr[1]);