Skip to content

Commit eac61aa

Browse files
committed
Fixing few formatting issues
1 parent da4af3f commit eac61aa

File tree

7 files changed

+606
-32
lines changed

7 files changed

+606
-32
lines changed

examples/intro/06_simple_plot.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
pl.plot(X, C)
88
pl.plot(X, S)
99

10-
pl.show()
10+
#pl.show()
11+
pl.savefig("foo.png")

html/intro.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
<link rel="stylesheet" href="css/reveal.css">
18-
<link rel="stylesheet" href="css/theme/default.css" id="theme">
18+
<link rel="stylesheet" href="css/theme/serif.css" id="theme">
1919

2020
<!-- For syntax highlighting -->
2121
<link rel="stylesheet" href="lib/css/xcode.css">

markdown/intro/building_blocks.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ that can be combined to obtain a scientific computing environment:
2727

2828

2929

30-
![image](/figures/intro/snapshot_ipython.png)
30+
![image](../figures/intro/snapshot_ipython.png)
3131
- **IPython**, an advanced **Python shell**
32-
[http://ipython.scipy.org/moin](http://ipython.scipy.org/moin)/
32+
[http://ipython.org](http://ipython.org)/
3333

3434

3535

@@ -45,9 +45,9 @@ that can be combined to obtain a scientific computing environment:
4545

4646

4747

48-
![image](/figures/intro/random_c.jpg)
48+
![image](../figures/intro/random_c.jpg)
4949
- **Matplotlib** : 2-D visualization, "publication-ready" plots
50-
[http://matplotlib.sourceforge.net](http://matplotlib.sourceforge.net)/
50+
[http://matplotlib.org/](http://matplotlib.org/)
5151

5252

5353

@@ -60,14 +60,17 @@ that can be combined to obtain a scientific computing environment:
6060
[http://pandas.pydata.org](http://pandas.pydata.org)
6161

6262

63-
- **PyTables**:
6463

64+
- **PyTables**: Very large on node files and operations
65+
[http://www.pytables.org/](http://www.pytables.org/)
6566

6667

67-
- **Cython**:
6868

69+
- **Cython**: Compile Typed Python to C and call C functions
70+
[http://cython.org/](http://cython.org/)
6971

7072

71-
![image](/figures/intro/example_surface_from_irregular_data.jpg)
73+
74+
![image](../figures/intro/example_surface_from_irregular_data.jpg)
7275
- **Mayavi** : 3-D visualization
7376
[http://code.enthought.com/projects/mayavi](http://code.enthought.com/projects/mayavi)/

markdown/intro/intro.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
Introduction
2-
============
3-
41
Introduction to Python
52
------------
63

@@ -13,3 +10,12 @@ a computational scientist.
1310

1411

1512

13+
### Sources
14+
15+
- Scipy Lectures [http://scipy-lectures.github.io](scipy-lectures.github.io)
16+
- Software Carpentry [https://github.com/swcarpentry/boot-camps](https://github.com/swcarpentry/boot-camps)
17+
18+
### See also
19+
20+
- Scipy Conference Tutorials: [http://conference.scipy.org/scipy2013/tutorials_schedule.php](http://conference.scipy.org/scipy2013/tutorials_schedule.php)
21+

markdown/intro/matplotlib.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Matplotlib - Plotting
99

1010

1111
Simple plot
12-
<img src="/figures/intro/simple_plot.png" style="width: 600px;"/>
12+
<img src="../figures/intro/simple_plot.png" style="width: 600px;"/>
1313
```python
1414
import pylab as pl
1515
import numpy as np
@@ -49,7 +49,7 @@ pl.show()
4949

5050

5151
Change linestyles
52-
<img src="/figures/intro/simple_plot_cust.png" style="width: 600px;"/>
52+
<img src="../figures/intro/simple_plot_cust.png" style="width: 600px;"/>
5353
```python
5454
pl.figure(figsize=(10, 6), dpi=80)
5555
pl.plot(X, C, color="blue", linewidth=2.5, linestyle="-")
@@ -59,7 +59,7 @@ pl.plot(X, S, color="red", linewidth=2.5, linestyle="-")
5959

6060

6161
Adding legend
62-
<img src="/figures/intro/simple_plot_legend.png" style="width: 600px;"/>
62+
<img src="../figures/intro/simple_plot_legend.png" style="width: 600px;"/>
6363
```python
6464
pl.plot(X, C, color="blue", linewidth=2.5, linestyle="-", label="cosine")
6565
pl.plot(X, S, color="green", linewidth=2.5, linestyle="--", label="sine") # Set x limits
@@ -69,7 +69,7 @@ pl.legend(loc='upper left')
6969

7070

7171
Moving splines
72-
<img src="/figures/intro/simple_plot_cust2.png" style="width: 600px;"/>
72+
<img src="../figures/intro/simple_plot_cust2.png" style="width: 600px;"/>
7373
```python
7474
ax = pl.gca() # gca stands for 'get current axis'
7575
ax.spines['right'].set_color('none')
@@ -83,7 +83,7 @@ ax.spines['left'].set_position(('data',0))
8383

8484

8585
Histograms
86-
<img src="/figures/intro/hist.png" style="width: 600px;"/>
86+
<img src="../figures/intro/hist.png" style="width: 600px;"/>
8787

8888
```python
8989
import pylab as pl
@@ -95,7 +95,7 @@ pl.show()
9595

9696

9797
Add a fit line and legend
98-
<img src="/figures/intro/hist_legend_fit.png" style="width: 600px;"/>
98+
<img src="../figures/intro/hist_legend_fit.png" style="width: 600px;"/>
9999
```python
100100
n, bins, patches = pl.hist(pl.randn(1000), 40, normed=1)
101101
l, = pl.plot(bins, pl.normpdf(bins, 0.0, 1.0), 'r--', label='fit', linewidth=3)
@@ -104,20 +104,22 @@ legend([l, patches[0]], ['fit', 'hist'])
104104

105105

106106

107-
Other types of plots include
108-
- Scatter
109-
- Bar
110-
- Pie
111-
- Sankey
112-
- Images
113-
- Quivers
114-
- Multiplots
115-
- Polar
116-
- 3D
107+
Other types of plots include:
108+
109+
* Scatter
110+
* Bar
111+
* Pie
112+
* Sankey
113+
* Images
114+
* Quivers
115+
* Multiplots
116+
* Polar
117+
* 3D
117118

118119

119120

120121
Other elements to know about:
122+
121123
- Ticks: control how the ticks look
122124
- Annotations: Add visual elements to your plot
123125
- Axes: draw plots on top of themselves

markdown/intro/numpy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NumPy
44
Python library that provides multi-dimensional arrays, tables, and matrices for Python
55

66
<center>
7-
![image](/figures/intro/array1D.2.lightbg.png)
7+
![image](../figures/intro/array1D.2.lightbg.png)
88
</center>
99

1010
- Contiguous or strided arrays
@@ -31,7 +31,7 @@ Python library that provides multi-dimensional arrays, tables, and matrices for
3131
### NumPy Ecosystem
3232

3333
<center>
34-
![image](/figures/intro/ecosystem.lightbg.png)
34+
![image](../figures/intro/ecosystem.lightbg.png)
3535
</center>
3636

3737

0 commit comments

Comments
 (0)