Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adding fluxes computation as perturbations

  • Loading branch information...
commit 91d30f51ad91c7e966c69ffeaecfe74169814f53 1 parent 995ce22
Jean Krivine authored
Showing with 42 additions and 9 deletions.
  1. +31 −0 .paths
  2. +8 −8 .project
  3. +1 −1  grammar/eval.ml
  4. +2 −0  pattern/dynamics.ml
View
31 .paths
@@ -1,3 +1,4 @@
+/bin
/opt/local/lib/ocaml
.
siteGraphs
@@ -13,3 +14,33 @@ grammar
dataStructures
cflow
Error
+Error
+cflow
+dataStructures
+grammar
+main
+man
+man/bib
+man/img
+models
+models/dna
+models/nonlocal
+models/out
+pattern
+simulation
+siteGraphs
+Error
+cflow
+dataStructures
+grammar
+main
+man
+man/bib
+man/img
+models
+models/dna
+models/nonlocal
+models/out
+pattern
+simulation
+siteGraphs
View
16 .project
@@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>Ocaml.ocamlMakefileBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>ocaml.ocamlnatureMakefile</nature>
- </natures>
+ <name>Ocaml.ocamlMakefileBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>ocaml.ocamlnatureMakefile</nature>
+ </natures>
</projectDescription>
View
2  grammar/eval.ml
@@ -839,7 +839,7 @@ let pert_of_result variables env res =
| None -> ExceptionDefn.warning ~with_pos:pos "Causality mode is enabled at a single event, \"until\" condition is probably missing."
in
(env,None)
- | Dynamics.UPDATE _ | Dynamics.SNAPSHOT _ | Dynamics.STOP _ ->
+ | Dynamics.UPDATE _ | Dynamics.SNAPSHOT _ | Dynamics.STOP _ | Dynamics.FLUX _ ->
let env =
DepSet.fold
(fun dep env -> Environment.add_dependencies dep (Mods.PERT p_id) env
View
2  pattern/dynamics.ml
@@ -131,6 +131,7 @@ and modification =
| SNAPSHOT of string option
| STOP of string option
| CFLOW of int
+ | FLUX of string option
and boolean_variable = BCONST of bool | BVAR of ((int -> float) -> (int -> float) -> float -> int -> int -> float -> bool)
let string_of_pert pert env =
@@ -140,6 +141,7 @@ let string_of_pert pert env =
| UPDATE (r_id,_) -> Printf.sprintf "UPDATE rule[%d]" r_id
| SNAPSHOT opt -> (match opt with None -> "SNAPSHOT" | Some s -> "SNAPSHOT("^s^")")
| STOP opt -> (match opt with None -> "STOP" | Some s -> "STOP("^s^")")
+ | FLUX opt -> (match opt with None -> "FLUX" | Some s -> "FLUX("^s^")")
| CFLOW id -> let nme = try Environment.rule_of_num id env with Not_found -> Environment.kappa_of_num id env in ("CFLOW "^nme)
Please sign in to comment.
Something went wrong with that request. Please try again.