amatch 0.1.4 → 0.1.5

data/CHANGES

@@ -1,3 +1,5 @@
+2005-01-20 (0.1.5)
+    * Bugfix for insertion/deletion weights. Sorry.
 2005-01-20 (0.1.4)
     * Better argument handling in initialization method
     * Minor changes in Rakefile and README.en

data/Rakefile

@@ -16,7 +16,7 @@ PKG_FILES = Dir.glob("**/*").delete_if {|item|
 task :default => [:test]
 
 desc "Run unit tests"
-task(:test => [:compile]) do
+task(:test => [ :clean, :compile ]) do
     ruby %{-Iext tests/test.rb}
 end
 
@@ -24,7 +24,7 @@ desc "Compiling library"
 task :compile do
     cd 'ext'  do
         ruby %{extconf.rb}
-        system "make"
+        sh "make"
     end
 end
 
@@ -38,7 +38,8 @@ end
 
 task :clean do
     cd 'ext'  do
-        system "make distclean"
+        ruby %{extconf.rb}
+        sh "make distclean" if File.exist?('Makefile')
     end
 end
 
@@ -98,5 +99,5 @@ Rake::GemPackageTask.new(spec) do |pkg|
     pkg.package_files += PKG_FILES
 end
 
-task :release => [ :clean, :compile, :package ]
+task :release => [ :clean, :package ]
     # vim: set et sw=4 ts=4:

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/ext/amatch.c

@@ -133,8 +133,8 @@ calculate_distance (self, string, mode)
             /* Bellman's principle of optimality: */
             weight = v[p]->ptr[j - 1] +
                 (pattern_ptr[i - 1] == string_ptr[j - 1] ? 0 : sw);
-             if (weight > v[p]->ptr[j] + 1) weight = v[p]->ptr[j] + dw;
-            if (weight > v[c]->ptr[j - 1] + 1) weight = v[c]->ptr[j - 1] + iw;
+            if (weight > v[p]->ptr[j] + iw) weight = v[p]->ptr[j] + iw;
+            if (weight > v[c]->ptr[j - 1] + dw) weight = v[c]->ptr[j - 1] + dw;
             v[c]->ptr[j] = weight;
         }
     }

data/tests/test.rb

@@ -70,11 +70,11 @@ class TC_AmatchTest < Test::Unit::TestCase
         assert(@matcher.match('tast') == 2)
         @matcher.subw = 1
         assert(@matcher.match('tast') == 1)
-        @matcher.insw = 2
-        assert(@matcher.insw == 2)
-        assert(@matcher.match('teist') == 2)
         @matcher.delw = 2
         assert(@matcher.delw == 2)
+        assert(@matcher.match('teist') == 2)
+        @matcher.insw = 2
+        assert(@matcher.insw == 2)
         assert(@matcher.match('tst') == 2)
         @matcher.resetw    
         assert(@matcher.subw == 1)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.10
 specification_version: 1
 name: amatch
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2005-01-20
+  version: 0.1.5
+date: 2005-05-26
 summary: Approximate String Matching library
 require_paths: 
   - lib
-author: Florian Frank
 email: flori@ping.de
 homepage: http://amatch.rubyforge.org
 rubyforge_project: amatch
@@ -25,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Florian Frank
 files: 
   - README.en
   - CHANGES
@@ -32,18 +33,13 @@ files:
   - bin
   - bin/agrep.rb
   - ext
-  - ext/Makefile
   - ext/MANIFEST
   - ext/amatch.c
   - ext/extconf.rb
-  - ext/amatch.o
-  - ext/amatch.so
   - Rakefile
   - VERSION
   - amatch.txt.en
   - install.rb
-  - config.save
-  - InstalledFiles
   - tests
   - tests/test.rb
 test_files: 

data/InstalledFiles

@@ -1,5 +0,0 @@
-/usr/local/stow/ruby/bin/
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/lib/ruby/site_ruby/1.8/i686-linux/.

data/config.save

@@ -1,12 +0,0 @@
-bin-dir=$prefix/bin
-site-ruby=$prefix/lib/ruby/site_ruby/1.8
-prefix=/usr/local/stow/ruby
-ruby-path=/usr/local/stow/ruby/bin/ruby
-make-prog=make
-rb-dir=$site-ruby
-without-ext=no
-ruby-prog=/usr/local/stow/ruby/bin/ruby
-site-ruby-common=$prefix/lib/ruby/site_ruby
-std-ruby=$prefix/lib/ruby/1.8
-data-dir=$prefix/share
-so-dir=$prefix/lib/ruby/site_ruby/1.8/i686-linux

data/ext/Makefile

@@ -1,138 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /usr/local/stow/ruby/lib/ruby/1.9/i686-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr/local/stow/ruby
-exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-builddir = $(ac_builddir)
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-datadir = $(prefix)/share
-includedir = $(prefix)/include
-infodir = $(prefix)/info
-top_builddir = $(ac_top_builddir)
-sysconfdir = $(prefix)/etc
-mandir = $(prefix)/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -L. -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-CFLAGS   =  -fPIC -g -O2  -fPIC 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS =   
-LDSHARED = $(CC) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-linux
-sitearch = i686-linux
-ruby_version = 1.9
-ruby = /usr/local/stow/ruby/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = $(RUBY) -run -e mkdir -- -p
-INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
-INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
-COPY = $(RUBY) -run -e cp -- -v
-
-#### End of system configuration section. ####
-
-
-preload = 
-libpath = $(libdir)
-LIBPATH =  -L'$(libdir)' -Wl,-R'$(libdir)'
-DEFFILE = 
-
-CLEANFILES = 
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
-OBJS = amatch.o
-TARGET = amatch
-DLLIB = $(TARGET).so
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@$(RM) Makefile extconf.h conftest.* mkmf.log
-		@$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	@$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: $(RUBYLIBDIR)
-$(RUBYARCHDIR):
-	@$(MAKEDIRS) $@
-$(RUBYLIBDIR):
-	@$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .cc .m .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	@-$(MAKEDIRS) $(@D)
-	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h