From e9c848ea4197ad92f39aea95372f2cb57b394529 Mon Sep 17 00:00:00 2001 From: ricroc Date: Wed, 2 May 2007 15:23:00 +0000 Subject: [PATCH] tries library module git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1876 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- Makefile.in | 8 ++++---- configure | 6 +++--- configure.in | 4 ++-- library/itries.yap | 33 +++++++++++++++++++++++++++++++++ library/tries.yap | 45 ++++++++++++++++++++++++--------------------- 5 files changed, 66 insertions(+), 30 deletions(-) create mode 100644 library/itries.yap diff --git a/Makefile.in b/Makefile.in index 41b6753c8..edf80d2e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -553,7 +553,7 @@ all: startup @INSTALL_DLLS@ (cd library/regex; make) @INSTALL_DLLS@ (cd library/system; make) @INSTALL_DLLS@ (cd library/yap2swi; make) - @INSTALL_DLLS@ (cd library/Tries; make) + @INSTALL_DLLS@ (cd library/tries; make) @INSTALL_DLLS@ (cd library/lammpi; make) @INSTALL_DLLS@ (cd library/matrix; make) @ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; make) @@ -590,7 +590,7 @@ install_unix: startup libYap.a @INSTALL_DLLS@ (cd library/regex; make install) @INSTALL_DLLS@ (cd library/system; make install) @INSTALL_DLLS@ (cd library/yap2swi; make install) - @INSTALL_DLLS@ (cd library/Tries; make install) + @INSTALL_DLLS@ (cd library/tries; make install) @INSTALL_DLLS@ (cd library/lammpi; make install) @INSTALL_DLLS@ (cd library/matrix; make install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; make install) @@ -617,7 +617,7 @@ install_win32: startup (cd library/regex; make install) (cd library/system; make install) (cd library/yap2swi; make install) - @# (cd library/Tries; make install) + @# (cd library/tries; make install) install_library: @YAPLIB@ mkdir -p $(DESTDIR)$(INCLUDEDIR) @@ -656,7 +656,7 @@ clean: clean_docs @INSTALL_DLLS@ (cd library/regex; make clean) @INSTALL_DLLS@ (cd library/system; make clean) @INSTALL_DLLS@ (cd library/yap2swi; make clean) - @INSTALL_DLLS@ (cd library/Tries; make clean) + @INSTALL_DLLS@ (cd library/tries; make clean) @INSTALL_DLLS@ (cd library/lammpi; make clean) @ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; make clean) diff --git a/configure b/configure index 8cf9e2042..3f1b8de28 100755 --- a/configure +++ b/configure @@ -15607,7 +15607,7 @@ mkdir -p library/mpi mkdir -p library/random mkdir -p library/regex mkdir -p library/system -mkdir -p library/Tries +mkdir -p library/tries mkdir -p library/lammpi mkdir -p library/yap2swi mkdir -p CHR @@ -15623,7 +15623,7 @@ mkdir -p LGPL/clp mkdir -p LGPL/clpr mkdir -p LGPL/chr - ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap" + ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16164,7 +16164,7 @@ do "LGPL/clp/Makefile" ) CONFIG_FILES="$CONFIG_FILES LGPL/clp/Makefile" ;; "LGPL/clpr/Makefile" ) CONFIG_FILES="$CONFIG_FILES LGPL/clpr/Makefile" ;; "library/lammpi/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/lammpi/Makefile" ;; - "library/Tries/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/Tries/Makefile" ;; + "library/tries/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/tries/Makefile" ;; "LGPL/JPL/Makefile" ) CONFIG_FILES="$CONFIG_FILES LGPL/JPL/Makefile" ;; "LGPL/JPL/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES LGPL/JPL/src/Makefile" ;; "LGPL/JPL/java/Makefile" ) CONFIG_FILES="$CONFIG_FILES LGPL/JPL/java/Makefile" ;; diff --git a/configure.in b/configure.in index f8363544c..2adedb44f 100644 --- a/configure.in +++ b/configure.in @@ -1312,7 +1312,7 @@ mkdir -p library/mpi mkdir -p library/random mkdir -p library/regex mkdir -p library/system -mkdir -p library/Tries +mkdir -p library/tries mkdir -p library/lammpi mkdir -p library/yap2swi mkdir -p CHR @@ -1328,7 +1328,7 @@ mkdir -p LGPL/clp mkdir -p LGPL/clpr mkdir -p LGPL/chr -AC_OUTPUT(Makefile library/matrix/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap) +AC_OUTPUT(Makefile library/matrix/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap) make depend diff --git a/library/itries.yap b/library/itries.yap new file mode 100644 index 000000000..3f7ed80e9 --- /dev/null +++ b/library/itries.yap @@ -0,0 +1,33 @@ +/********************************* + File: itries.yap + Author: Ricardo Rocha + Comments: Tries module for ILP + version: $ID$ +*********************************/ + +:- module(itries, [ + itrie_open/1, + itrie_close/1, + itrie_close_all/0, + itrie_mode/2, + itrie_timestamp/2, + itrie_put_entry/2, + itrie_update_entry/2, + itrie_check_entry/3, + itrie_get_entry/2, + itrie_get_data/2, + itrie_traverse/2, + itrie_remove_entry/1, + itrie_remove_subtree/1, + itrie_join/2, + itrie_add/2, + itrie_subtract/2, + itrie_save/2, + itrie_load/2, + itrie_stats/4, + itrie_max_stats/4, + itrie_usage/4, + itrie_print/1 + ]). + +:- load_foreign_files([itries], [], init_itries). diff --git a/library/tries.yap b/library/tries.yap index d488e4017..42103607c 100644 --- a/library/tries.yap +++ b/library/tries.yap @@ -1,30 +1,33 @@ -/************************************************************************* -* * -* YAP Prolog * -* * -* Yap Prolog was developed at NCCUP - Universidade do Porto * -* * -* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 * -* * -************************************************************************** -* * -* File: tries.yap * -* Last rev: * -* mods: * -* comments: Tries manipulation routines * -* * -*************************************************************************/ +/**************************************** + File: tries.yap + Author: Ricardo Rocha + Comments: Tries module for Yap Prolog + version: $ID$ +****************************************/ :- module(tries, [ + trie_open/1, + trie_close/1, + trie_close_all/0, + trie_mode/1, + trie_put_entry/3, + trie_check_entry/3, + trie_get_entry/2, + trie_remove_entry/1, + trie_remove_subtree/1, + trie_save/2, + trie_load/2, + trie_stats/4, + trie_max_stats/4, + trie_usage/4, + trie_print/1, open_trie/1, close_trie/1, close_all_tries/0, - put_trie_entry/3, - get_trie_entry/2, + put_trie_entry/4, + get_trie_entry/3, remove_trie_entry/1, - trie_statistics/0, print_trie/1 ]). -:- load_foreign_files([yap_tries], [], init_tries). - +:- load_foreign_files([tries], [], init_tries).