Merge 197c4ed into a0ef97d

SciML · Jul 28, 2016 · acb2633 · acb2633
2 parents a0ef97d + 197c4ed
commit acb2633
Show file tree

Hide file tree

Showing 5 changed files with 603 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,8 @@ The examples directory contain a few notebooks that show how to get started. You
 * [Simple differential equation](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Simple_Differential_Equation.ipynb)
 * [Lorenz Attractor](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Lorenz_Attractor.ipynb)
 * [Terminal Velocity](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Terminal_Velocity.ipynb)
+* [Duffing oscillator](http://nbviewer.jupyter.org/github/YingboMa/ODE.jl/blob/57689392f2a03d713b9d3f38cdef37855c816457/examples/Duffing_oscillator.ipynb)
+* [Van der Pol oscillator](http://nbviewer.jupyter.org/github/YingboMa/ODE.jl/blob/57689392f2a03d713b9d3f38cdef37855c816457/examples/Van_der_Pol_oscillator.ipynb)
 
 # Need something long-term reliable right now?
 

diff --git a/examples/Duffing_oscillator.ipynb b/examples/Duffing_oscillator.ipynb
diff --git a/examples/README.md b/examples/README.md
@@ -8,3 +8,5 @@ You can also directly see the result without installing anything. Just follow th
 * [Simple differential equation](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Simple_Differential_Equation.ipynb)
 * [Lorenz Attractor](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Lorenz_Attractor.ipynb)
 * [Terminal Velocity](http://nbviewer.jupyter.org/github/JuliaLang/ODE.jl/blob/master/examples/Terminal_Velocity.ipynb)
+* [Duffing oscillator](http://nbviewer.jupyter.org/github/YingboMa/ODE.jl/blob/57689392f2a03d713b9d3f38cdef37855c816457/examples/Duffing_oscillator.ipynb)
+* [Van der Pol oscillator](http://nbviewer.jupyter.org/github/YingboMa/ODE.jl/blob/57689392f2a03d713b9d3f38cdef37855c816457/examples/Van_der_Pol_oscillator.ipynb)
diff --git a/examples/Simple_Differential_Equation.ipynb b/examples/Simple_Differential_Equation.ipynb
@@ -177,15 +177,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 0.4.3",
+   "display_name": "Julia 0.4.7-pre",
    "language": "julia",
    "name": "julia-0.4"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "0.4.3"
+   "version": "0.4.7"
   }
  },
  "nbformat": 4,

diff --git a/examples/Van_der_Pol_oscillator.ipynb b/examples/Van_der_Pol_oscillator.ipynb