diff --git a/Algo/Séminaire/Exercices sémaines.md b/Algo/Séminaire/Exercices sémaines.md index c20e84c..5057a85 100644 --- a/Algo/Séminaire/Exercices sémaines.md +++ b/Algo/Séminaire/Exercices sémaines.md @@ -51,10 +51,13 @@ val stammer: int -> int = ## Exercice 2.6 ```Ocaml -let sef_of_time h m s = +let sec_of_time h m s = h*3600 + m*60 + s ;; let time_of_sec s = - let hours = s/3600 and minutes = s mod 60 and seconds = s mod 3600 in (hours, minutes, seconds) + let hours = s/3600 in let minutes = (s - hours*3600)/60 in let seconds = s - hours *3600 - minutes * 60 in (hours, minutes, seconds);; + +let add_times h1 m1 s1 h2 m2 s2 = + let sec1 = sec_of_time(h1 m1 s1) and sec2 = sec_of_time(h2 m2 s2) in let resultsec = sec1 + sec2 in time_of_sec(resultsec) ;; ```