Commit f57ad96b authored by Benoit Barbot's avatar Benoit Barbot
Browse files

progress

parent 2be0f3dc
Pipeline #1680 passed with stages
in 50 seconds
......@@ -185,6 +185,7 @@ module Make (Bt: ZoneGraphInput.BoundType) (P: WeightStructure) = struct
| _ -> failwith "fail to evaluate"
let comp_lim (cl,dl,vl) (dcl,ddl,dvl) =
(*Format.printf "dom1: %i,%i,%s, dom2: %i:%i:%s@." cl dl (F.to_string vl) dcl ddl (F.to_string dvl);*)
if dcl - cl < 0 then F.zero
else if dcl -cl = 0 then (
if ddl - dl < 0 then F.zero
......@@ -198,7 +199,8 @@ module Make (Bt: ZoneGraphInput.BoundType) (P: WeightStructure) = struct
let w = weights.(rg.init) in
let dw = diff w svar in
let ddw = diff dw svar in
(*Format.printf "weight: %a dweight: %a@." P.print w P.print dw;*)
(* computing limit for s -> -infty and s -> + infty *)
let low_w,high_w = dominating_s w in
let low_dw,high_dw = dominating_s dw in
......@@ -210,7 +212,6 @@ module Make (Bt: ZoneGraphInput.BoundType) (P: WeightStructure) = struct
let calc =
(* When s close to 0 use a taylor expansion to compute the duration*)
if abs_float s <= 0.1 then
let svar = var_of_int (P.nb_var-1) in
let we = taylor_exp_s w rg.nb_poly in
(*Format.printf "vte: %a@." P.print we;*)
let de = taylor_exp_s dw (rg.nb_poly+1) in
......
......@@ -89,6 +89,10 @@ let _ = run @@ fun () ->
let g2 = Scanf.unescaped g in
Js.Unsafe.fun_call (Js.Unsafe.js_expr "loadVis")
[|Js.Unsafe.inject container; Js.Unsafe.inject (Js.string g2) |]
| Error (Failure s) ->
outfile_up "";
sig_up [];
alert_up [text "Failure : "; text s]
| Error exn ->
outfile_up "";
sig_up [];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment