Changeset 89 for Deliverables

Timestamp:

Sep 20, 2010, 11:48:03 AM (9 years ago)

Author:

mulligan

Message:

Fixed a really annoying bug in vect_to_int and int_to_vect

Location:

Deliverables/D4.1

Files:

• BitVectors.ml (modified) (1 diff)
• BitVectors.mli (modified) (1 diff)

Deliverables/D4.1/BitVectors.ml

@@ -95 +95 @@
   in
     aux 1 (List.rev v)
+
+let size_lookup =
+  function
+    `Four -> 4
+  | `Seven -> 7
+  | `Eight -> 8
+  | `Eleven -> 11
+  | `Sixteen -> 16
+
+let rec pow v p =
+  if p = 0 then
+    1
+  else
+    v * (pow v (p - 1))
+
+let divide_with_remainder x y = (x / y, x mod y)
+
+let rec aux i =
+  if i < 0 then
+    raise (Invalid_argument "Negative index")
+  else
+    let (d, r) = divide_with_remainder i 2 in
+      if (d, r) = (0, 0) then
+        []
+      else if r = 0 then
+        false :: aux d
+      else
+        true :: aux d
+
+let rec pad i l =
+  match i with
+    0 -> l
+  | n -> false :: (pad (i - 1) l)
+
+let vect_of_int i size =
+  let big_list = List.rev (aux i) in
+    if List.length big_list > (size_lookup size) then
+      raise (Invalid_argument "Size not big enough")
+    else
+      let diff = (size_lookup size) - (List.length big_list) in
+        pad diff big_list
+    

Deliverables/D4.1/BitVectors.mli

@@ -25 +25 @@
 
 val int_of_vect: 'a vect -> int
-val vect_of_int: int -> 'a -> 'a vect
+val vect_of_int: int -> [`Four | `Seven | `Eight | `Eleven | `Sixteen ] -> [`Four | `Seven | `Eight | `Eleven | `Sixteen ] vect
 
 val (-&-): 'a vect -> 'a vect -> 'a vect