[Debtags-commits] [svn] r1952 - in tagcoll/2.0: . bench debian tagcoll tagcoll/coll tagcoll/stream tools

Enrico Zini enrico at costa.debian.org
Sun Sep 24 18:46:41 UTC 2006


Author: enrico
Date: Sun Sep 24 18:46:39 2006
New Revision: 1952

Added:
   tagcoll/2.0/debian/libtagcoll2-dev.copyright
   tagcoll/2.0/debian/libtagcoll2-dev.dirs
   tagcoll/2.0/debian/libtagcoll2-dev.docs
   tagcoll/2.0/debian/libtagcoll2-dev.install
   tagcoll/2.0/libtagcoll2.m4
   tagcoll/2.0/libtagcoll2.pc.in
Removed:
   tagcoll/2.0/debian/libtagcoll-dev.copyright
   tagcoll/2.0/debian/libtagcoll-dev.dirs
   tagcoll/2.0/debian/libtagcoll-dev.docs
   tagcoll/2.0/debian/libtagcoll-dev.install
   tagcoll/2.0/libtagcoll.m4
   tagcoll/2.0/libtagcoll.pc.in
Modified:
   tagcoll/2.0/   (props changed)
   tagcoll/2.0/Makefile.am
   tagcoll/2.0/bench/Makefile.am
   tagcoll/2.0/configure.ac
   tagcoll/2.0/debian/changelog
   tagcoll/2.0/debian/control
   tagcoll/2.0/tagcoll/Makefile.am
   tagcoll/2.0/tagcoll/coll/base.tcc
   tagcoll/2.0/tagcoll/stream/filters-tut.cc
   tagcoll/2.0/tools/Makefile.am
Log:
 r3403 at viaza:  enrico | 2006-09-24 19:46:27 +0100
 Renamed to tagcoll2 to allow installation alongside tagcoll


Modified: tagcoll/2.0/Makefile.am
==============================================================================
--- tagcoll/2.0/Makefile.am	(original)
+++ tagcoll/2.0/Makefile.am	Sun Sep 24 18:46:39 2006
@@ -3,10 +3,10 @@
 SUBDIRS = tagcoll tools bench doc .
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA=libtagcoll.pc
+pkgconfig_DATA=libtagcoll2.pc
 
 m4dir = $(datadir)/aclocal
-m4_DATA = libtagcoll.m4
+m4_DATA = libtagcoll2.m4
 
 man_MANS = tagcoll.1 tagidx.1
 
@@ -16,4 +16,4 @@
 tagidx.1: tools/manpage doc/tagidx-man-hooks
 	tools/manpage tagidx doc/tagidx-man-hooks > $@ || rm $@
 
-EXTRA_DIST = libtagcoll.m4 libtagcoll.pc.in COPYING.libtagcoll DONE 
+EXTRA_DIST = libtagcoll2.m4 libtagcoll2.pc.in COPYING.libtagcoll DONE 

Modified: tagcoll/2.0/bench/Makefile.am
==============================================================================
--- tagcoll/2.0/bench/Makefile.am	(original)
+++ tagcoll/2.0/bench/Makefile.am	Sun Sep 24 18:46:39 2006
@@ -4,7 +4,7 @@
 	bench-main.cc \
 	Benchmark.cc \
 	collection.cc 
-benchmark_LDADD = ../tagcoll/libtagcoll.la
+benchmark_LDADD = ../tagcoll/libtagcoll2.la
 
 INCLUDES = -I$(top_srcdir)
 

Modified: tagcoll/2.0/configure.ac
==============================================================================
--- tagcoll/2.0/configure.ac	(original)
+++ tagcoll/2.0/configure.ac	Sun Sep 24 18:46:39 2006
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(tagcoll, 2.0, [enrico at debian.org])
+AC_INIT(tagcoll2, 2.0, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign subdir-objects])
@@ -66,6 +66,6 @@
 bench/Makefile
 doc/Makefile
 tools/Makefile
-libtagcoll.pc
+libtagcoll2.pc
 ])
 AC_OUTPUT

Modified: tagcoll/2.0/debian/changelog
==============================================================================
--- tagcoll/2.0/debian/changelog	(original)
+++ tagcoll/2.0/debian/changelog	Sun Sep 24 18:46:39 2006
@@ -1,10 +1,11 @@
-tagcoll (2.0-1) experimental; urgency=low
+tagcoll2 (2.0-1) experimental; urgency=low
 
   * New upstream version
      + Moved common code into libwibble (breaks API)
      + Heavily refactored the library (breaks API)
+  * Renamed to tagcoll2 to be able to have both APIs installed alongside
 
- -- Enrico Zini <enrico at debian.org>  Thu, 11 May 2006 10:10:08 -0500
+ -- Enrico Zini <enrico at debian.org>  Sun, 24 Sep 2006 19:28:17 +0100
 
 tagcoll (1.6.2-1) unstable; urgency=low
 

Modified: tagcoll/2.0/debian/control
==============================================================================
--- tagcoll/2.0/debian/control	(original)
+++ tagcoll/2.0/debian/control	Sun Sep 24 18:46:39 2006
@@ -1,4 +1,4 @@
-Source: tagcoll
+Source: tagcoll2
 Section: libdevel
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
@@ -30,7 +30,7 @@
  For more information, see the Debtags homepage at:
  http://debtags.alioth.debian.org
  
-Package: libtagcoll-dev
+Package: libtagcoll2-dev
 Section: libdevel
 Depends: zlib1g-dev
 Architecture: any

Modified: tagcoll/2.0/tagcoll/Makefile.am
==============================================================================
--- tagcoll/2.0/tagcoll/Makefile.am	(original)
+++ tagcoll/2.0/tagcoll/Makefile.am	Sun Sep 24 18:46:39 2006
@@ -62,8 +62,8 @@
 
 # This library gets the non-template code
 # (and currently some tests)
-lib_LTLIBRARIES = libtagcoll.la
-libtagcoll_la_SOURCES = \
+lib_LTLIBRARIES = libtagcoll2.la
+libtagcoll2_la_SOURCES = \
 		input/base.cc \
 		input/memory.cc \
 		input/string.cc \
@@ -81,8 +81,8 @@
 		SmartHierarchy.cc \
 		TextFormat.cc
 
-libtagcoll_la_LIBADD = tagexpr/libtagexpr.la
-libtagcoll_la_LDFLAGS = $(LIBWIBBLE_LIBS) -version-info @LIBTAGCOLL_VERSION_INFO@
+libtagcoll2_la_LIBADD = tagexpr/libtagexpr.la
+libtagcoll2_la_LDFLAGS = $(LIBWIBBLE_LIBS) -version-info @LIBTAGCOLL_VERSION_INFO@
 
 # Tests
 TESTS = tests/libtagcoll-test
@@ -112,7 +112,7 @@
 		tests/tut-main.cpp
 # Disabled: it failed, but it also looks meaningless as it is
 # test-textformat.cc
-tests_libtagcoll_test_LDADD = libtagcoll.la tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@ -lz
+tests_libtagcoll_test_LDADD = libtagcoll2.la tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@ -lz
 
 #noinst_PROGRAMS = normalize mkgraph
 # test-tagset

Modified: tagcoll/2.0/tagcoll/coll/base.tcc
==============================================================================
--- tagcoll/2.0/tagcoll/coll/base.tcc	(original)
+++ tagcoll/2.0/tagcoll/coll/base.tcc	Sun Sep 24 18:46:39 2006
@@ -39,17 +39,14 @@
 		const typename coll_traits<Self>::tag_type& t1,
 		const typename coll_traits<Self>::tag_type& t2)
 {
-	// New cardinality divided by the old cardinality
-	// Weighted by the square root of the relevance, to downplay the very
-	// common tags a bit
-	//
+	// New cardinality divided by the square root of the old cardinality.
+	// The square root is used to downplay the very common tags a bit
 	float csub1 = second.getCardinality(t1);
 	float cfull1 = first.getCardinality(t1);
 	float csub2 = second.getCardinality(t2);
 	float cfull2 = first.getCardinality(t2);
-	float tfull = first.itemCount();
-	float rel1 = csub1 / cfull1 * sqrt(cfull1 / tfull);
-	float rel2 = csub2 / cfull2 * sqrt(cfull2 / tfull);
+	float rel1 = csub1 / sqrt(cfull1);
+	float rel2 = csub2 / sqrt(cfull2);
 
 	return rel1 < rel2;
 //	return 10000 * second.getCardinality(t1) / first.getCardinality(t1)

Modified: tagcoll/2.0/tagcoll/stream/filters-tut.cc
==============================================================================
--- tagcoll/2.0/tagcoll/stream/filters-tut.cc	(original)
+++ tagcoll/2.0/tagcoll/stream/filters-tut.cc	Sun Sep 24 18:46:39 2006
@@ -200,13 +200,13 @@
 
 	tagset = result.getTagsOfItem("a");
 	ensure_equals(tagset.size(), 1u);
-	ensure_equals(*tagset.begin(), 3);
+	ensure_equals(*tagset.begin(), 3u);
 	tagset = result.getTagsOfItem("b");
 	ensure_equals(tagset.size(), 1u);
-	ensure_equals(*tagset.begin(), 0);
+	ensure_equals(*tagset.begin(), 0u);
 	tagset = result.getTagsOfItem("c");
 	ensure_equals(tagset.size(), 1u);
-	ensure_equals(*tagset.begin(), 5);
+	ensure_equals(*tagset.begin(), 5u);
 }
 
 }

Modified: tagcoll/2.0/tools/Makefile.am
==============================================================================
--- tagcoll/2.0/tools/Makefile.am	(original)
+++ tagcoll/2.0/tools/Makefile.am	Sun Sep 24 18:46:39 2006
@@ -7,13 +7,13 @@
 noinst_PROGRAMS = manpage
 
 tagcoll_SOURCES = tagcoll.cc
-tagcoll_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@
+tagcoll_LDADD = ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@
 
 #tagidx_SOURCES = BasicStringDiskIndex.cc tagidx.cc
-#tagidx_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la
+#tagidx_LDADD = ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la
 
 manpage_SOURCES = manpage.cc
-manpage_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@
+manpage_LDADD = ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la @LIBWIBBLE_LIBS@
 
 INCLUDES = -I$(top_srcdir)
 



More information about the Debtags-commits mailing list