Diff of /trunk/Toss/Solver/Structure.mli [r1812] .. [r1813]  Maximize  Restore

  Switch to side-by-side view

--- a/trunk/Toss/Solver/Structure.mli
+++ b/trunk/Toss/Solver/Structure.mli
@@ -121,21 +121,9 @@
 (** Print the elements [e] as string. *)
 val elem_str : structure -> int -> string
 
-(** Print the tuple [tp] as string. When [with_paren] is set to false,
-   avoid printing parentheses around one-element tuple. *)
-val tuple_str : ?with_paren:bool -> structure -> int array -> string
-
-(** Print the relation named [rel_name] with tuples [ts] as
-   string. Unless [print_arity] is false, print the arity if [ts] is
-   empty. *)
+(** Print the relation named [rel_name] with tuples [ts] as string.
+    Unless [print_arity] is false, print the arity if [ts] is empty. *)
 val rel_str : ?print_arity:bool -> structure -> string -> Tuples.t -> string
-
-(** Print the function named [fun_name] with values [vals] as string. *)
-val fun_str :
-  structure -> string -> float IntMap.t  -> string
-
-(** Print relational signature. *)
-val sig_str : structure -> string
 
 (** Print the structure [struc] as string, in extensive form (not using
     condensed representations like boards). If [show_empty] is false,
@@ -145,9 +133,9 @@
 (** Print the structure [struc] as string. *)
 val str : ?show_empty:bool -> structure -> string
 
-
-val fprint_rel :
-  ?print_arity:bool -> structure -> Format.formatter ->
+(** Print the relation with tuples [ts].
+    Unless [print_arity] is false, print the arity if [ts] is empty. *)
+val fprint_rel : ?print_arity:bool -> structure -> Format.formatter ->
   string * Tuples.t -> unit
 
 val fprint_fun :
@@ -244,14 +232,16 @@
 (** {2 Global function to create structures from lists} *)
 
 val create_from_lists : ?struc:structure -> string list ->
-  (string * int option * string array list) list ->
+  (string * int option * string array list, string * string) Aux.choice list ->
   (string * (string * float) list) list -> structure
 
-val create_from_lists_position: ?struc:structure ->
-  string list -> (string * int option * string array list) list -> structure
-
-val create_from_lists_range: float -> ?struc:structure ->
-  string list -> (string * int option * string array list) list -> structure
+val create_from_lists_position: ?struc:structure -> string list ->
+  (string * int option * string array list, string * string) Aux.choice list -> 
+  structure
+
+val create_from_lists_range: float -> ?struc:structure -> string list ->
+  (string * int option * string array list, string * string) Aux.choice list ->
+  structure
 
 
 (** {2 Removing relation tuples and elements from a structure} *)

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks