Merge pull request #9 from nicolegoldin/this_will_definitely_fix_it

for_real
nicolegoldin · Feb 13, 2020 · 6f89174 · 6f89174
2 parents 045b391 + 73128da
commit 6f89174
Showing 1 changed file with 0 additions and 54 deletions.
diff --git a/sharpe_ratio.ipynb b/sharpe_ratio.ipynb
@@ -2,11 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 3,
-=======
-   "execution_count": 4,
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1754,11 +1750,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 5,
-=======
-   "execution_count": 6,
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1767,7 +1759,6 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 16,
    "metadata": {},
    "outputs": [],
@@ -1810,9 +1801,6 @@
   {
    "cell_type": "code",
    "execution_count": 19,
-=======
-   "execution_count": 7,
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
    "metadata": {},
    "outputs": [
     {
@@ -1832,11 +1820,7 @@
        "Length: 100, dtype: float64"
       ]
      },
-<<<<<<< HEAD
      "execution_count": 19,
-=======
-     "execution_count": 7,
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1847,24 +1831,15 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 81,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sharpe_dict = sharpe_ratio.to_dict()"
-=======
    "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
     "sharpe_ratio.plot(kind='bar', figsize=(25,10))"
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
    ]
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 82,
    "metadata": {},
    "outputs": [
@@ -1901,35 +1876,6 @@
     "for key,value in sharpe_dict.items():\n",
     "    if value > 2:\n",
     "        print (f\"{key}: {value}\")\n"
-=======
-   "execution_count": 14,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "GPC      2.910716\n",
-       "ABC      2.827482\n",
-       "PPL      2.789727\n",
-       "NWS      2.749488\n",
-       "BMY      2.666319\n",
-       "GIS      2.639886\n",
-       "EXPE     2.501534\n",
-       "HOLX     2.477266\n",
-       "SYF      2.474125\n",
-       "DISCK    2.330280\n",
-       "dtype: float64"
-      ]
-     },
-     "execution_count": 14,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "sharpe_ratio.sort_values(ascending=False, inplace=True)\n",
-    "sharpe_ratio.head(10)"
->>>>>>> b8d2a4ad05688a2dd92d6f03a6941390ef588d46
    ]
   },
   {