[add] multiple commits merged

# Conflicts:
#	docs/wiki/config/config.yml
#	src/main/scala/scim/Main.scala
#	src/main/scala/scim/archive/Elements.scala
#	src/main/scala/scim/archive/GroundTruth.scala
#	src/main/scala/scim/datastruct/Configuration.scala
#	src/main/scala/scim/lib/Concurrency.scala
This commit is contained in:
2020-01-29 01:19:10 -06:00
parent 00669fa9d3
commit 32438ef5b8
12 changed files with 845 additions and 46 deletions

View File

@@ -3,7 +3,7 @@
## Simulation
* `duration`:`int` - number of simulation ticks, after which everything will be reset to the initial configuration
* `tickfactor`:`int` - used to artificially add ticks by repeating the result of a simulation tick by the given value
* `tickfactor`:`int` - used to artificially add ticks by repeating the calculation of a simulation tick by the given value
* `loop`:`bool` - loop the simulation
* `loopcount`:`int` - amount of loops, `0` for infinite
@@ -59,7 +59,7 @@ Elements:
* `end`:`int` _[optional]_ - last simulation tick before this function is inactive
Alternative condensed of `timeline` notation as `array`: `[start, end]`
Alternative condensed of `value` notation as `array`: `[start, value or None, ...]`
* `delta`:`array` _[optional]_ - function to calculate `value` of the next simulation tick, only called if no value is defined for the next tick. Result is saved as new `value` and passed again to the function for the next tick. If no function is given, the `value` remains
* `delta`:`array` _[optional]_ - function to calculate `value` of the next simulation tick, overwrites any existing value. Result is saved as new `value` and passed again to the function for the next tick. If no function is given, the `value` remains
* `name`:`String` - name of the function. Needs to exist at compile time in a map: `["name" -> (value: double, parentValue: double, args: ...) => double]`
* `args`:`array` - arguments passed to the function in addition to the `value`
* `timeline`:`array` - sets simulation tick when this function is active and turns inactive.