Skip to content

Commit 639c035

Browse files
committed
Merge branch 'redesign'
2 parents ed79413 + f3e5a97 commit 639c035

58 files changed

Lines changed: 956 additions & 1011 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ SimJulia
55

66
#### Build Status
77

8-
[![Build Status](https://travis-ci.org/BenLauwens/SimJulia.jl.svg?branch=master)](https://travis-ci.org/BenLauwens/SimJulia.jl)
9-
[![Build status](https://ci.appveyor.com/api/projects/status/djuiegytv44pr54c/branch/master?svg=true)](https://ci.appveyor.com/project/BenLauwens/simjulia-jl)
8+
[![Build Status](https://travis-ci.org/BenLauwens/SimJulia.jl.svg?branch=redesign)](https://travis-ci.org/BenLauwens/SimJulia.jl)
9+
[![Build status](https://ci.appveyor.com/api/projects/status/djuiegytv44pr54c/branch/redesign?svg=true)](https://ci.appveyor.com/project/BenLauwens/simjulia-jl)
1010

1111

1212
#### Coverage
1313

14-
[![Coverage Status](https://coveralls.io/repos/BenLauwens/SimJulia.jl/badge.svg?branch=master)](https://coveralls.io/r/BenLauwens/SimJulia.jl?branch=master)
15-
[![codecov.io](http://codecov.io/github/BenLauwens/SimJulia.jl/coverage.svg?branch=master)](http://codecov.io/github/BenLauwens/SimJulia.jl?branch=master)
14+
[![Coverage Status](https://coveralls.io/repos/BenLauwens/SimJulia.jl/badge.svg?branch=redesign)](https://coveralls.io/r/BenLauwens/SimJulia.jl?branch=redesign)
15+
[![codecov.io](http://codecov.io/github/BenLauwens/SimJulia.jl/coverage.svg?branch=redesign)](http://codecov.io/github/BenLauwens/SimJulia.jl?branch=redesign)
1616

1717

1818
#### Installation
@@ -39,7 +39,22 @@ julia> Pkg.add("SimJulia")
3939

4040
* Version 0.4 is a complete rewrite: more julian and less pythonic.
4141
* Only supports Julia v0.6 and above.
42-
* Scheduling is based on TimeType and Period.
42+
* Scheduling of events can be done with `Base.Dates.Datetime` and `Base.Dates.Period`:
43+
```
44+
using SimJulia
45+
using Base.Dates
46+
47+
function datetimetest(sim::Simulation)
48+
println(nowDatetime(sim))
49+
yield(Timeout(sim, Day(2)))
50+
println(nowDatetime(sim))
51+
end
52+
53+
datetime = now()
54+
sim = Simulation(datetime)
55+
@process datetimetest(sim)
56+
run(sim, datetime+Month(3))
57+
```
4358
* The discrete event features are on par with version 0.3. (STABLE)
4459
* Two ways of making `Processes` are provided:
4560
- using the existing concept of `Tasks`:
@@ -55,7 +70,7 @@ julia> Pkg.add("SimJulia")
5570
end
5671
5772
sim = Simulation()
58-
@Process fibonnaci(sim)
73+
@process fibonnaci(sim)
5974
run(sim, 10)
6075
```
6176
- using a novel finite-statemachine approach:
@@ -71,7 +86,7 @@ julia> Pkg.add("SimJulia")
7186
end
7287
7388
sim = Simulation()
74-
@Coroutine fibonnaci(sim)
89+
@coroutine fibonnaci(sim)
7590
run(sim, 10)
7691
```
7792
* The continuous time simulation is based on a quantized state system solver. (EXPERIMENTAL)
@@ -81,7 +96,6 @@ julia> Pkg.add("SimJulia")
8196
#### Todo
8297

8398
* Transparent output processing.
84-
* Extension of continuous integration to PDEs by method of lines Integration.
8599
* Automatically running a large number of simulations (over a parameter space) on a cluster to do simulation based optimisation.
86100

87101

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
julia 0.6
22
DataStructures
3+
TaylorSeries

docs/src/10_min/1_installation.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/src/10_min/2_basic_concepts.md

Lines changed: 0 additions & 62 deletions
This file was deleted.

docs/src/10_min/3_process_interaction.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/src/api.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

docs/src/examples.md

Whitespace-only changes.

docs/src/examples/1_bank_renege.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/src/index.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

docs/src/topics.md

Whitespace-only changes.

0 commit comments

Comments
 (0)