Skip to content

Commit 30d2ea4

Browse files
committed
Merge pull request #462 from ioam/notebook_fixes
Tutorial and website fixes
2 parents 9f97aad + 3bdb41b commit 30d2ea4

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

doc/Homepage.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"\n",
7171
"Note that just as the 2D array became a 1D curve automatically by sampling to get the cross section, this entire figure would become a single static frame with no slider bar if you chose a specific ``Y`` value by re-running with ``.select(Y=0.3)`` before ``.cols(2)``. In fact, there is nothing in the code above that adds the slider bar explicitly -- it appears automatically, just because there is an additional dimension of data (``Y`` in this case) that has not been laid out spatially. Additional sliders would appear if there were other dimensions being varied as well, e.g. for parameter-space explorations.\n",
7272
"\n",
73-
"This functionality is designed to complement the [IPython/Jupyter Notebook](http://ipython.org/notebook/) interface, though it can be used just as well separately. This web page and all the [HoloViews Tutorials](Tutorials/) are runnable notebooks, which allow you to interleave text, Python code, and graphical results easily. With HoloViews, you can put a minimum of code in the notebook (typically one or two lines per subfigure), specifying what you would like to see rather than the details of how it should be plotted. HoloViews makes the IPython Notebook a practical solution for both exploratory research (since viewing nearly any chunk of data just takes a line or two of code) and for long-term [reproducibility](Tutorials/Exporting.html) of the work (because both the code and the visualizations are preserved in the notebook file forever, and the data and publishable figures can both easily be exported to an archive on disk). See the [Tutorials](Tutorials/) for detailed examples, and then start enjoying working with your data!"
73+
"This functionality is designed to complement the [IPython/Jupyter Notebook](http://ipython.org/notebook) interface, though it can be used just as well separately. This web page and all the [HoloViews Tutorials](Tutorials/) are runnable notebooks, which allow you to interleave text, Python code, and graphical results easily. With HoloViews, you can put a minimum of code in the notebook (typically one or two lines per subfigure), specifying what you would like to see rather than the details of how it should be plotted. HoloViews makes the IPython Notebook a practical solution for both exploratory research (since viewing nearly any chunk of data just takes a line or two of code) and for long-term [reproducibility](Tutorials/Exporting.html) of the work (because both the code and the visualizations are preserved in the notebook file forever, and the data and publishable figures can both easily be exported to an archive on disk). See the [Tutorials](Tutorials/) for detailed examples, and then start enjoying working with your data!"
7474
]
7575
}
7676
],

doc/Tutorials/Sampling_Data.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"cell_type": "markdown",
168168
"metadata": {},
169169
"source": [
170-
"For data defined in a 2D space, there are 2D equivalents of the 1D Curve and Scatter types. A ``Path``, for example, can be thought of as a line in a 2D space. It may therefore be sliced along both dimensions:"
170+
"For data defined in a 2D space, there are 2D equivalents of the 1D Curve and Scatter types. A ``Points``, for example, can be thought of as a number of points in a 2D space."
171171
]
172172
},
173173
{
@@ -180,7 +180,7 @@
180180
"source": [
181181
"r = np.arange(0, 1, 0.005)\n",
182182
"xs, ys = (r * fn(85*np.pi*r) for fn in (np.cos, np.sin))\n",
183-
"paths = hv.Path((xs, ys))\n",
183+
"paths = hv.Points((xs, ys))\n",
184184
"paths + paths[0:1, 0:1]"
185185
]
186186
},

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
ASSETS_URL = 'http://assets.holoviews.org'
3030

3131
rst_epilog = """
32-
.. _tutorial notebooks: {url}/Tutorials/notebooks-{version}.zip
32+
.. _tutorial notebooks: {url}/notebooks-{version}.zip
3333
""".format(url=ASSETS_URL, version=version)
3434

3535
# Override IOAM theme

doc/latest_news.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<br/>
1010
May 14th 2015:
1111
<a href="http://scipy2015.scipy.org/ehome/115969/292868/">Talk</a>
12-
and <a href="http://goo.gl/NH9FTB">paper</a> on HoloViews to
13-
appear at the SciPy 2015 conference.
12+
and <a href="http://conference.scipy.org/proceedings/scipy2015/pdfs/jean-luc_stevens.pdf">paper</a> on HoloViews to appear at the SciPy 2015 conference.
1413
<br/>
1514
Mar 19th 2015: HoloViews now available on <a href="https://cloud.sagemath.com">SageMathCloud</a>.
1615
<br/>

0 commit comments

Comments
 (0)