Merge pull request #73 from Artimatic/feature/923-autopilot

Feature/923 autopilot

Author: Artimatic

server/api/backtest/backtest.service.ts

@@ -423,7 +423,8 @@ class BacktestService {
         }
         response.status(200).send(recommendation);
       })
-      .catch((error) => {
+      .catch(error => {
+        console.log(error);
         response.status(500).send({ error });
       });
   }

src/app/ai-picks/ai-picks.component.html

@@ -1,7 +1,7 @@
 <div class="ai-picks p-grid">
   <div class="p-col">
     <p-card header="Buys Predictions">
-      <p-table [value]="buys">
+      <p-table [value]="buys" [scrollable]="true" scrollHeight="200px">
         <ng-template pTemplate="caption">
           <p-button class="ui-button-danger" icon="pi pi-times" iconPos="right" label="Remove all"
             (click)="removeAllBuys()"></p-button>
@@ -31,7 +31,7 @@
   </div>
   <div class="p-col">
     <p-card header="Sells Predictions">
-      <p-table [value]="sells">
+      <p-table [value]="sells" [scrollable]="true" scrollHeight="200px">
         <ng-template pTemplate="caption">
           <p-button class="ui-button-danger" icon="pi pi-times" iconPos="right" label="Remove all"
             (click)="removeAllSells()"></p-button>
@@ -59,7 +59,7 @@
       </p-table>
     </p-card>
   </div>
-  <div class="p-col">
+  <!-- <div class="p-col">
     <p-card header="Historical Predictions">
       <p-listbox [options]="history" [listStyle]="{'max-height':'250px'}">
         <p-header>
@@ -93,5 +93,5 @@ <h5>{{history.label}} <i class="pi pi-times" (click)="removeFromHistoryList(hist
         </ng-template>
       </p-listbox>
     </p-card>
-  </div>
+  </div> -->
 </div>

src/app/ai-picks/ai-picks.component.ts

@@ -77,17 +77,13 @@ export class AiPicksComponent implements OnInit, OnDestroy {
           }, 'aipicks', 300000);
         } else {
           const prediction = { algorithm: range, prediction: activation.nextOutput, accuracy: accuracy };
-          console.log('activate prediction', prediction);
-          if (prediction.prediction > 0.5 || prediction.prediction < 0.3) {
-            if (isBuy) {
-              this.addBuyPick(symbol, prediction);
-            } else {
-              this.addSellPick(symbol, prediction);
-            }
+          console.log('activate prediction', symbol, prediction);
+          const item = this.createListObject(symbol, prediction);
+          this.aiPicksService.mlNeutralResults.next(item);
+          if (prediction.prediction > 0.5) {
+            this.addBuyPick(symbol, prediction);
           } else {
-            const item = this.createListObject(symbol, prediction);
-
-            this.aiPicksService.mlNeutralResults.next(item);
+            this.addSellPick(symbol, prediction);
           }
 
           this.schedulerService.schedule(() => {
@@ -96,8 +92,9 @@ export class AiPicksComponent implements OnInit, OnDestroy {
         }
         this.isLoading = false;
       }, error => {
+        this.aiPicksService.mlNeutralResults.next(null);
         this.counter--;
-        console.log('error: ', error);
+        console.log('error on activation ', error);
         this.isLoading = false;
       });
   }

src/app/autopilot/autopilot.component.html

@@ -1,12 +1,13 @@
 <div class="autopilot-container">
-    <p-avatar icon="pi pi-prime" styleClass="p-mr-2" size="xlarge" shape="circle" (click)="open()"></p-avatar>
+    <p-avatar icon="pi pi-prime" styleClass="p-mr-2" size="large" shape="circle" (click)="open()"></p-avatar>
 </div>
 
 <p-dialog [(visible)]="display" [breakpoints]="{'960px': '75vw', '640px': '100vw'}" [style]="{width: '50vw'}"
     [closable]="false">
     <ng-template pTemplate="header">
         <h3>Autopilot</h3>
-        <p-inputSwitch [(ngModel)]="display"></p-inputSwitch>
+        <p-tag [value]="strategyList[strategyCounter]" severity="success"></p-tag>
+        <p-tag [value]="riskToleranceList[riskCounter]" severity="danger"></p-tag>
     </ng-template>
     <ng-template pTemplate="content">
         <div *ngIf="isLoading">
@@ -16,9 +17,7 @@ <h3>Autopilot</h3>
         <app-ai-picks></app-ai-picks>
     </ng-template>
     <ng-template pTemplate="footer">
-        <label>Current strategy:&nbsp;</label>{{strategyList[strategyCounter]}}
         <p-button label="Next strategy" class="p-button-success" (click)="changeStrategy()" iconPos="left"></p-button>
-
         <p-button label="Stop autopilot" class="p-button-danger" (click)="stop()" iconPos="left"></p-button>
     </ng-template>
 </p-dialog>