LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2024-12-22 20:35:19 +01:00
Code Issues Releases Wiki Activity

Bug in verification of Zmatrix corrected

Browse Source
This commit is contained in:
Anthony Scemama 2016-09-09 00:03:04 +02:00
parent 84f8556d8d
commit c510c04581
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocaml/Zmatrix.ml
View File

@ -133,6 +133,7 @@ let of_string t =
let l = let l =
match l with match l with
| First _ :: Second _ :: Third _ :: _ | First _ :: Second _ :: Third _ :: _
| First _ :: Second _ :: Coord _ :: []
| First _ :: Second _ :: [] | First _ :: Second _ :: []
| First _ :: [] -> l | First _ :: [] -> l
| _ -> failwith "Syntax error" | _ -> failwith "Syntax error"
@ -312,15 +313,14 @@ let to_xyz (z,map) =
| Some x -> x | Some x -> x
| None -> failwith "Some atoms were not defined" ) result | None -> failwith "Some atoms were not defined" ) result
in in
result Array.to_list result
let to_xyz_string (l,map) = let to_xyz_string (l,map) =
String.concat "\n" String.concat "\n"
( to_xyz (l,map) ( to_xyz (l,map)
|> Array.map (fun (e,x,y,z) -> |> List.map (fun (e,x,y,z) ->
Printf.sprintf "%s %f %f %f\n" (Element.to_string e) x y z) Printf.sprintf "%s %f %f %f\n" (Element.to_string e) x y z) )
|> Array.to_list )