diff --git a/packages/ProbLog/problog.yap b/packages/ProbLog/problog.yap index 1b1e34395..42eb9af8c 100644 --- a/packages/ProbLog/problog.yap +++ b/packages/ProbLog/problog.yap @@ -2,8 +2,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% $Date: 2010-09-29 13:03:26 +0200 (Wed, 29 Sep 2010) $ -% $Revision: 4843 $ +% $Date: 2010-09-30 14:48:30 +0200 (Thu, 30 Sep 2010) $ +% $Revision: 4859 $ % % This file is part of ProbLog % http://dtai.cs.kuleuven.be/problog @@ -313,6 +313,7 @@ % problog related modules :- use_module('problog/variables'). :- use_module('problog/extlists'). +:- use_module('problog/gflags', [flag_store/2]). :- use_module('problog/flags'). :- use_module('problog/print'). :- use_module('problog/os'). @@ -2208,16 +2209,27 @@ problog_max_id(Goal, Prob, Clauses) :- % version with _save at the end renames files for problogbdd to keep them %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% problog_kbest_save(Goal, K, Prob, Status, BDDFile, ParamFile) :- - problog_kbest(Goal, K, Prob, Status), - ( Status=ok -> - problog_flag(bdd_file,InternBDDFlag), - problog_flag(bdd_par_file,InternParFlag), - convert_filename_to_working_path(InternBDDFlag, InternBDD), - convert_filename_to_working_path(InternParFlag, InternPar), - rename_file(InternBDD,BDDFile), - rename_file(InternPar,ParamFile) - ; - true). + problog_flag(dir, InternWorkingDir), + problog_flag(bdd_file, InternBDDFlag), + problog_flag(bdd_par_file, InternParFlag), + split_path_file(BDDFile, WorkingDir, BDDFileName), + split_path_file(ParamFile, _WorkingDir, ParamFileName), + flag_store(dir, WorkingDir), + flag_store(bdd_file, BDDFileName), + flag_store(bdd_par_file, ParamFileName), + problog_kbest(Goal, K, Prob, Status), + flag_store(dir, InternWorkingDir), + flag_store(bdd_file, InternBDDFlag), + flag_store(bdd_par_file, InternParFlag). +% ( Status=ok -> +% problog_flag(bdd_file,InternBDDFlag), +% problog_flag(bdd_par_file,InternParFlag), +% convert_filename_to_working_path(InternBDDFlag, InternBDD), +% convert_filename_to_working_path(InternParFlag, InternPar), +% rename_file(InternBDD,BDDFile), +% rename_file(InternPar,ParamFile) +% ; +% true). problog_kbest(Goal, K, Prob, Status) :- problog_flag(first_threshold,InitT), @@ -2357,23 +2369,34 @@ problog_exact(Goal,Prob,Status) :- problog_control(off, exact). problog_exact_save(Goal,Prob,Status,BDDFile,ParamFile) :- - problog_control(on, exact), + problog_flag(dir, InternWorkingDir), + problog_flag(bdd_file, InternBDDFlag), + problog_flag(bdd_par_file, InternParFlag), + split_path_file(BDDFile, WorkingDir, BDDFileName), + split_path_file(ParamFile, _WorkingDir, ParamFileName), + flag_store(dir, WorkingDir), + flag_store(bdd_file, BDDFileName), + flag_store(bdd_par_file, ParamFileName), + problog_control(on, exact), problog_low(Goal,0,Prob,Status), problog_control(off, exact), - ( - Status==ok - -> - ( - problog_flag(bdd_file,InternBDDFlag), - problog_flag(bdd_par_file,InternParFlag), - problog_flag(dir,DirFlag), - atomic_concat([DirFlag,InternBDDFlag],InternBDD), - atomic_concat([DirFlag,InternParFlag],InternPar), - rename_file(InternBDD,BDDFile), - rename_file(InternPar,ParamFile) - ); - true - ). + flag_store(dir, InternWorkingDir), + flag_store(bdd_file, InternBDDFlag), + flag_store(bdd_par_file, InternParFlag). +% ( +% Status==ok +% -> +% ( +% problog_flag(bdd_file,InternBDDFlag), +% problog_flag(bdd_par_file,InternParFlag), +% problog_flag(dir,DirFlag), +% atomic_concat([DirFlag,InternBDDFlag],InternBDD), +% atomic_concat([DirFlag,InternParFlag],InternPar), +% rename_file(InternBDD,BDDFile), +% rename_file(InternPar,ParamFile) +% ); +% true +% ). problog_collect_trie(Goal):- problog_call(Goal), diff --git a/packages/ProbLog/problog/logger.yap b/packages/ProbLog/problog/logger.yap index 6af370739..4a1795e80 100644 --- a/packages/ProbLog/problog/logger.yap +++ b/packages/ProbLog/problog/logger.yap @@ -2,8 +2,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% $Date: 2010-09-28 21:04:43 +0200 (Tue, 28 Sep 2010) $ -% $Revision: 4838 $ +% $Date: 2010-09-30 13:50:45 +0200 (Thu, 30 Sep 2010) $ +% $Revision: 4857 $ % % This file is part of ProbLog % http://dtai.cs.kuleuven.be/problog @@ -217,7 +217,8 @@ logger_write_data/0, logger_write_header/0, logger_variable_is_set/1, - logger_add_to_variable/2]). + logger_add_to_variable/2, + logger_reset_all_variables/0]). :- use_module(library(system),[datime/1,mktime/2]). :- use_module(library(lists),[append/3,member/2]). @@ -480,9 +481,7 @@ logger_write_data :- logger_write_data_intern(Variables,Handle), close(Handle), - % reset variables - findall(_,(member((Name,_),Variables),atom_concat(logger_data_,Name,Key),bb_put(Key,null)),_), - findall(_,(member((Name,time),Variables),atom_concat(logger_start_time_,Name,Key2),bb_put(Key2,null)),_). + logger_reset_all_variables. logger_write_data_intern([],_). logger_write_data_intern([(Name,_Type)],Handle) :- @@ -511,6 +510,21 @@ variablevalue_with_nullcheck(Name,Result) :- %= %======================================================================== +logger_reset_all_variables :- + bb_get(logger_variables,Variables), + + % reset variables + findall(_,(member((Name,_),Variables),atom_concat(logger_data_,Name,Key),bb_put(Key,null)),_), + findall(_,(member((Name,time),Variables),atom_concat(logger_start_time_,Name,Key2),bb_put(Key2,null)),_). + + +%======================================================================== +%= +%= +%= +%======================================================================== + + logger_write_header :- bb_get(logger_filename,FName), bb_get(logger_variables,Variables), diff --git a/packages/ProbLog/problog/os.yap b/packages/ProbLog/problog/os.yap index f9ab70f26..cc677f026 100644 --- a/packages/ProbLog/problog/os.yap +++ b/packages/ProbLog/problog/os.yap @@ -2,8 +2,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% $Date: 2010-09-28 21:04:43 +0200 (Tue, 28 Sep 2010) $ -% $Revision: 4838 $ +% $Date: 2010-09-30 16:05:52 +0200 (Thu, 30 Sep 2010) $ +% $Revision: 4863 $ % % This file is part of ProbLog % http://dtai.cs.kuleuven.be/problog @@ -212,11 +212,13 @@ convert_filename_to_working_path/2, convert_filename_to_problog_path/2, concat_path_with_filename/3, + split_path_file/3, calc_md5/2]). % load library modules :- use_module(library(system), [exec/3, file_exists/1]). +:- use_module(library(lists), [memberchk/2]). % load our own modules :- use_module(gflags, _, [flag_get/2]). @@ -237,20 +239,14 @@ convert_filename_to_problog_path(File_Name, Path):- concat_path_with_filename(Dir, File_Name, Path). concat_path_with_filename(Path, File_Name, Result):- - nonvar(File_Name), - nonvar(Path), + nonvar(File_Name), + nonvar(Path), - % make sure, that there is no path delimiter at the end - prolog_file_name(Path,Path_Absolute), + % make sure, that there is no path delimiter at the end + prolog_file_name(Path,Path_Absolute), - ( - yap_flag(windows, true) - -> - Path_Seperator = '\\'; - Path_Seperator = '/' - ), - - atomic_concat([Path_Absolute, Path_Seperator, File_Name], Result). + path_seperator(Path_Seperator), + atomic_concat([Path_Absolute, Path_Seperator, File_Name], Result). %======================================================================== %= Calculate the MD5 checksum of +Filename by calling md5sum @@ -306,3 +302,17 @@ calc_md5_intern(Filename,Command,MD5) :- bb_delete(calc_md5_temp, FinalList-[]), bb_delete(calc_md5_temp2,_), atom_codes(MD5,FinalList). + + +path_seperator('\\'):- + yap_flag(windows, true), !. +path_seperator('/'). + +split_path_file(PathFile, Path, File):- + path_seperator(PathSeperator), + atomic_concat(Path, File, PathFile), + name(PathSeperator, [PathSeperatorName]), + name(File, FileName), + \+ memberchk(PathSeperatorName, FileName), + !. +% (Path = '' ; atomic_concat(_, PathSeperator, Path)). diff --git a/packages/ProbLog/problog_learning.yap b/packages/ProbLog/problog_learning.yap index f11bd5f1c..f209a35a5 100644 --- a/packages/ProbLog/problog_learning.yap +++ b/packages/ProbLog/problog_learning.yap @@ -2,8 +2,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% $Date: 2010-09-29 18:43:14 +0200 (Wed, 29 Sep 2010) $ -% $Revision: 4854 $ +% $Date: 2010-09-30 16:15:04 +0200 (Thu, 30 Sep 2010) $ +% $Revision: 4864 $ % % This file is part of ProbLog % http://dtai.cs.kuleuven.be/problog @@ -206,7 +206,8 @@ :- module(learning,[do_learning/1, - do_learning/2 + do_learning/2, + reset_learning/0 ]). % switch on all the checks to reduce bug searching time @@ -233,6 +234,9 @@ :- dynamic(query_probability_intern/2). :- dynamic(query_gradient_intern/4). :- dynamic(last_mse/1). +:- dynamic(query_is_similar/2). +:- dynamic(query_md5/2). + % used to identify queries which have identical proofs :- dynamic(query_is_similar/2). @@ -409,6 +413,27 @@ check_examples :- throw(error(examples)) ); true ). +%======================================================================== +%= +%======================================================================== + +reset_learning :- + retractall(current_iteration(_)), + retractall(learning_initialized), + + retractall(values_correct), + retractall(current_iteration(_)), + retractall(example_count(_)), + retractall(query_probability_intern(_,_)), + retractall(query_gradient_intern(_,_,_)), + retractall(last_mse(_)), + retractall(query_is_similar(_,_)), + retractall(query_md5(_,_,_)), + + set_problog_flag(alpha,auto), + set_problog_flag(learning_rate,examples), + logger_reset_all_variables. + %======================================================================== @@ -763,9 +788,7 @@ update_values :- ( % go over all continuous facts get_continuous_fact_parameters(ID,gaussian(Mu,Sigma)), - %SigmaL is log(Sigma), - SigmaL=Sigma, - format(Handle,'@x~q_*~n0~n0~n~10f;~10f~n',[ID,Mu,SigmaL]), + format(Handle,'@x~q_*~n0~n0~n~10f;~10f~n',[ID,Mu,Sigma]), fail; % go to next continuous fact true diff --git a/packages/ProbLog/simplecudd/problogmath.c b/packages/ProbLog/simplecudd/problogmath.c index b4fe41591..2f21a5356 100644 --- a/packages/ProbLog/simplecudd/problogmath.c +++ b/packages/ProbLog/simplecudd/problogmath.c @@ -3,185 +3,143 @@ * SimpleCUDD library (www.cs.kuleuven.be/~theo/tools/simplecudd.html) * * SimpleCUDD was developed at Katholieke Universiteit Leuven(www.kuleuven.be) * * * -* Copyright Katholieke Universiteit Leuven 2008, 2009, 2010 * +* Copyright T. Mantadelis, A. Kimmig, B. Gutmann * +* and Katholieke Universiteit Leuven 2008 * * * * Author: Bernd Gutmann * * File: problogmath.c * -* $Date:: 2010-08-25 15:23:30 +0200 (Wed, 25 Aug 2010) $ * -* $Revision:: 4683 $ * +* $Date:: 2010-09-30 14:29:42 +0200 (Thu, 30 Sep 2010) $ * +* $Revision:: 4858 $ * * * * * ******************************************************************************** * * -* Artistic License 2.0 * +* The "Artistic License" * * * -* Copyright (c) 2000-2006, The Perl Foundation. * +* Preamble * * * -* Everyone is permitted to copy and distribute verbatim copies of this license * -* document, but changing it is not allowed. * +* The intent of this document is to state the conditions under which a * +* Package may be copied, such that the Copyright Holder maintains some * +* semblance of artistic control over the development of the package, * +* while giving the users of the package the right to use and distribute * +* the Package in a more-or-less customary fashion, plus the right to make * +* reasonable modifications. * * * -* Preamble * +* Definitions: * * * -* This license establishes the terms under which a given free software Package * -* may be copied, modified, distributed, and/or redistributed. The intent is * -* that the Copyright Holder maintains some artistic control over the * -* development of that Package while still keeping the Package available as * -* open source and free software. * +* "Package" refers to the collection of files distributed by the * +* Copyright Holder, and derivatives of that collection of files * +* created through textual modification. * * * -* You are always permitted to make arrangements wholly outside of this license * -* directly with the Copyright Holder of a given Package. If the terms of this * -* license do not permit the full use that you propose to make of the Package, * -* you should contact the Copyright Holder and seek a different licensing * -* arrangement. * -* Definitions * +* "Standard Version" refers to such a Package if it has not been * +* modified, or has been modified in accordance with the wishes * +* of the Copyright Holder as specified below. * * * -* "Copyright Holder" means the individual(s) or organization(s) named in the * -* copyright notice for the entire Package. * +* "Copyright Holder" is whoever is named in the copyright or * +* copyrights for the package. * * * -* "Contributor" means any party that has contributed code or other material to * -* the Package, in accordance with the Copyright Holder's procedures. * +* "You" is you, if you're thinking about copying or distributing * +* this Package. * * * -* "You" and "your" means any person who would like to copy, distribute, or * -* modify the Package. * +* "Reasonable copying fee" is whatever you can justify on the * +* basis of media cost, duplication charges, time of people involved, * +* and so on. (You will not be required to justify it to the * +* Copyright Holder, but only to the computing community at large * +* as a market that must bear the fee.) * * * -* "Package" means the collection of files distributed by the Copyright Holder, * -* and derivatives of that collection and/or of those files. A given Package * -* may consist of either the Standard Version, or a Modified Version. * +* "Freely Available" means that no fee is charged for the item * +* itself, though there may be fees involved in handling the item. * +* It also means that recipients of the item may redistribute it * +* under the same conditions they received it. * * * -* "Distribute" means providing a copy of the Package or making it accessible * -* to anyone else, or in the case of a company or organization, to others * -* outside of your company or organization. * +* 1. You may make and give away verbatim copies of the source form of the * +* Standard Version of this Package without restriction, provided that you * +* duplicate all of the original copyright notices and associated disclaimers. * * * -* "Distributor Fee" means any fee that you charge for Distributing this * -* Package or providing support for this Package to another party. It does not * -* mean licensing fees. * +* 2. You may apply bug fixes, portability fixes and other modifications * +* derived from the Public Domain or from the Copyright Holder. A Package * +* modified in such a way shall still be considered the Standard Version. * * * -* "Standard Version" refers to the Package if it has not been modified, or has * -* been modified only in ways explicitly requested by the Copyright Holder. * +* 3. You may otherwise modify your copy of this Package in any way, provided * +* that you insert a prominent notice in each changed file stating how and * +* when you changed that file, and provided that you do at least ONE of the * +* following: * * * -* "Modified Version" means the Package, if it has been changed, and such * -* changes were not explicitly requested by the Copyright Holder. * +* a) place your modifications in the Public Domain or otherwise make them * +* Freely Available, such as by posting said modifications to Usenet or * +* an equivalent medium, or placing the modifications on a major archive * +* site such as uunet.uu.net, or by allowing the Copyright Holder to include * +* your modifications in the Standard Version of the Package. * * * -* "Original License" means this Artistic License as Distributed with the * -* Standard Version of the Package, in its current version or as it may be * -* modified by The Perl Foundation in the future. * +* b) use the modified Package only within your corporation or organization. * * * -* "Source" form means the source code, documentation source, and configuration * -* files for the Package. * +* c) rename any non-standard executables so the names do not conflict * +* with standard executables, which must also be provided, and provide * +* a separate manual page for each non-standard executable that clearly * +* documents how it differs from the Standard Version. * * * -* "Compiled" form means the compiled bytecode, object code, binary, or any * -* other form resulting from mechanical transformation or translation of the * -* Source form. * -* Permission for Use and Modification Without Distribution * +* d) make other distribution arrangements with the Copyright Holder. * * * -* (1) You are permitted to use the Standard Version and create and use * -* Modified Versions for any purpose without restriction, provided that you do * -* not Distribute the Modified Version. * -* Permissions for Redistribution of the Standard Version * +* 4. You may distribute the programs of this Package in object code or * +* executable form, provided that you do at least ONE of the following: * * * -* (2) You may Distribute verbatim copies of the Source form of the Standard * -* Version of this Package in any medium without restriction, either gratis or * -* for a Distributor Fee, provided that you duplicate all of the original * -* copyright notices and associated disclaimers. At your discretion, such * -* verbatim copies may or may not include a Compiled form of the Package. * +* a) distribute a Standard Version of the executables and library files, * +* together with instructions (in the manual page or equivalent) on where * +* to get the Standard Version. * * * -* (3) You may apply any bug fixes, portability changes, and other * -* modifications made available from the Copyright Holder. The resulting * -* Package will still be considered the Standard Version, and as such will be * -* subject to the Original License. * -* Distribution of Modified Versions of the Package as Source * +* b) accompany the distribution with the machine-readable source of * +* the Package with your modifications. * * * -* (4) You may Distribute your Modified Version as Source (either gratis or for * -* a Distributor Fee, and with or without a Compiled form of the Modified * -* Version) provided that you clearly document how it differs from the Standard * -* Version, including, but not limited to, documenting any non-standard * -* features, executables, or modules, and provided that you do at least ONE of * -* the following: * +* c) give non-standard executables non-standard names, and clearly * +* document the differences in manual pages (or equivalent), together * +* with instructions on where to get the Standard Version. * * * -* (a) make the Modified Version available to the Copyright Holder of the * -* Standard Version, under the Original License, so that the Copyright Holder * -* may include your modifications in the Standard Version. * -* (b) ensure that installation of your Modified Version does not prevent the * -* user installing or running the Standard Version. In addition, the Modified * -* Version must bear a name that is different from the name of the Standard * -* Version. * -* (c) allow anyone who receives a copy of the Modified Version to make the * -* Source form of the Modified Version available to others under * -* (i) the Original License or * -* (ii) a license that permits the licensee to freely copy, modify and * -* redistribute the Modified Version using the same licensing terms that apply * -* to the copy that the licensee received, and requires that the Source form of * -* the Modified Version, and of any works derived from it, be made freely * -* available in that license fees are prohibited but Distributor Fees are * -* allowed. * -* Distribution of Compiled Forms of the Standard Version or Modified Versions * -* without the Source * +* d) make other distribution arrangements with the Copyright Holder. * * * -* (5) You may Distribute Compiled forms of the Standard Version without the * -* Source, provided that you include complete instructions on how to get the * -* Source of the Standard Version. Such instructions must be valid at the time * -* of your distribution. If these instructions, at any time while you are * -* carrying out such distribution, become invalid, you must provide new * -* instructions on demand or cease further distribution. If you provide valid * -* instructions or cease distribution within thirty days after you become aware * -* that the instructions are invalid, then you do not forfeit any of your * -* rights under this license. * +* 5. You may charge a reasonable copying fee for any distribution of this * +* Package. You may charge any fee you choose for support of this * +* Package. You may not charge a fee for this Package itself. However, * +* you may distribute this Package in aggregate with other (possibly * +* commercial) programs as part of a larger (possibly commercial) software * +* distribution provided that you do not advertise this Package as a * +* product of your own. You may embed this Package's interpreter within * +* an executable of yours (by linking); this shall be construed as a mere * +* form of aggregation, provided that the complete Standard Version of the * +* interpreter is so embedded. * * * -* (6) You may Distribute a Modified Version in Compiled form without the * -* Source, provided that you comply with Section 4 with respect to the Source * -* of the Modified Version. * -* Aggregating or Linking the Package * +* 6. The scripts and library files supplied as input to or produced as * +* output from the programs of this Package do not automatically fall * +* under the copyright of this Package, but belong to whoever generated * +* them, and may be sold commercially, and may be aggregated with this * +* Package. If such scripts or library files are aggregated with this * +* Package via the so-called "undump" or "unexec" methods of producing a * +* binary executable image, then distribution of such an image shall * +* neither be construed as a distribution of this Package nor shall it * +* fall under the restrictions of Paragraphs 3 and 4, provided that you do * +* not represent such an executable image as a Standard Version of this * +* Package. * * * -* (7) You may aggregate the Package (either the Standard Version or Modified * -* Version) with other packages and Distribute the resulting aggregation * -* provided that you do not charge a licensing fee for the Package. Distributor * -* Fees are permitted, and licensing fees for other components in the * -* aggregation are permitted. The terms of this license apply to the use and * -* Distribution of the Standard or Modified Versions as included in the * -* aggregation. * +* 7. C subroutines (or comparably compiled subroutines in other * +* languages) supplied by you and linked into this Package in order to * +* emulate subroutines and variables of the language defined by this * +* Package shall not be considered part of this Package, but are the * +* equivalent of input as in Paragraph 6, provided these subroutines do * +* not change the language in any way that would cause it to fail the * +* regression tests for the language. * * * -* (8) You are permitted to link Modified and Standard Versions with other * -* works, to embed the Package in a larger work of your own, or to build * -* stand-alone binary or bytecode versions of applications that include the * -* Package, and Distribute the result without restriction, provided the result * -* does not expose a direct interface to the Package. * -* Items That are Not Considered Part of a Modified Version * +* 8. Aggregation of this Package with a commercial distribution is always * +* permitted provided that the use of this Package is embedded; that is, * +* when no overt attempt is made to make this Package's interfaces visible * +* to the end user of the commercial distribution. Such use shall not be * +* construed as a distribution of this Package. * * * -* (9) Works (including, but not limited to, modules and scripts) that merely * -* extend or make use of the Package, do not, by themselves, cause the Package * -* to be a Modified Version. In addition, such works are not considered parts * -* of the Package itself, and are not subject to the terms of this license. * -* General Provisions * +* 9. The name of the Copyright Holder may not be used to endorse or promote * +* products derived from this software without specific prior written * +* permission. * * * -* (10) Any use, modification, and distribution of the Standard or Modified * -* Versions is governed by this Artistic License. By using, modifying or * -* distributing the Package, you accept this license. Do not use, modify, or * -* distribute the Package, if you do not accept this license. * -* * -* (11) If your Modified Version has been derived from a Modified Version made * -* by someone other than you, you are nevertheless required to ensure that your * -* Modified Version complies with the requirements of this license. * -* * -* (12) This license does not grant you the right to use any trademark, service * -* mark, tradename, or logo of the Copyright Holder. * -* * -* (13) This license includes the non-exclusive, worldwide, free-of-charge * -* patent license to make, have made, use, offer to sell, sell, import and * -* otherwise transfer the Package with respect to any patent claims licensable * -* by the Copyright Holder that are necessarily infringed by the Package. If * -* you institute patent litigation (including a cross-claim or counterclaim) * -* against any party alleging that the Package constitutes direct or * -* contributory patent infringement, then this Artistic License to you shall * -* terminate on the date that such litigation is filed. * -* * -* (14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER * -* AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE * -* IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR * -* NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. * -* UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE * -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN * -* ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF * -* SUCH DAMAGE. * +* 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR * +* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * +* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * * * The End * * * @@ -266,6 +224,7 @@ double cumulative_normal_upper_dsigma(double high,double mu,double sigma) { // it is used to parse in the parameters of continues variables from the input file density_integral parse_density_integral_string(char *input, char *variablename) { density_integral result; + double sigma; int i; char garbage[64], s1[64],s2[64],s3[64],s4[64]; @@ -275,21 +234,18 @@ density_integral parse_density_integral_string(char *input, char *variablename) exit(EXIT_FAILURE); } - if (IsRealNumber(s1)) { - result.mu=atof(s1); - } else { + if (!getRealNumber(s1, &result.mu)) { fprintf(stderr, "Error at parsing the string %s in the function parse_density_integral_string\n",input); fprintf(stderr, "%s is not a number\n",s1); exit(EXIT_FAILURE); } - if (IsRealNumber(s2)) { - result.log_sigma=atof(s2); - } else { + if (!getRealNumber(s2, &sigma) || sigma<=0.0) { fprintf(stderr, "Error at parsing the string %s in the function parse_density_integral_string\n",input); fprintf(stderr, "%s is not a number\n",s2); exit(EXIT_FAILURE); } + result.log_sigma=log(sigma); /* if (result.sigma<=0) { */ /* fprintf(stderr, "Error at parsing the string %s in the function parse_density_integral_string",input); */ @@ -322,17 +278,13 @@ density_integral parse_density_integral_string(char *input, char *variablename) } } - if (IsRealNumber(s3)) { - result.low=atof(s3); - } else { + if (!getRealNumber(s3, &result.low)) { fprintf(stderr, "Error at parsing the string %s in the function parse_density_integral_string\n",input); fprintf(stderr, "%s is not a number\n",s1); exit(EXIT_FAILURE); } - if (IsRealNumber(s4)) { - result.high=atof(s4); - } else { + if (!getRealNumber(s4, &result.high)) { fprintf(stderr, "Error ar parsing the string %s in the function parse_density_integral_string\n",input); fprintf(stderr, "%s is not a number\n",s1); exit(EXIT_FAILURE); @@ -349,6 +301,6 @@ density_integral parse_density_integral_string(char *input, char *variablename) exit(EXIT_FAILURE); } - + return result; } diff --git a/packages/ProbLog/simplecudd/simplecudd.c b/packages/ProbLog/simplecudd/simplecudd.c index d42867a78..caa67134b 100644 --- a/packages/ProbLog/simplecudd/simplecudd.c +++ b/packages/ProbLog/simplecudd/simplecudd.c @@ -378,6 +378,10 @@ int simpleNamedBDDtoDot(DdManager *manager, namedvars varmap, DdNode *bdd, char DdNode *f[1]; int ret; FILE *fd; + // Reordering until getting the optimal bdd // +/* Cudd_AutodynDisable(manager); + Cudd_ReduceHeap(manager, CUDD_REORDER_SIFT_CONVERGE, 1);*/ + // better before making an ADD // f[0] = Cudd_BddToAdd(manager, bdd); fd = fopen(filename, "w"); if (fd == NULL) { @@ -690,8 +694,7 @@ int LoadVariableData(namedvars varmap, char *filename) { if (hasvar >= 0) { switch(idat) { case 0: - if (IsRealNumber(dataread)) dvalue = atof(dataread); - else { + if (!getRealNumber(dataread, &dvalue)) { fprintf(stderr, "Error at file: %s. Variable: %s can't have non real value: %s.\n", filename, varname, dataread); fclose(data); free(varname); @@ -701,8 +704,7 @@ int LoadVariableData(namedvars varmap, char *filename) { idat++; break; case 1: - if (IsNumber(dataread)) ivalue = atoi(dataread); - else { + if (!getIntNumber(dataread, &ivalue)) { fprintf(stderr, "Error at file: %s. Variable: %s can't have non integer value: %s.\n", filename, varname, dataread); fclose(data); free(varname); @@ -1706,34 +1708,46 @@ void onlinetraverse(DdManager *manager, namedvars varmap, hisqueue *HisQueue, Dd inputline[icur] = '\0'; if ((icur > 0) && (inputline[0] == '@') && (inputline[2] == ',' || inputline[2] == '\0')) { switch(inputline[1]) { + case '?': + printf("Available instructions:\n\t@c : current node\n\t@n,[BFS, DFS] : expand and go to next node\n\t@t,[BFS, DFS] : throw and go to next node\n"); + printf("\t@h : high node of current\n\t@l : low node of current\n\t@v,[variable] : variable values\n\t@e terminates\n"); + break; case 'c': if (iRoot) { iRoot = 0; - printf("bdd_temp_value('%s', %i).\n", GetNodeVarNameDisp(manager, varmap, curnode), 1); + printf("bdd_temp_value('%s', %i, %p).\n", GetNodeVarNameDisp(manager, varmap, curnode), 1, (void *) curnode); } else { - printf("bdd_temp_value('%s', %i).\n", GetNodeVarNameDisp(manager, varmap, curnode), iQsize); + printf("bdd_temp_value('%s', %i, %p).\n", GetNodeVarNameDisp(manager, varmap, curnode), iQsize, (void *) curnode); } fflush(stdout); break; case 'n': if (curnode != HIGH(manager) && curnode != LOW(manager) && (hnode = GetNode(his, varmap.varstart, curnode)) == NULL) { - //AddNode(his, varmap.varstart, curnode, 0.0, 0, NULL); l_node = LowNodeOf(manager, curnode); h_node = HighNodeOf(manager, curnode); - inQ = 0; + iQsize += 2; + Q = (DdNode **) realloc(Q, sizeof(DdNode *) * iQsize); + Q[iQsize - 2] = l_node; + Q[iQsize - 1] = h_node; + //AddNode(his, varmap.varstart, curnode, 0.0, 0, NULL); +/* inQ = 0; for(i = 0; (i < iQsize / 2) && (inQ < 3); i++) - inQ = (Q[i] == l_node) || (Q[iQsize - i] == l_node) + 2 * (Q[i] == h_node) || (Q[iQsize - i] == h_node); - if ((inQ & 1) == 0) inQ = inQ + (GetNode(his, varmap.varstart, l_node) != NULL); - if ((inQ & 2) == 0) inQ = inQ + 2 * (GetNode(his, varmap.varstart, h_node) != NULL); - if ((inQ & 1) == 1) inQ = inQ - (l_node == HIGH(manager) || l_node == LOW(manager)); - if ((inQ & 2) == 2) inQ = inQ - 2 * (h_node == HIGH(manager) || h_node == LOW(manager)); - inQ = 0; + inQ = (Q[i] == l_node) || (Q[iQsize - i - 1] == l_node) + 2 * (Q[i] == h_node) || (Q[iQsize - i - 1] == h_node); + if ((l_node == HIGH(manager) || l_node == LOW(manager))) { + inQ = (inQ & 2); + } else { + if ((inQ & 1) == 0) inQ = inQ + (GetNode(his, varmap.varstart, l_node) != NULL); + } + if (h_node == HIGH(manager) || h_node == LOW(manager)) { + inQ = (inQ & 1); + } else { + if ((inQ & 2) == 0) inQ = inQ + 2 * (GetNode(his, varmap.varstart, h_node) != NULL); + }*/ +/* if ((inQ & 1) == 1) inQ = inQ - (l_node == HIGH(manager) || l_node == LOW(manager)); + if ((inQ & 2) == 2) inQ = inQ - 2 * (h_node == HIGH(manager) || h_node == LOW(manager));*/ +/* inQ = 0; switch(inQ) { case 0: - iQsize += 2; - Q = (DdNode **) realloc(Q, sizeof(DdNode *) * iQsize); - Q[iQsize - 2] = l_node; - Q[iQsize - 1] = h_node; break; case 1: iQsize++; @@ -1749,7 +1763,7 @@ void onlinetraverse(DdManager *manager, namedvars varmap, hisqueue *HisQueue, Dd break; default: break; - } + }*/ } if (inputline[2] == '\0' || strcmp(inputline + 3, "DFS") == 0) { if (iQsize > 0) { @@ -1774,6 +1788,30 @@ void onlinetraverse(DdManager *manager, namedvars varmap, hisqueue *HisQueue, Dd exit(-1); } break; + case 't': + if (inputline[2] == '\0' || strcmp(inputline + 3, "DFS") == 0) { + if (iQsize > 0) { + iQsize--; + curnode = Q[iQsize]; + Q = (DdNode **) realloc(Q, sizeof(DdNode *) * iQsize); + } + } else if (strcmp(inputline + 3, "BFS") == 0) { + if (iQsize > 0) { + iQsize--; + curnode = Q[0]; + Q2 = (DdNode **) malloc(sizeof(DdNode *) * iQsize); + for(i = 0; i < iQsize; i++) + Q2[i] = Q[i + 1]; + free(Q); + Q = Q2; + } + } else { + fprintf(stderr, "Error: Could not find method: %s, Correct syntax @n,[DFS, BFS].\n", inputline + 3); + free(Q); + free(inputline); + exit(-1); + } + break; case 'h': printf("bdd_temp_value('%s').\n", GetNodeVarNameDisp(manager, varmap, HighNodeOf(manager, curnode))); fflush(stdout);