Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 02:38:07 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[Ocaml] Fix compilation warnings.

Browse Source 
While doing that I removed the dependency of editFP on geometry_2d as it
is not being used there.
This commit is contained in:
Piotr Esden-Tempski
2013-12-27 20:11:56 +01:00
committed by Felix Ruess
parent 734c1323b9
commit e02b84234b
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/editFP.ml
+2 -4
View File
@@ -1,9 +1,7 @@
(***************** Editing ONE (single) flight plan **************************)open Printf
(***************** Editing ONE (single) flight plan **************************)
open Printf
open Latlong
module G2D = Geometry_2d
let (//) = Filename.concat
let fp_example = Env.flight_plans_path // "example.xml"
let default_path_maps = Env.paparazzi_home // "data" // "maps"
sw/lib/ocaml/geometry_2d.ml
+7 -7
View File
@@ -298,7 +298,7 @@ let test_on_hl t = (test_in_segment t)||(t=T_OUT_SEG_PT4)||(t=T_OUT_SEG_PT2)
let crossing_seg_seg a b c d =
match crossing_point a (vect_make a b) c (vect_make c d) with
None -> false
| Some (type1, type2, _pt) -> (test_in_segment type1)&&(test_in_segment type2)
| Some (type1, type2, _pt) -> (test_in_segment type1) && (test_in_segment type2)
(* ============================================================================= *)
(* = Teste l'intersection d'un segment (a,b) et d'une demi-droite (c,v) = *)
@@ -346,7 +346,7 @@ let poly_is_closed poly =
(* = Ferme un polygone [A; B; C; D] -> [A; B; C; D; A] = *)
(* ============================================================================= *)
let poly_close poly =
if poly = [] or poly_is_closed poly then poly else poly@[List.hd poly]
if poly = [] || poly_is_closed poly then poly else poly@[List.hd poly]
(* ============================================================================= *)
(* = Ferme un polygone [A; B; C; D] -> [|A; B; C; D; A; B|] = *)
@@ -393,10 +393,10 @@ let convex_hull poly =
in
let plus_proche a b c d =
(d=a) or ((not(c=a)) &
((du_meme_cote b c d a) or (
(d=a) || ((not(c=a)) &&
((du_meme_cote b c d a) || (
let u = vect_make b c and v = vect_make b d in
(det u v)=0.0 & (abs_float(u.x2D)+.abs_float(u.y2D)>
(det u v)=0.0 && (abs_float(u.x2D)+.abs_float(u.y2D)>
abs_float(v.x2D)+.abs_float(v.y2D)))))
in
@@ -412,7 +412,7 @@ let convex_hull poly =
| [] -> raise Exit
in
let p a b = a.x2D<b.x2D or (a.x2D=b.x2D & a.y2D>b.y2D) in
let p a b = a.x2D<b.x2D || (a.x2D=b.x2D && a.y2D>b.y2D) in
let l2=poly in
let debut,_=extract_mini p l2 in
let rec itere a o liste sol =
@@ -640,7 +640,7 @@ let in_tesselation poly =
let a = vertices.(n1) and b = vertices.(n2) in
(* AAA if is_in_cone a b && is_in_cone b a then begin *)
if is_in_cone a b or is_in_cone b a then begin
if is_in_cone a b || is_in_cone b a then begin
let rec f l =
match l with
c::reste ->
sw/lib/ocaml/ocaml_tools.ml
+2 -2
View File
@@ -25,8 +25,8 @@
let pi = 3.14159265358979323846;;
let open_compress file =
if Filename.check_suffix file "gz" or Filename.check_suffix file "Z" or
Filename.check_suffix file "zip" or Filename.check_suffix file "ZIP" then
if Filename.check_suffix file "gz" || Filename.check_suffix file "Z" ||
Filename.check_suffix file "zip" || Filename.check_suffix file "ZIP" then
Unix.open_process_in ("gunzip -c "^file)
else if Filename.check_suffix file "bz2" then
Unix.open_process_in ("bunzip2 -c "^file)