fixed conflict

alphamind/data/dbmodel/models.py

@@ -1031,5 +1031,5 @@ class IndexMarket(Base):
 if __name__ == '__main__':
     from sqlalchemy import create_engine
 
-    engine = create_engine('postgresql+psycopg2://postgres:we083826@101.132.104.118/alpha')
+    engine = create_engine('postgresql+psycopg2://alpha:alpha@180.166.26.82:8890/alpha')
     Base.metadata.create_all(engine)

notebooks/Example 14 - Deep Learning Model Prediction - Tensorflow Application.ipynb

@@ -237,9 +237,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 27,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Optimization finished ......\n",
+      "Training cost = 0.06224982067942619, W = [[ 0.6762214 ]\n",
+      " [ 0.40109447]\n",
+      " [-0.4262993 ]\n",
+      " [ 0.28896013]], b = 0.014891502447426319\n",
+      "\n",
+      "Sklearn Regression Testing IC: 0.9434\n",
+      "Tensorflow Regression Testing IC: 0.9242\n",
+      "Wall time: 3min 26s\n"
+     ]
+    }
+   ],
    "source": [
     "%%time \n",
     "\n",

notebooks/Example 2 - Strategy Analysis.ipynb

@@ -273,7 +273,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   },
   "varInspector": {
    "cols": {

notebooks/Example 3 - Multi Weight Gap Comparison.ipynb

@@ -548,7 +548,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   },
   "varInspector": {
    "cols": {

notebooks/Example 4 - Single Factor Analysis.ipynb

@@ -292,7 +292,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   },
   "varInspector": {
    "cols": {

notebooks/Example 5 - Style Factor Analysis.ipynb

@@ -383,7 +383,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   },
   "varInspector": {
    "cols": {

notebooks/Example 6 - Target Volatility Builder.ipynb

@@ -382,7 +382,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   },
   "varInspector": {
    "cols": {