summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJovina2011-07-28 17:03:04 +0530
committerJovina2011-07-28 17:03:04 +0530
commit68f3741c2fd2acc79089ffaaa88e85632e0ba23b (patch)
tree364e823275e51c298db53391465ddef1005b9a23
parenta967e341eaf683b27c92b5e4817cb62f3f14e572 (diff)
parentcc476c4e86346ca0d92e72cd84efb7d3e90069ac (diff)
downloadst-scripts-68f3741c2fd2acc79089ffaaa88e85632e0ba23b.tar.gz
st-scripts-68f3741c2fd2acc79089ffaaa88e85632e0ba23b.tar.bz2
st-scripts-68f3741c2fd2acc79089ffaaa88e85632e0ba23b.zip
Merge branch 'master' of https://github.com/FOSSEE/st-scripts
-rw-r--r--getting_started_with_for/script.rst7
-rw-r--r--getting_started_with_lists/script.rst10
-rw-r--r--getting_started_with_symbolics/script.rst33
-rw-r--r--matrices/script.rst4
-rw-r--r--template/script.rst2
5 files changed, 28 insertions, 28 deletions
diff --git a/getting_started_with_for/script.rst b/getting_started_with_for/script.rst
index c3eecc1..ad7f0a6 100644
--- a/getting_started_with_for/script.rst
+++ b/getting_started_with_for/script.rst
@@ -67,10 +67,9 @@ tutorial on "Getting started with Lists".
In Python whitespace is significant, and the blocks are visually
separated.The best practice is to indent the code using four spaces.
-As you can see in the slide, “Block B” is an inner block, indented by
-4 spaces.
-After “Block B” the next statement in ”Block A” starts from the same
-indentation level of other ”Block A” Statements.
+As you can see in the slide, "Block B" is an inner block, indented by
+4 spaces. After "Block B" the next statement in "Block A" starts from
+the same indentation level of other "Block A" Statements.
.. R4
diff --git a/getting_started_with_lists/script.rst b/getting_started_with_lists/script.rst
index 2264d45..a6cbce0 100644
--- a/getting_started_with_lists/script.rst
+++ b/getting_started_with_lists/script.rst
@@ -188,7 +188,7 @@ Let us find out the length of the list 'nonempty'.
.. L13
::
-
+
len(nonempty)
.. R14
@@ -317,21 +317,21 @@ Here are some self assessment questions for you to solve
And the answers,
1. We create an empty list just by leaving the space inside the square
-brackets empty.
-::
+ brackets empty.
+ ::
empty=[]
2. Yes.List can contain all the other data types, including list.
Here is an example
-::
+ ::
list_in_list=[2.3,[2,4,6],'string,'all datatypes can be there']
3. Using negative indices, we can access the list from the end using
negative indices.
This is an example
-::
+ ::
nonempty = ['spam', 'eggs', 100, 1.234]
nonempty[-1]
diff --git a/getting_started_with_symbolics/script.rst b/getting_started_with_symbolics/script.rst
index 5df89fa..2123ba0 100644
--- a/getting_started_with_symbolics/script.rst
+++ b/getting_started_with_symbolics/script.rst
@@ -271,7 +271,7 @@ Evaluating this function f for the value x=pi returns pi/2.
.. L22
::
-
+
f(pi)
.. R23
@@ -342,11 +342,12 @@ Pause the video here, try out the following exercise and resume the video.
.. R28
-Define the piecewise function.
- f(x)=3x+2
- when x is in the closed interval 0 to 4.
- f(x)=4x^2
- between 4 to 6.
+Define the piecewise function
+
+::
+
+ f(x)=3x+2 when x is in the closed interval 0 to 4.
+ f(x)=4x^2 between 4 to 6.
Sum of 1/(n^2-1) where n ranges from 1 to infinity.
@@ -359,13 +360,13 @@ Sum of 1/(n^2-1) where n ranges from 1 to infinity.
The solution is on your screen
-var(’x’)
+var('x')
h(x)=3*x+2
g(x)= 4*x^2
-f=Piecewise([[(0,4),h(x)],[(4,6),g(x)]],x)
+f = Piecewise([[(0,4),h(x)],[(4,6),g(x)]],x)
f
-var(’n’)
+var('n')
f=1/(n^2-1)
sum(f(n), n, 1, oo)
@@ -512,14 +513,14 @@ Find x
The solution is on your screen
-var(’x’)
+var('x')
f(x)= x^5*log(x^7)
diff(f(x),x,5)
-var(’x’)
+var('x')
integral(x*sin(x^2),x)
-var(’x’)
+var('x')
f=cos(x^2)-log(x)
find_root(f(x)==0,1,2)
@@ -574,7 +575,7 @@ Pause the video here, try out the following exercise and resume the video.
The solution is on your screen
-var(’x,y,z’)
+var('x,y,z')
A=matrix([[x,0,1],[y,1,0],[z,0,y]])
A.det()
A.inverse()
@@ -630,18 +631,18 @@ Here are some self assessment questions for you to solve
And the answers,
1. We define a symbol using the function ``var``.In this case it will be
-::
+ ::
var('y')
2. The value of pi upto precision 5 digits is given as,
-::
+ ::
n(pi,5)
3. The third order differential function can be found out by adding the
third argument which states the order.The syntax will be,
-::
+ ::
diff(f(x),x,3)
diff --git a/matrices/script.rst b/matrices/script.rst
index 0979882..ac8c455 100644
--- a/matrices/script.rst
+++ b/matrices/script.rst
@@ -456,8 +456,8 @@ The eigen values can also be computed using the function ``eigvals()`` as,
Now let us learn how to do the singular value decomposition or S V D
of a matrix.
-Suppose M is an mn matrix, whose entries come from the field K, which
-is either the field of real numbers or the field of complex
+Suppose M is an m (cross) n matrix, whose entries come from the field
+K, which is either the field of real numbers or the field of complex
numbers. Then there exists a factorization of the form
M = U\Sigma V star
diff --git a/template/script.rst b/template/script.rst
index d3c81b6..12b18fc 100644
--- a/template/script.rst
+++ b/template/script.rst
@@ -72,6 +72,6 @@ This brings us to the end of this tutorial.In this tutorial,we have learnt to,
-{{{ Show the "thank you” slide}}}
+{{{ Show the "thank you" slide}}}
Hope you have enjoyed and found it useful. Thank you!