Merge pull request #30 from SnShine/master

modify ipython notebooks to fix the following bugs
Cloud-CV · Apr 11, 2015 · ad8dc94 · ad8dc94
2 parents ad6fc9a + 17c344c
commit ad8dc94
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/pcloudcv/Classification Visualization.ipynb b/pcloudcv/Classification Visualization.ipynb
@@ -27,7 +27,7 @@
       "from IPython.display import Image\n",
       "from IPython.display import HTML\n",
       "import json\n",
-      "import os"
+      "import os, signal"
      ],
      "language": "python",
      "metadata": {},
@@ -46,7 +46,7 @@
      "collapsed": false,
      "input": [
       "config_path = os.path.join(os.getcwd(), 'config.json') #full path of the config.json file\n",
-      "dict = {'exec': 'classify'}"
+      "dict = {'exec': 'classify'} #executable name"
      ],
      "language": "python",
      "metadata": {},
@@ -64,23 +64,25 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "Starting the CloudCV is as easy initializing the class with the config file path, dictionary containing parameters and a flag specifying whether to login through google or not.\n"
+      "Starting the CloudCV is as easy as initializing the class with the config file path, dictionary containing parameters and a flag specifying whether to login through google or not.\n"
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "p = PCloudCV(config_path, dict, True)\n",
-      "p.start()"
+      "signal.signal(signal.SIGINT, p.signal_handler)\n",
+      "p.start()\n",
+      "signal.pause()"
      ],
      "language": "python",
      "metadata": {},
      "outputs": []
     },
     {
      "cell_type": "heading",
-     "level": 1,
+     "level": 2,
      "metadata": {},
      "source": [
       "Visualize Results Here"

diff --git a/pcloudcv/FeatureExtraction.ipynb b/pcloudcv/FeatureExtraction.ipynb
@@ -9,7 +9,8 @@
   {
    "cells": [
     {
-     "cell_type": "markdown",
+     "cell_type": "heading",
+     "level": 2,
      "metadata": {},
      "source": [
       "Start by importing PCloudCV module to run Python API for cloudcv"
@@ -19,47 +20,55 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from pcloudcv import PCloudCV\n"
+      "from pcloudcv import PCloudCV\n",
+      "import os, signal"
      ],
      "language": "python",
      "metadata": {},
      "outputs": []
     },
+    {
+     "cell_type": "heading",
+     "level": 2,
+     "metadata": {},
+     "source": [
+      "Load the configuration file and mention the function you wish to run"
+     ]
+    },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "import os\n",
-      "config_path = os.path.join(os.getcwd(), 'config.json') #full path of the config.json file\n",
-      "dict = {'exec': 'features'}"
+      "config_path = os.path.join(os.getcwd(), 'config.json') #full path of the file config.json file\n",
+      "dict = {'exec': 'features'} #executable name"
      ],
      "language": "python",
      "metadata": {},
      "outputs": []
     },
     {
-     "cell_type": "markdown",
+     "cell_type": "heading",
+     "level": 2,
      "metadata": {},
      "source": [
-      "Starting the CloudCV is as easy initializing the class with the config file path, dictionary containing parameters and a flag specifying whether to login through google or not.\n"
+      "Start CloudCV Thread"
      ]
     },
     {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "p = PCloudCV(config_path, dict, True)\n",
-      "p.start()"
-     ],
-     "language": "python",
+     "cell_type": "markdown",
      "metadata": {},
-     "outputs": []
+     "source": [
+      "Starting the CloudCV is as easy as initializing the class with the config file path, dictionary containing parameters and a flag specifying whether to login through google or not.\n"
+     ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "exit"
+      "p = PCloudCV(config_path, dict, True)\n",
+      "signal.signal(signal.SIGINT, p.signal_handler)\n",
+      "p.start()\n",
+      "signal.pause()"
      ],
      "language": "python",
      "metadata": {},