fix bad version of clpr.pl

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1435 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

LGPL/clpr/clpr.pl

@@ -1,10 +1,135 @@
-
-:- load_files(library(swi),[silent(true)]).
-
-:- yap_flag(unknown,error).
-
-:- include('clpr.pl').
-
-
-
-
+/*  $Id: clpr.pl,v 1.2 2005-11-01 18:43:09 vsc Exp $
+
+    Part of CPL(R) (Constraint Logic Programming over Reals)
+
+    Author:        Leslie De Koninck
+    E-mail:        Tom.Schrijvers@cs.kuleuven.ac.be
+    WWW:           http://www.swi-prolog.org
+		   http://www.ai.univie.ac.at/cgi-bin/tr-online?number+95-09
+    Copyright (C): 2004, K.U. Leuven and
+		   1992-1995, Austrian Research Institute for
+		              Artificial Intelligence (OFAI),
+			      Vienna, Austria
+
+    This software is part of Leslie De Koninck's master thesis, supervised
+    by Bart Demoen and daily advisor Tom Schrijvers.  It is based on CLP(Q,R)
+    by Christian Holzbaur for SICStus Prolog and distributed under the
+    license details below with permission from all mentioned authors.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    As a special exception, if you link this library with other files,
+    compiled with a Free Software compiler, to produce an executable, this
+    library does not by itself cause the resulting executable to be covered
+    by the GNU General Public License. This exception does not however
+    invalidate any other reasons why the executable file might be covered by
+    the GNU General Public License.
+*/
+
+
+:- module(clpr,
+	[
+		{}/1, 
+		maximize/1,
+		minimize/1, 
+		inf/2, inf/4, sup/2, sup/4,
+		bb_inf/3,
+		bb_inf/5,
+		ordering/1,
+		entailed/1,
+		dump/3, projecting_assert/1
+	]).
+
+%
+% Don't report export of private predicates from clpr
+%
+:- multifile 
+	user:portray_message/2.
+
+:- dynamic
+	user:portray_message/2.
+%
+user:portray_message(warning,import(_,_,clpr,private)).
+
+:- load_files([ 'clpr/arith_r',
+		'clpr/itf3',
+		'clpr/store',
+		'clpr/geler',
+		'clpr/nfr',
+		'clpr/class',
+		'clpr/nf',
+		'clpr/project',
+		'clpr/bv',
+		'clpr/ineq',
+		'clpr/redund',
+		'clpr/fourmotz',
+		'clpr/bb',
+		'clpr/dump'
+	      ],
+	      [ if(not_loaded),
+		silent(true)
+	      ]).
+
+
+		 /*******************************
+		 *	 TOPLEVEL PRINTING	*	
+		 *******************************/
+
+:- multifile
+	prolog:message/3.
+
+% prolog:message(query(YesNo)) --> !,
+% 	['~@'-[chr:print_all_stores]],
+%         '$messages':prolog_message(query(YesNo)).
+
+prolog:message(query(YesNo,Bindings)) --> !,
+	{ dump_toplevel_bindings(Bindings,Constraints)},
+	{ dump_format(Constraints,Format) },
+  { write( vsc:Format),nl },
+	Format,
+        '$messages':prolog_message(query(YesNo,Bindings)).
+
+dump_toplevel_bindings(Bindings,Constraints) :-
+	dump_vars_names(Bindings,[],Vars,Names),
+	dump(Vars,Names,Constraints).
+
+dump_vars_names([],_,[],[]).
+dump_vars_names([Name=Term|Rest],Seen,Vars,Names) :-
+	( var(Term), 
+	  (
+		get_attr(Term,itf3,_)
+	  ;
+		get_attr(Term,geler_r,_)
+	  ),
+	  \+ memberchk_eq(Term,Seen) ->
+		Vars = [Term|RVars],
+		Names = [Name|RNames],
+		NSeen = [Term|Seen]
+	;
+		Vars = RVars,
+		Names = RNames,
+		Seen = NSeen
+	),
+	dump_vars_names( Rest,NSeen,RVars,RNames).
+
+dump_format([],[]).
+dump_format([X|Xs],['{~w}'-[X],nl|Rest]) :-
+	dump_format(Xs,Rest).
+
+memberchk_eq(X, [Y|Ys]) :-
+   (   X == Y
+   ->  true
+   ;   memberchk_eq(X, Ys)
+   ).