diff --git a/packages/CLPBN/horus/benchmarks/benchs.sh b/packages/CLPBN/benchmarks/benchs.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/benchs.sh rename to packages/CLPBN/benchmarks/benchs.sh diff --git a/packages/CLPBN/horus/benchmarks/city/bp_tests.sh b/packages/CLPBN/benchmarks/city/bp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/bp_tests.sh rename to packages/CLPBN/benchmarks/city/bp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/city/cbp_tests.sh b/packages/CLPBN/benchmarks/city/cbp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/cbp_tests.sh rename to packages/CLPBN/benchmarks/city/cbp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/city/city.sh b/packages/CLPBN/benchmarks/city/city.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/city.sh rename to packages/CLPBN/benchmarks/city/city.sh diff --git a/packages/CLPBN/horus/benchmarks/city/fove_tests.sh b/packages/CLPBN/benchmarks/city/fove_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/fove_tests.sh rename to packages/CLPBN/benchmarks/city/fove_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/city/gen_city.sh b/packages/CLPBN/benchmarks/city/gen_city.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/gen_city.sh rename to packages/CLPBN/benchmarks/city/gen_city.sh diff --git a/packages/CLPBN/horus/benchmarks/city/hve_tests.sh b/packages/CLPBN/benchmarks/city/hve_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/city/hve_tests.sh rename to packages/CLPBN/benchmarks/city/hve_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/bp_tests.sh b/packages/CLPBN/benchmarks/comp_workshops/bp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/bp_tests.sh rename to packages/CLPBN/benchmarks/comp_workshops/bp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/cbp_tests.sh b/packages/CLPBN/benchmarks/comp_workshops/cbp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/cbp_tests.sh rename to packages/CLPBN/benchmarks/comp_workshops/cbp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/cw.sh b/packages/CLPBN/benchmarks/comp_workshops/cw.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/cw.sh rename to packages/CLPBN/benchmarks/comp_workshops/cw.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/fove_tests.sh b/packages/CLPBN/benchmarks/comp_workshops/fove_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/fove_tests.sh rename to packages/CLPBN/benchmarks/comp_workshops/fove_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/gen_workshops.sh b/packages/CLPBN/benchmarks/comp_workshops/gen_workshops.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/gen_workshops.sh rename to packages/CLPBN/benchmarks/comp_workshops/gen_workshops.sh diff --git a/packages/CLPBN/horus/benchmarks/comp_workshops/hve_tests.sh b/packages/CLPBN/benchmarks/comp_workshops/hve_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/comp_workshops/hve_tests.sh rename to packages/CLPBN/benchmarks/comp_workshops/hve_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/school/missing10.yap b/packages/CLPBN/benchmarks/school/missing10.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing10.yap rename to packages/CLPBN/benchmarks/school/missing10.yap diff --git a/packages/CLPBN/horus/benchmarks/school/missing20.yap b/packages/CLPBN/benchmarks/school/missing20.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing20.yap rename to packages/CLPBN/benchmarks/school/missing20.yap diff --git a/packages/CLPBN/horus/benchmarks/school/missing30.yap b/packages/CLPBN/benchmarks/school/missing30.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing30.yap rename to packages/CLPBN/benchmarks/school/missing30.yap diff --git a/packages/CLPBN/horus/benchmarks/school/missing40.yap b/packages/CLPBN/benchmarks/school/missing40.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing40.yap rename to packages/CLPBN/benchmarks/school/missing40.yap diff --git a/packages/CLPBN/horus/benchmarks/school/missing5.yap b/packages/CLPBN/benchmarks/school/missing5.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing5.yap rename to packages/CLPBN/benchmarks/school/missing5.yap diff --git a/packages/CLPBN/horus/benchmarks/school/missing50.yap b/packages/CLPBN/benchmarks/school/missing50.yap similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/missing50.yap rename to packages/CLPBN/benchmarks/school/missing50.yap diff --git a/packages/CLPBN/horus/benchmarks/school/run_school_tests.sh b/packages/CLPBN/benchmarks/school/run_school_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/school/run_school_tests.sh rename to packages/CLPBN/benchmarks/school/run_school_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/bp_tests.sh b/packages/CLPBN/benchmarks/smokers/bp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/smokers/bp_tests.sh rename to packages/CLPBN/benchmarks/smokers/bp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/cbp_tests.sh b/packages/CLPBN/benchmarks/smokers/cbp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/smokers/cbp_tests.sh rename to packages/CLPBN/benchmarks/smokers/cbp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/fove_tests.sh b/packages/CLPBN/benchmarks/smokers/fove_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/smokers/fove_tests.sh rename to packages/CLPBN/benchmarks/smokers/fove_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/gen_people.sh b/packages/CLPBN/benchmarks/smokers/gen_people.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/smokers/gen_people.sh rename to packages/CLPBN/benchmarks/smokers/gen_people.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/hve_tests.sh b/packages/CLPBN/benchmarks/smokers/hve_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/smokers/hve_tests.sh rename to packages/CLPBN/benchmarks/smokers/hve_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/smokers/sm.sh b/packages/CLPBN/benchmarks/smokers/sm.sh similarity index 66% rename from packages/CLPBN/horus/benchmarks/smokers/sm.sh rename to packages/CLPBN/benchmarks/smokers/sm.sh index 17136dd93..c9da6e5a6 100755 --- a/packages/CLPBN/horus/benchmarks/smokers/sm.sh +++ b/packages/CLPBN/benchmarks/smokers/sm.sh @@ -1,6 +1,6 @@ #!/bin/bash -NETWORK="'../../examples/smokers2'" +NETWORK="'../../examples/social_domain2'" SHORTNAME="sm" QUERY="smokes(p1,t), smokes(p2,t), friends(p1,p2,X)" diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/bp_tests.sh b/packages/CLPBN/benchmarks/workshop_attrs/bp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/bp_tests.sh rename to packages/CLPBN/benchmarks/workshop_attrs/bp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/cbp_tests.sh b/packages/CLPBN/benchmarks/workshop_attrs/cbp_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/cbp_tests.sh rename to packages/CLPBN/benchmarks/workshop_attrs/cbp_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/fove_tests.sh b/packages/CLPBN/benchmarks/workshop_attrs/fove_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/fove_tests.sh rename to packages/CLPBN/benchmarks/workshop_attrs/fove_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/gen_attrs.sh b/packages/CLPBN/benchmarks/workshop_attrs/gen_attrs.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/gen_attrs.sh rename to packages/CLPBN/benchmarks/workshop_attrs/gen_attrs.sh diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/hve_tests.sh b/packages/CLPBN/benchmarks/workshop_attrs/hve_tests.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/hve_tests.sh rename to packages/CLPBN/benchmarks/workshop_attrs/hve_tests.sh diff --git a/packages/CLPBN/horus/benchmarks/workshop_attrs/wa.sh b/packages/CLPBN/benchmarks/workshop_attrs/wa.sh similarity index 100% rename from packages/CLPBN/horus/benchmarks/workshop_attrs/wa.sh rename to packages/CLPBN/benchmarks/workshop_attrs/wa.sh diff --git a/packages/CLPBN/horus/benchmarks/city/bp.log b/packages/CLPBN/horus/benchmarks/city/bp.log deleted file mode 100644 index 72572c927..000000000 --- a/packages/CLPBN/horus/benchmarks/city/bp.log +++ /dev/null @@ -1,4 +0,0 @@ -************************************************************************ -results for solver bp(shedule=seq_fixed) -************************************************************************ -city1000: real:0:00.20 user:0.12 sys:0.02 diff --git a/packages/CLPBN/horus/benchmarks/city/ignore.bp.log b/packages/CLPBN/horus/benchmarks/city/ignore.bp.log deleted file mode 100644 index d5feb408d..000000000 --- a/packages/CLPBN/horus/benchmarks/city/ignore.bp.log +++ /dev/null @@ -1,96 +0,0 @@ -YAP 6.3.2 (i686-linux): Sáb Abr 28 13:56:07 WEST 2012 -yes - % consulting /home/tiago/yap-6.3/packages/CLPBN/clpbn/bp/examples/city.yap... - % reconsulting /home/tiago/share/Yap/pfl.yap... - % reconsulting /home/tiago/share/Yap/lists.yap... - % reconsulting /home/tiago/share/Yap/error.pl... - % reconsulted /home/tiago/share/Yap/error.pl in module error, 4 msec 27448 bytes - % reconsulted /home/tiago/share/Yap/lists.yap in module lists, 4 msec 60536 bytes - % reconsulting /home/tiago/share/Yap/clpbn.yap... - % reconsulting /home/tiago/share/Yap/atts.yap... - % reconsulted /home/tiago/share/Yap/atts.yap in module attributes, 0 msec 22808 bytes - % reconsulting /home/tiago/share/Yap/terms.yap... - % reconsulted /home/tiago/share/Yap/terms.yap in module terms, 0 msec 1480 bytes - % reconsulting /home/tiago/share/Yap/clpbn/ve.yap... - % reconsulting /home/tiago/share/Yap/ordsets.yap... - % reconsulted /home/tiago/share/Yap/ordsets.yap in module ordsets, 4 msec 23928 bytes - % reconsulting /home/tiago/share/Yap/clpbn/xbif.yap... - % reconsulting /home/tiago/share/Yap/clpbn/dists.yap... - % reconsulting /home/tiago/share/Yap/matrix.yap... - % reconsulted /home/tiago/share/Yap/matrix.yap in module matrix, 0 msec 20608 bytes - % reconsulting /home/tiago/share/Yap/clpbn/matrix_cpt_utils.yap... - % reconsulted /home/tiago/share/Yap/clpbn/matrix_cpt_utils.yap in module clpbn_matrix_utils, 0 msec 33504 bytes - % reconsulted /home/tiago/share/Yap/clpbn/dists.yap in module clpbn_dist, 4 msec 97560 bytes - % reconsulted /home/tiago/share/Yap/clpbn/xbif.yap in module xbif, 4 msec 109176 bytes - % reconsulting /home/tiago/share/Yap/clpbn/graphviz.yap... - % reconsulted /home/tiago/share/Yap/clpbn/graphviz.yap in module clpbn_gviz, 0 msec 7784 bytes - % reconsulting /home/tiago/share/Yap/clpbn/utils.yap... - % reconsulted /home/tiago/share/Yap/clpbn/utils.yap in module clpbn_utils, 0 msec 13912 bytes - % reconsulting /home/tiago/share/Yap/clpbn/display.yap... - % reconsulted /home/tiago/share/Yap/clpbn/display.yap in module clpbn_display, 0 msec 11232 bytes - % reconsulting /home/tiago/share/Yap/clpbn/connected.yap... - % reconsulting /home/tiago/share/Yap/dgraphs.yap... - % reconsulting /home/tiago/share/Yap/rbtrees.yap... - % reconsulted /home/tiago/share/Yap/rbtrees.yap in module rbtrees, 8 msec 117496 bytes - % reconsulting /home/tiago/share/Yap/wdgraphs.yap... - % reconsulting /home/tiago/share/Yap/heaps.yap... - % reconsulted /home/tiago/share/Yap/heaps.yap in module heaps, 4 msec 13520 bytes - % reconsulted /home/tiago/share/Yap/wdgraphs.yap in module wdgraphs, 4 msec 72176 bytes - % reconsulted /home/tiago/share/Yap/dgraphs.yap in module dgraphs, 16 msec 243240 bytes - % reconsulted /home/tiago/share/Yap/clpbn/connected.yap in module clpbn_connected, 16 msec 261736 bytes - % reconsulting /home/tiago/share/Yap/clpbn/aggregates.yap... - % reconsulted /home/tiago/share/Yap/clpbn/aggregates.yap in module clpbn_aggregates, 0 msec 36512 bytes - % reconsulted /home/tiago/share/Yap/clpbn/ve.yap in module clpbn_ve, 36 msec 500808 bytes - % reconsulting /home/tiago/share/Yap/clpbn/bp.yap... - % reconsulting /home/tiago/share/Yap/charsio.yap... - % reconsulted /home/tiago/share/Yap/charsio.yap in module charsio, 0 msec 10592 bytes - % reconsulting /home/tiago/share/Yap/bhash.yap... - % reconsulted /home/tiago/share/Yap/bhash.yap in module b_hash, 0 msec 30624 bytes - % reconsulting /home/tiago/share/Yap/clpbn/horus.yap... -% Warning: (/home/tiago/share/Yap/clpbn/horus.yap:23). -% Importing private predicate pfl:set_pfl_flag/2 to clpbn_horus. - % reconsulted /home/tiago/share/Yap/clpbn/horus.yap in module clpbn_horus, 4 msec 14248 bytes - % reconsulted /home/tiago/share/Yap/clpbn/bp.yap in module clpbn_bp, 8 msec 87944 bytes - % reconsulting /home/tiago/share/Yap/clpbn/fove.yap... - % reconsulted /home/tiago/share/Yap/clpbn/fove.yap in module clpbn_fove, 4 msec 17464 bytes - % reconsulting /home/tiago/share/Yap/clpbn/jt.yap... - % reconsulting /home/tiago/share/Yap/undgraphs.yap... - % reconsulting /home/tiago/share/Yap/wundgraphs.yap... - % reconsulted /home/tiago/share/Yap/wundgraphs.yap in module wundgraphs, 4 msec 37816 bytes - % reconsulted /home/tiago/share/Yap/undgraphs.yap in module undgraphs, 8 msec 66048 bytes - % reconsulted /home/tiago/share/Yap/clpbn/jt.yap in module jt, 12 msec 143960 bytes - % reconsulting /home/tiago/share/Yap/clpbn/bdd.yap... - % reconsulting /home/tiago/share/Yap/hacks.yap... - % reconsulted /home/tiago/share/Yap/hacks.yap in module yap_hacks, 0 msec 4968 bytes - ERROR!! (/home/tiago/share/Yap/clpbn/bdd.yap:54). - PERMISSION ERROR- use_module(library(bdd)): cannot read from library(bdd) - % reconsulted /home/tiago/share/Yap/clpbn/bdd.yap in module clpbn_bdd, 8 msec 152336 bytes - % reconsulting /home/tiago/share/Yap/clpbn/gibbs.yap... - % reconsulting /home/tiago/share/Yap/clpbn/topsort.yap... - % reconsulted /home/tiago/share/Yap/clpbn/topsort.yap in module topsort, 0 msec 5848 bytes - % reconsulted /home/tiago/share/Yap/clpbn/gibbs.yap in module clpbn_gibbs, 0 msec 79344 bytes - % reconsulting /home/tiago/share/Yap/clpbn/pgrammar.yap... - % reconsulted /home/tiago/share/Yap/clpbn/pgrammar.yap in module clpbn_pgrammar, 4 msec 44088 bytes - % reconsulting /home/tiago/share/Yap/clpbn/graphs.yap... - % reconsulted /home/tiago/share/Yap/clpbn/graphs.yap in module clpbn2graph, 0 msec 8408 bytes - % reconsulting /home/tiago/share/Yap/clpbn/evidence.yap... - % reconsulted /home/tiago/share/Yap/clpbn/evidence.yap in module clpbn_evidence, 4 msec 21256 bytes - % reconsulting /home/tiago/share/Yap/clpbn/ground_factors.yap... - % reconsulted /home/tiago/share/Yap/clpbn/ground_factors.yap in module clpbn_ground_factors, 4 msec 16360 bytes - % reconsulted /home/tiago/share/Yap/clpbn.yap in module clpbn, 92 msec 1188576 bytes - % reconsulted /home/tiago/share/Yap/pfl.yap in module pfl, 96 msec 1277856 bytes - % consulted /home/tiago/yap-6.3/packages/CLPBN/clpbn/bp/examples/city.yap in module user, 96 msec 1313552 bytes -yes - ERROR!! - PERMISSION ERROR- consult(city1000): cannot read from city1000 -yes -yes -yes -yes -belief propagation [schedule=seq_fixed,max_iter=1000,accuracy=0.0001,log_domain=true] - -Sum-Product converged in 6 iterations - -p(X=y)= 0.2383192848945889, -p(X=n)= 0.761680715105411 -S = ''(0xa0288d8)