clean up

src/err.rs

@@ -1,4 +0,0 @@
-
-pub enum Error {
-    Anyhow(anyhow::Error),
-}

src/green/broker/backtest.rs

@@ -1,5 +1,4 @@
-use crate::green::strategy::hold::Order;
-use super::Broker;
+use crate::green::green::Order;
 
 #[derive(Default, Clone, Debug)]
 pub struct BackTestBroker{

src/green/broker/live.rs

@@ -1 +1 @@
-fn live_trading(){}
+// fn live_trading(){}

src/green/feeds/yahoo.rs

@@ -15,7 +15,6 @@ type HistoricalData = (String, Vec<f64>, usize);
 
 impl YahooFinanceData{
     fn fetch_csv_data(symbol: &str) -> anyhow::Result<Vec<Vec<f64>>> {
-        // Date,Open,High,Low,Close,Adj Close,Volume
         let file = File::open(format!("data/{symbol}.csv"))?;
 
         let mut reader = csv::ReaderBuilder::new()

src/green/green.rs

@@ -2,18 +2,22 @@ use std::collections::hash_set::SymmetricDifference;
 use std::collections::VecDeque;
 use std::default::Default;
 use std::fs::File;
+
 use ibapi::orders::{order_builder, OrderNotification};
+
 use crate::cmds::backtest::BackTestCommand;
 use crate::err::Error;
 use crate::green::{
     feeds::BaseData,
-    strategy::Strategy,
+    strategy::{
+        Strategy,
+        hold::{SimpleStrategy}
+    },
     broker::Broker,
     broker::backtest::BackTestBroker,
-    analyzer::Analyzer
+    analyzer::Analyzer,
+    visualization
 };
-use crate::green::strategy::hold::{SimpleStrategy};
-use crate::green::visualization;
 
 #[derive(Debug, Default, Copy, Clone)]
 pub enum Action {
@@ -61,12 +65,14 @@ impl Green {
             let close_price = bar.last().unwrap();
             match order.action {
                 Action::Buy => {
+                    log::info!("Buy: {:?}", order);
                     self.broker.cash.push(cash - order.size * close_price);
                     self.broker.position.push(position + order.size);
                     self.broker.net_assets.push(self.broker.cash.last().unwrap() + self.broker.position.last().unwrap() * close_price);
                     self.broker.order.push(order)
                 }
                 Action::Sell => {
+                    log::info!("Sell: {:?}", order);
                     self.broker.cash.push(cash + order.size * close_price);
                     self.broker.position.push(position - order.size);
                     self.broker.net_assets.push(self.broker.cash.last().unwrap() + self.broker.position.last().unwrap() * close_price);
@@ -135,9 +141,9 @@ impl GreenBuilder{
         self.strategy = strategy;
         self
     }
-    pub fn add_analyzer(&mut self, analyzer: Box<dyn Analyzer>) -> &GreenBuilder {
-        self
-    }
+    // pub fn add_analyzer(&mut self, analyzer: Box<dyn Analyzer>) -> &GreenBuilder {
+    //     self
+    // }
     pub fn build(&self) -> Box<Green> {
         Box::new(Green{
             data: self.data.clone(),

src/green/strategy/hold.rs

@@ -1,5 +1,4 @@
-use crate::green::broker::backtest::BackTestBroker;
-use crate::green::green::{Action, Green, Order};
+use crate::green::green::{Action, Order};
 use crate::green::strategy::Strategy;
 
 
@@ -11,13 +10,11 @@ impl Strategy for SimpleStrategy {
         let open_price = data[0];
         let close_price = data[3];
         if close_price > open_price {
-            log::info!("buy");
             Order{
                 action: Action::Buy,
                 size: 1.0
             }
         } else {
-            log::info!("sell");
             Order{
                 action: Action::Sell,
                 size: 1.0

src/green/strategy/mod.rs

@@ -1,7 +1,8 @@
 pub mod hold;
 
 use crate::green::broker::Broker;
+use crate::green::green::Order;
 
 pub trait Strategy {
-    fn next(&mut self, _: &Vec<f64>);
+    fn next(&mut self, _: &Vec<f64>) -> Order;
 }

src/green/visualization/candle.rs

@@ -1,12 +1,7 @@
-use std::{
-    fs::File
-};
-use eframe::emath::Vec2;
+use egui::{Stroke, Color32};
+use egui_plot::{Plot, BoxPlot, BoxElem, BoxSpread, Legend, Line};
 
-use egui::{Stroke, Color32, DragValue, Event};
-use egui_plot::{Plot, BoxPlot, BoxElem, BoxSpread, Legend, PlotPoints, Line};
-
-use crate::green::strategy::hold::Order;
+use crate::green::green::Order;
 
 #[derive(Default)]
 pub struct App {

src/main.rs

@@ -19,7 +19,7 @@ fn init_log() {
                 "{}:{} {} [{}] - {}",
                 record.file().unwrap_or("unknown_file"),
                 record.line().unwrap_or(0),
-                chrono::Local::now().format("%Y-%m-%dT%H:%M:%S").to_owned().blue(),
+                chrono::Local::now().format("%Y-%m-%dT%H:%M:%S"),
                 record.level(),
                 record.args()
             )