move util of action out from models

yssource · Jun 23, 2021 · 6fbcfd1 · 6fbcfd1
1 parent 6d2dcc3
commit 6fbcfd1
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 38 deletions.
diff --git a/binding/stockday/main.cpp b/binding/stockday/main.cpp
@@ -32,13 +32,6 @@ class PyStockDay : public std::enable_shared_from_this<PyStockDay>
         m_sda_ptr = std::make_shared<StockDayAction>(qcodes, m_start.c_str(), m_end.c_str(), m_xdxr);
     };
 
-    // size_t toQfq() noexcept
-    // {
-    //     auto fq = m_sda_ptr->to_fq_type(FQ_TYPE::PRE);
-    //     // fq->write<std::ostream, index_type, double, int>(std::cout);
-    //     return fq->get_index().size();
-    // }
-
     template <class T>
     std::vector<T> to_series(const string& col) noexcept
     {

diff --git a/binding/test/test_indexday.py b/binding/test/test_indexday.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-
 import pandas as pd
 
-from pyabqindexday import PyIndexDay as indexday
 from pyabquant import PyAbquant
+from pyabqindexday import PyIndexDay as indexday
 
 pd.set_option("display.max_rows", None)
 pd.set_option("display.max_columns", None)

diff --git a/binding/test/test_stockday.py b/binding/test/test_stockday.py
@@ -2,11 +2,11 @@
 
 import unittest
 import math
+import pandas as pd
 
-from pyabqstockday import PyStockDay as stockday
 from pyabquant import FQ_TYPE, PyAbquant
+from pyabqstockday import PyStockDay as stockday
 
-import pandas as pd
 
 pd.set_option("display.max_rows", None)
 pd.set_option("display.max_columns", None)

diff --git a/cxx/src/actions/indexday_p.hpp b/cxx/src/actions/indexday_p.hpp
@@ -18,7 +18,6 @@ class IndexDayAction::impl
 public:
     impl(IndexDayAction& sa, QStringList codes, const char* start, const char* end, FQ_TYPE xdxr);
     MyDataFramePtr get_dataframe(const IndexDayAction& sa) const;
-    MyDataFramePtr to_fq_type(FQ_TYPE fq);
     QStringList get_codes(const IndexDayAction&) const { return m_codes; };
     QList<IndexDay> get_securities(const IndexDayAction&) const { return m_indexdays; };
     QVector<const char*> get_columns(const IndexDayAction&) const { return m_columns; };

diff --git a/cxx/src/actions/utils.hpp b/cxx/src/actions/utils.hpp
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "DataFrame/DataFrame.h"
+#include "abquant/helpers/applicationhelper.h"
 #include "xtensor/xarray.hpp"
 
 namespace abq
@@ -123,29 +124,29 @@ inline QDebug operator<<(QDebug debug, INSTRUMENT_TYPE ins)
     return debug;
 }
 
-enum class MIN_FREQ : short int { ONE = 0x01, FIVE = 0x05, FIFTEEN = 0x0F, THIRTY = 0x1E, SIXTY = 0x3C };
+// enum class MIN_FREQ : short int { ONE = 0x01, FIVE = 0x05, FIFTEEN = 0x0F, THIRTY = 0x1E, SIXTY = 0x3C };
 
-inline QDebug operator<<(QDebug debug, MIN_FREQ freq)
-{
-    switch (freq) {
-    case MIN_FREQ::ONE:
-        debug << "MIN_FREQ::ONE";
-        break;
-    case MIN_FREQ::FIVE:
-        debug << "MIN_FREQ::FIVE";
-        break;
-    case MIN_FREQ::FIFTEEN:
-        debug << "MIN_FREQ::FIFTEEN";
-        break;
-    case MIN_FREQ::THIRTY:
-        debug << "MIN_FREQ::THIRTY";
-        break;
-    case MIN_FREQ::SIXTY:
-        debug << "MIN_FREQ::SIXTY";
-        break;
-    }
-    return debug;
-}
+// inline QDebug operator<<(QDebug debug, MIN_FREQ freq)
+// {
+//     switch (freq) {
+//     case MIN_FREQ::ONE:
+//         debug << "MIN_FREQ::ONE";
+//         break;
+//     case MIN_FREQ::FIVE:
+//         debug << "MIN_FREQ::FIVE";
+//         break;
+//     case MIN_FREQ::FIFTEEN:
+//         debug << "MIN_FREQ::FIFTEEN";
+//         break;
+//     case MIN_FREQ::THIRTY:
+//         debug << "MIN_FREQ::THIRTY";
+//         break;
+//     case MIN_FREQ::SIXTY:
+//         debug << "MIN_FREQ::SIXTY";
+//         break;
+//     }
+//     return debug;
+// }
 
 template <template <typename...> class base, typename derived>
 struct is_base_of_template_impl {

diff --git a/cxx/src/helpers/applicationhelper.h b/cxx/src/helpers/applicationhelper.h
@@ -1,12 +1,38 @@
 #ifndef APPLICATIONHELPER_H
 #define APPLICATIONHELPER_H
 
+#include <QtCore/QDebug>
 #include <TGlobal>
 
 class T_HELPER_EXPORT ApplicationHelper
 {
 };
 
+namespace abq
+{
 enum class MIN_FREQ : short int { ONE = 0x01, FIVE = 0x05, FIFTEEN = 0x0F, THIRTY = 0x1E, SIXTY = 0x3C };
 
+inline QDebug operator<<(QDebug debug, MIN_FREQ freq)
+{
+    switch (freq) {
+    case MIN_FREQ::ONE:
+        debug << "MIN_FREQ::ONE";
+        break;
+    case MIN_FREQ::FIVE:
+        debug << "MIN_FREQ::FIVE";
+        break;
+    case MIN_FREQ::FIFTEEN:
+        debug << "MIN_FREQ::FIFTEEN";
+        break;
+    case MIN_FREQ::THIRTY:
+        debug << "MIN_FREQ::THIRTY";
+        break;
+    case MIN_FREQ::SIXTY:
+        debug << "MIN_FREQ::SIXTY";
+        break;
+    }
+    return debug;
+}
+} // namespace abq
+
 #endif // APPLICATIONHELPER_H
diff --git a/cxx/src/models/indexmin.h b/cxx/src/models/indexmin.h
@@ -7,8 +7,8 @@
 #include <QVariant>
 #include <TAbstractModel>
 #include <TGlobal>
-// #include "abquant/helpers/applicationhelper.h"
-#include "abquant/actions/utils.hpp"
+
+#include "abquant/helpers/applicationhelper.h"
 
 class TModelObject;
 class IndexMinObject;

diff --git a/cxx/src/models/stockmin.h b/cxx/src/models/stockmin.h
@@ -7,8 +7,7 @@
 #include <QVariant>
 #include <TAbstractModel>
 #include <TGlobal>
-// #include "abquant/helpers/applicationhelper.h"
-#include "abquant/actions/utils.hpp"
+#include "abquant/helpers/applicationhelper.h"
 
 class TModelObject;
 class StockMinObject;