Hello community,
here is the log from the commit of package perl-Set-IntSpan
checked in at Fri Jan 18 00:19:51 CET 2008.
--------
--- perl-Set-IntSpan/perl-Set-IntSpan.changes 2007-08-03 22:55:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Set-IntSpan/perl-Set-IntSpan.changes 2008-01-17 13:40:35.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Jan 17 13:50:04 CET 2008 - pgajdos@suse.cz
+
+- updated to 1.13:
+ * recoded member(), insert(), and remove() to use a binary search
+ * added support for spans in constructors
+
+
+-------------------------------------------------------------------
Old:
----
Set-IntSpan-1.11.tar.bz2
New:
----
Set-IntSpan-1.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Set-IntSpan.spec ++++++
--- /var/tmp/diff_new_pack.y17623/_old 2008-01-18 00:12:37.000000000 +0100
+++ /var/tmp/diff_new_pack.y17623/_new 2008-01-18 00:12:37.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package perl-Set-IntSpan (Version 1.11)
+# spec file for package perl-Set-IntSpan (Version 1.13)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,12 +11,12 @@
# norootforbuild
Name: perl-Set-IntSpan
-Version: 1.11
+Version: 1.13
Release: 1
Summary: Perl module for managing sets of integers
Group: Development/Libraries/Perl
-License: Artistic License, GPL v2 or later
-URL: http://search.cpan.org/dist/Set-IntSpan/
+License: Artistic License; GPL v2 or later
+Url: http://search.cpan.org/dist/Set-IntSpan/
Source0: Set-IntSpan-%{version}.tar.bz2
Requires: perl >= %{perl_version}
BuildRequires: perl >= 5.6
@@ -60,19 +60,23 @@
%{_var}/adm/perl-modules/perl-Set-IntSpan
%changelog
-* Fri Jul 27 2007 - pgajdos@suse.cz
+* Thu Jan 17 2008 pgajdos@suse.cz
+- updated to 1.13:
+ * recoded member(), insert(), and remove() to use a binary search
+ * added support for spans in constructors
+* Fri Jul 27 2007 pgajdos@suse.cz
- package moved from OBS, version 1.11
-* Thu Jun 21 2007 - sierkb@gmx.de
+* Thu Jun 21 2007 sierkb@gmx.de
- Update to version 1.11
- Optimize packlist handling
-* Mon Nov 13 2006 - sierkb@gmx.de
+* Mon Nov 13 2006 sierkb@gmx.de
- Rebuild for openSUSE
- Spec file cleanup: removed # neededforbuild
-* Thu Jun 22 2006 - sierkb@gmx.de
+* Thu Jun 22 2006 sierkb@gmx.de
- Update to version 1.09
-* Thu Jun 15 2006 - sierkb@gmx.de
+* Thu Jun 15 2006 sierkb@gmx.de
- Rebuild for SUSE Linux 10.1
-* Tue Nov 15 2005 - sierkb@gmx.de
+* Tue Nov 15 2005 sierkb@gmx.de
- Rebuild for SUSE Linux 10.0 OSS
-* Fri Jun 10 2005 - sierkb@gmx.de
+* Fri Jun 10 2005 sierkb@gmx.de
- Initial build for SuSE Linux
++++++ Set-IntSpan-1.11.tar.bz2 -> Set-IntSpan-1.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/Changes new/Set-IntSpan-1.13/Changes
--- old/Set-IntSpan-1.11/Changes 2007-03-17 22:05:43.000000000 +0100
+++ new/Set-IntSpan-1.13/Changes 2007-10-27 10:05:33.000000000 +0200
@@ -1,5 +1,11 @@
jRevision history for Perl extension Set::IntSpan
+1.13 2007 Oct 27
+ - recoded member(), insert(), and remove() to use a binary search
+
+1.12 2007 Sep 08
+ - added support for spans in constructors
+
1.11 2007 Mar 17
- added mutating set operations
- added operator overloads
@@ -14,7 +20,7 @@
1.09 2005 Dec 13
- added indexing methods
- - 'die' instead of 'craok' on fatal errors
+ - 'die' instead of 'croak' on fatal errors
1.08 2004 May 07
- added the spans method
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/IntSpan.pm new/Set-IntSpan-1.13/IntSpan.pm
--- old/Set-IntSpan-1.11/IntSpan.pm 2007-03-17 18:49:20.000000000 +0100
+++ new/Set-IntSpan-1.13/IntSpan.pm 2007-10-28 02:58:50.000000000 +0200
@@ -6,7 +6,7 @@
use base qw(Exporter);
use Carp;
-our $VERSION = '1.11';
+our $VERSION = '1.13';
our @EXPORT_OK = qw(grep_set map_set grep_spans map_spans);
use overload
@@ -160,25 +160,103 @@
{
my($set, $array) = @_;
+ my @spans = map { ref $_ ? [ @$_ ] : [ $_, $_ ] } @$array;
+
+ $set->_insert_spans(\@spans)
+}
+
+
+sub bySpan
+{
+ my($al, $au) = @$a;
+ my($bl, $bu) = @$b;
+
+ if (defined $al && defined $bl) { return $al <=> $bl; }
+ elsif (defined $al ) { return 1; }
+ elsif ( defined $bl) { return -1; }
+ elsif (defined $au ) { return -1; }
+ elsif ( defined $bu) { return 1; }
+ else { return 0; }
+}
+
+sub _insert_spans
+{
+ my($set, $spans) = @_;
+
+ my @edges;
$set->{negInf} = 0;
$set->{posInf} = 0;
+ $set->{edges } = \@edges;
- my @edges;
- for my $element (sort { $a <=> $b } @$array)
+ my @spans = sort bySpan @$spans;
+
+ if (@spans and not defined $spans[0][0])
+ {
+ $set->{negInf} = 1;
+ my $span = shift @spans;
+
+ if (not defined $span->[1])
+ {
+ $set->{posInf} = 1;
+ return $set;
+ }
+
+ push @edges, $span->[1];
+
+ while (@spans and not defined $spans[0][0])
+ {
+ my $span = shift @spans;
+ $edges[0] = $span->[1] if $edges[0] < $span->[1];
+ }
+ }
+
+ for (@spans) { $_->[0]--; }
+
+ if (@spans and not @edges)
+ {
+ my $span = shift @spans;
+
+ if (defined $span->[1])
+ {
+ push @edges, @$span;
+ }
+ else
+ {
+ push @edges, $span->[0];
+ $set->{posInf} = 1;
+ return $set;
+ }
+ }
+
+ while (@spans and defined $spans[0][1])
+ {
+ my $span = shift @spans;
+ if ($edges[-1] < $span->[0])
+ {
+ push @edges, @$span;
+ }
+ else
+ {
+ $edges[-1] = $span->[1] if $edges[-1] < $span->[1];
+ }
+ }
+
+ if (@spans)
{
- next if @edges and $edges[-1] == $element; # skip duplicates
+ $set->{posInf} = 1;
+ my $span = shift @spans;
- if (@edges and $edges[-1] == $element-1)
+ if ($edges[-1] < $span->[0])
{
- $edges[-1] = $element;
+ push @edges, $span->[0];
}
else
{
- push @edges, $element-1, $element;
+ pop @edges;
}
}
- $set->{edges} = \@edges
+ return $set
}
@@ -763,54 +841,29 @@
{
my($set, $n) = @_;
- my $inSet = $set->{negInf};
- my $edge = $set->{edges};
-
- for (my $i=0; $i<@$edge; $i++)
- {
- if ($inSet)
- {
- return 1 if $n <= $$edge[$i];
- $inSet = 0;
- }
- else
- {
- return 0 if $n <= $$edge[$i];
- $inSet = 1;
- }
- }
+ my $i = _bsearch($set->{edges}, $n);
- $inSet
+ $set->{negInf} xor $i & 1
}
+use constant INSERT => 0;
+use constant REMOVE => 1;
+
+sub insert { _indel(@_, INSERT); }
+sub remove { _indel(@_, REMOVE); }
-sub insert
+sub _indel # INsertion/DELetion
{
- my($set, $n) = @_;
+ my($set, $n, $indel) = @_;
defined $n or return;
- my $inSet = $set->{negInf};
my $edge = $set->{edges};
+ my $i = _bsearch($edge, $n);
- my $i;
- for ($i=0; $i<@$edge; $i++)
- {
- if ($inSet)
- {
- $n <= $edge->[$i] and return;
- $inSet = 0;
- }
- else
- {
- $n <= $edge->[$i] and last;
- $inSet = 1;
- }
- }
-
- $inSet and return;
+ return if $set->{negInf} xor $i & 1 xor $indel;
- my $lGap = $i==0 || $n-1 - $edge->[$i-1];
- my $rGap = $i==@$edge || $edge->[$i] - $n;
+ my $lGap = $i==0 || $edge->[$i-1] < $n-1;
+ my $rGap = $i==@$edge || $n < $edge->[$i];
if ( $lGap and $rGap) { splice @$edge, $i, 0, $n-1, $n }
elsif (not $lGap and $rGap) { $edge->[$i-1]++ }
@@ -818,34 +871,35 @@
else { splice @$edge, $i-1, 2 }
}
-
-sub remove
+# Returns the index of the first edge that satisifies target <= edge.
+# Returns $#$edges+1 if target > the last edge.
+# Returns 0 if edges is empty.
+sub _bsearch
{
- my($set, $n) = @_;
- defined $n or return;
+ my($edges, $target) = @_;
- my $inSet = $set->{negInf};
- my $edge = $set->{edges};
+ @$edges or return 0;
+
+ my $lower = 0;
+ my $upper = $#$edges;
- my $i;
- for ($i=0; $i<@$edge; $i++)
+ while ($lower+1 < $upper)
{
- if ($inSet)
+ my $mid = int(($lower + $upper) / 2);
+
+ if ($target <= $edges->[$mid])
{
- last if $n <= $$edge[$i];
- $inSet = 0;
+ $upper = $mid;
}
else
{
- return if $n <= $$edge[$i];
- $inSet = 1;
+ $lower = $mid+1;
}
}
- return unless $inSet;
-
- splice @{$set->{edges}}, $i, 0, $n-1, $n;
- $set->_cleanup;
+ $target <= $edges->[$lower] and return $lower;
+ $target <= $edges->[$upper] and return $upper;
+ $upper + 1
}
@@ -1099,25 +1153,12 @@
$sub_set
}
-sub bySpan
-{
- my($al, $au) = @$a;
- my($bl, $bu) = @$b;
-
- if (defined $al && defined $bl) { return $al <=> $bl; }
- elsif (defined $al ) { return 1; }
- elsif ( defined $bl) { return -1; }
- elsif (defined $au ) { return -1; }
- elsif ( defined $bu) { return 1; }
- else { return 0; }
-}
-
sub map_spans(&$)
{
my($block, $set) = @_;
my @edges = @{$set->{edges}};
- my @spans = ();
+ my @spans;
if ($set->{negInf} and $set->{posInf})
{
@@ -1145,78 +1186,7 @@
push @spans, &$block();
}
- @spans = sort bySpan @spans;
- @edges = ();
- my $map_set = $set->new;
- $map_set->{edges} = \@edges;
-
- if (@spans and not defined $spans[0][0])
- {
- $map_set->{negInf} = 1;
- my $span = shift @spans;
-
- if (not defined $span->[1])
- {
- $map_set->{posInf} = 1;
- return $map_set;
- }
-
- push @edges, $span->[1];
-
- while (@spans and not defined $spans[0][0])
- {
- my $span = shift @spans;
- $edges[0] = $span->[1] if $edges[0] < $span->[1];
- }
- }
-
- for (@spans) { $_->[0]--; }
-
- if (@spans and not @edges)
- {
- my $span = shift @spans;
-
- if (defined $span->[1])
- {
- push @edges, @$span;
- }
- else
- {
- push @edges, $span->[0];
- $map_set->{posInf} = 1;
- return $map_set;
- }
- }
-
- while (@spans and defined $spans[0][1])
- {
- my $span = shift @spans;
- if ($edges[-1] < $span->[0])
- {
- push @edges, @$span;
- }
- else
- {
- $edges[-1] = $span->[1] if $edges[-1] < $span->[1];
- }
- }
-
- if (@spans)
- {
- $map_set->{posInf} = 1;
- my $span = shift @spans;
-
- if ($edges[-1] < $span->[0])
- {
- push @edges, $span->[0];
- }
- else
- {
- pop @edges;
- }
- }
-
- $map_set
+ $set->new->_insert_spans(\@spans)
}
@@ -1708,17 +1678,42 @@
alt.foo: 1-21,28,31
alt.bar: 1-14192,14194,14196-14221
+A run of consecutive integers is sometimes called a I<span>.
+
Sets are stored internally in a run-length coded form.
This provides for both compact storage and efficient computation.
In particular,
set operations can be performed directly on the encoded representation.
CSet::IntSpan is designed to manage finite sets.
-However, it can also represent some simple infinite sets, such as {x | x>n}.
+However, it can also represent some simple infinite sets, such as { x | x>n }.
This allows operations involving complements to be carried out consistently,
without having to worry about the actual value of INT_MAX on your machine.
+=head1 SPANS
+
+A I<span> is a run of consecutive integers.
+A span may be represented by an array reference,
+in any of 5 forms:
+
+=head2 Finite forms
+
+ Span Set
+ [ $n, $n ] { n }
+ [ $a, $b ] { x | a<=x && x<=b}
+
+=head2 Infinite forms
+
+ Span Set
+ [ undef, $b ] { x | x<=b }
+ [ $a , undef ] { x | x>=a }
+ [ undef, undef ] The set of all integers
+
+
+Some methods operate directly on spans.
+
+
=head1 SET SPECIFICATIONS
Many of the methods take a I<set specification>.
@@ -1737,16 +1732,11 @@
removes all elements from $set.
+
=head2 Object reference
If an object reference is given, it is taken to be a CSet::IntSpan object.
-=head2 Array reference
-
-If an array reference is given,
-then the elements of the array are taken to be the elements of the set.
-The array may contain duplicate elements.
-The elements of the array may be in any order.
=head2 Run list
@@ -1757,7 +1747,7 @@
Each run specifies a set of consecutive integers.
The set is the union of all the runs.
-Runs may be written in any of several forms.
+Runs may be written in any of 5 forms.
=head2 Finite forms
@@ -1769,7 +1759,7 @@
=item a-b
-{x | a<=x && x<=b}
+{ x | a<=x && x<=b }
=back
@@ -1779,11 +1769,11 @@
=item (-n
-{x | x<=n}
+{ x | x<=n }
=item n-)
-{x | x>=n}
+{ x | x>=n }
=item (-)
@@ -1807,37 +1797,48 @@
=head2 Examples
-=over 15
-
-=item S< >-
-
-{ }
+ Run list Set
+ "-" { }
+ "1" { 1 }
+ "1-2" { 1, 2 }
+ "-5--1" { -5, -4, -3, -2, -1 }
+ "(-)" the integers
+ "(--1" the negative integers
+ "1-3, 4, 18-21" { 1, 2, 3, 4, 18, 19, 20, 21 }
-=item S< >1
-{ 1 }
+=head2 Array reference
-=item S< >1-2
+If an array reference is given,
+then the elements of the array specify the elements of the set.
+The array may contain
-{ 1, 2 }
+=over 4
-=item S< >-5--1
+=item *
-{ -5, -4, -3, -2, -1 }
+integers
-=item S< >(-)
+=item *
-the integers
+L
-=item S< >(--1
+=back
-the negative integers
+The set is the union of all the integers and spans in the array.
+The integers and spans need not be disjoint.
+The integers and spans may be in any order.
-=item S< >1-3, 4, 18-21
+=head2 Examples
-{ 1, 2, 3, 4, 18, 19, 20, 21 }
+ Array ref Set
+ [ ] { }
+ [ 1, 1 ] { 1 }
+ [ 1, 3, 2 ] { 1, 2, 3 }
+ [ 1, [ 5, 8 ], 5, [ 7, 9 ], 2 ] { 1, 2, 5, 6, 7, 8, 9 }
+ [ undef, undef ] the integers
+ [ undef, -1 ] the negative integers
-=back
=head1 ITERATORS
@@ -2347,7 +2348,7 @@
=head2 conversion
-In boolean context, a C<$Set::IntSpan> object evaulates to true if it is not empty.
+In boolean context, a C<$Set::IntSpan> object evaluates to true if it is not empty.
A C<$Set::IntSpan> object stringizes to its run list.
@@ -2369,12 +2370,14 @@
Evaluates the BLOCK for each integer in I<$set>
(locally setting C<$_> to each integer)
-and returns a CSet::IntSpan object containg
+and returns a CSet::IntSpan object containing
all the integers returned as results of all those evaluations.
Evaluates the BLOCK in list context,
so each element of I<$set> may produce zero, one,
or more elements in the returned set.
+The elements may be returned in any order,
+and need not be disjoint.
Returns C<undef> if I<$set> is infinite.
@@ -2403,7 +2406,7 @@
[ $lower, $upper ]
as described above for C.
-Each evaulation of BLOCK must return a list of array refs of the same form.
+Each evaluation of BLOCK must return a list of L.
Each returned list may contain zero, one, or more spans.
Spans may be returned in any order, and need not be disjoint.
However, for each bounded span, the constraint
@@ -2452,7 +2455,7 @@
=item C
-(F) An infinte set was passed to C<elements>.
+(F) An infinite set was passed to C<elements>.
=item C
@@ -2497,6 +2500,7 @@
$set->union([1..5]);
+
=head2 grep_set and map_set
C and C make it easy to construct
@@ -2507,6 +2511,7 @@
$odd = grep_set { $_ & 1 } $billion; # trouble
$even = map_set { $_ * 2 } $billion; # double trouble
+
=head2 Error handling
There are two common approaches to error handling:
@@ -2543,18 +2548,34 @@
finite $set and cardinality $set < 2_000_000 and @elements = elements $set;
+
=head2 Limitations
Although CSet::IntSpan can represent some infinite sets,
it does I<not> perform infinite-precision arithmetic.
-Therefore,
-finite elements are restricted to the range of integers on your machine.
+Therefore, finite elements are restricted to the range of integers on your machine.
+
+
+=head2 Extensions
+
+Users report that you can construct Set::IntSpan objects on anything that
+behaves like an integer. For example:
+
+ $x = new Math::BigInt ...;
+ $set = new Set::Intspan [ [ $x, $x+5 ] ];
+
+I'm not documenting this as supported behavior,
+because I don't have the resources to test it,
+but I'll try not to break it.
+If anyone finds problems with it, let me know.
+
=head2 Roots
The sets implemented here are based on a Macintosh data structure called
-a I<region>.
-See Inside Macintosh for more information.
+a I<region>. See Inside Macintosh for more information.
+
+CSet::IntSpan was originally written to manage run lists for the LNews::Newsrc> module.
=head1 AUTHOR
@@ -2572,8 +2593,16 @@
=item *
+David Hawthorne
+
+=item *
+
Martin Krzywinski
+=item *
+
+Marc Lehmann
+
=back
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/MANIFEST new/Set-IntSpan-1.13/MANIFEST
--- old/Set-IntSpan-1.11/MANIFEST 2007-03-17 22:06:01.000000000 +0100
+++ new/Set-IntSpan-1.13/MANIFEST 2007-10-27 10:06:12.000000000 +0200
@@ -4,6 +4,7 @@
Makefile.PL
README
t/binary.t
+t/bsearch.t
t/cardinal.t
t/creation.t
t/error.t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/META.yml new/Set-IntSpan-1.13/META.yml
--- old/Set-IntSpan-1.11/META.yml 2007-03-17 22:11:17.000000000 +0100
+++ new/Set-IntSpan-1.13/META.yml 2007-10-28 03:39:04.000000000 +0100
@@ -1,10 +1,13 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Set-IntSpan
-version: 1.11
-version_from: IntSpan.pm
-installdirs: site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+--- #YAML:1.0
+name: Set-IntSpan
+version: 1.13
+abstract: Manages sets of integers, newsrc style
+license: ~
+generated_by: ExtUtils::MakeMaker version 6.32
+distribution_type: module
+requires:
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.2.html
+ version: 1.2
+author:
+ - Steven McDougall (swmcd@world.std.com)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/binary.t new/Set-IntSpan-1.13/t/binary.t
--- old/Set-IntSpan-1.11/t/binary.t 2007-03-17 04:01:44.000000000 +0100
+++ new/Set-IntSpan-1.13/t/binary.t 2007-10-27 10:08:15.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.11;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/bsearch.t new/Set-IntSpan-1.13/t/bsearch.t
--- old/Set-IntSpan-1.11/t/bsearch.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Set-IntSpan-1.13/t/bsearch.t 2007-10-27 10:13:48.000000000 +0200
@@ -0,0 +1,158 @@
+# -*- perl -*-
+
+use strict;
+use Set::IntSpan 1.13;
+
+my $N = 1;
+sub Not { print "not " }
+sub OK { print "ok ", $N++, "\n" }
+
+my @tests =
+(
+ [ [] , 0, 0 ],
+
+ [ [ 1 ], 0, 0 ],
+ [ [ 1 ], 1, 0 ],
+ [ [ 1 ], 2, 1 ],
+
+ [ [ 1, 2 ], 0, 0 ],
+ [ [ 1, 2 ], 1, 0 ],
+ [ [ 1, 2 ], 2, 1 ],
+ [ [ 1, 2 ], 3, 2 ],
+
+ [ [ 1, 3 ], 0, 0 ],
+ [ [ 1, 3 ], 1, 0 ],
+ [ [ 1, 3 ], 2, 1 ],
+ [ [ 1, 3 ], 3, 1 ],
+ [ [ 1, 3 ], 4, 2 ],
+
+ [ [ 1, 3, 5 ], 0, 0 ],
+ [ [ 1, 3, 5 ], 1, 0 ],
+ [ [ 1, 3, 5 ], 2, 1 ],
+ [ [ 1, 3, 5 ], 3, 1 ],
+ [ [ 1, 3, 5 ], 4, 2 ],
+ [ [ 1, 3, 5 ], 5, 2 ],
+ [ [ 1, 3, 5 ], 6, 3 ],
+
+ [ [ 1, 3, 5, 7 ], 0, 0 ],
+ [ [ 1, 3, 5, 7 ], 1, 0 ],
+ [ [ 1, 3, 5, 7 ], 2, 1 ],
+ [ [ 1, 3, 5, 7 ], 3, 1 ],
+ [ [ 1, 3, 5, 7 ], 4, 2 ],
+ [ [ 1, 3, 5, 7 ], 5, 2 ],
+ [ [ 1, 3, 5, 7 ], 6, 3 ],
+ [ [ 1, 3, 5, 7 ], 7, 3 ],
+ [ [ 1, 3, 5, 7 ], 8, 4 ],
+
+ [ [ 1, 3, 5, 7, 9 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9 ], 10, 5 ],
+
+ [ [ 1, 3, 5, 7, 9, 11 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 10, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 11, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11 ], 12, 6 ],
+
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 10, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 11, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 12, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 13, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13 ], 14, 7 ],
+
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 10, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 11, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 12, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 13, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 14, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 15, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15 ], 16, 8 ],
+
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 10, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 11, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 12, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 13, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 14, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 15, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 16, 8 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 17, 8 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17 ], 18, 9 ],
+
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 0, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 1, 0 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 2, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 3, 1 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 4, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 5, 2 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 6, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 7, 3 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 8, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 9, 4 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 10, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 11, 5 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 12, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 13, 6 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 14, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 15, 7 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 16, 8 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 17, 8 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 18, 9 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 19, 9 ],
+ [ [ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 ], 20, 10 ],
+);
+
+
+print "1..", scalar @tests, "\n";
+
+for my $test (@tests)
+{
+ my($edges, $target, $expected) = @$test;
+ my $actual = Set::IntSpan::_bsearch($edges, $target);
+ $expected==$actual or Not; OK;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/cardinal.t new/Set-IntSpan-1.13/t/cardinal.t
--- old/Set-IntSpan-1.11/t/cardinal.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/cardinal.t 2007-10-27 10:08:23.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/creation.t new/Set-IntSpan-1.13/t/creation.t
--- old/Set-IntSpan-1.11/t/creation.t 2007-03-17 00:46:58.000000000 +0100
+++ new/Set-IntSpan-1.13/t/creation.t 2007-10-27 10:08:29.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.08;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
@@ -48,13 +48,27 @@
['40-45', '20-25', '10-15', '1', '12-13', '1,10-15,20-25,40-45' ]
);
+my @New_array =
+(
+ [ [ 3, 2, 1 ], "1-3" ],
+ [ [ [ undef, -1 ] ], "(--1" ],
+ [ [ 5, [ undef, 1 ], 3 ], "(-1,3,5" ],
+ [ [ 5, [ undef, 1 ], 3, 4 ], "(-1,3-5" ],
+ [ [ 5, [ undef, 1 ], 3, [ 8, undef ], 4 ], "(-1,3-5,8-)" ],
+ [ [ 5, [ undef, 1 ], 3, [ 6, undef ], 4 ], "(-1,3-)" ],
+ [ [ 5, [ undef, 2 ], 3, [ 4, undef ], 4 ], "(-)" ],
+ [ [ [ 1, 5 ], [ 3, 8 ], 27 ], "1-8,27" ],
+ [ [ 1, [ 5, 8 ], 5, [ 7, 9 ], 2 ], "1-2,5-9" ],
+
+);
-print "1..", @New * 6 + @New_list, "\n";
-New ();
-Elements();
-Sets ();
-Spans ();
-New_list();
+print "1..", @New * 7 + @New_list + @New_array, "\n";
+New ();
+Elements ();
+Sets ();
+Spans ();
+New_list ();
+New_array();
sub New
@@ -157,10 +171,15 @@
for my $t (@New)
{
- my $set = new Set::IntSpan $t->[0];
- my @spans = spans $set;
+ my $set1 = new Set::IntSpan $t->[0];
+ my @spans = spans $set1;
my $expected = $t->[3];
equal_lists(\@spans, $expected) or Not; OK;
+
+ my $set2 = new Set::IntSpan $t->[3];
+ equal $set1 $set2 or Not; OK;
+ print "set1 $set1, set2 $set2\n";
+
}
}
@@ -171,10 +190,13 @@
# print "a <@$a>, b <@$b>\n";
@$a==@$b or return 0;
- while (@$a)
+ my @a = @$a;
+ my @b = @$b;
+
+ while (@a)
{
- my $aa = shift @$a;
- my $bb = shift @$b;
+ my $aa = shift @a;
+ my $bb = shift @b;
if (ref $aa and ref $bb) { equal_lists($aa, $bb) or return 0 }
elsif (defined $aa and defined $bb) { $aa == $bb or return 0 }
@@ -196,3 +218,14 @@
$set->equal($expected) or Not; OK;
}
}
+
+
+sub New_array
+{
+ for my $t (@New_array)
+ {
+ my $actual = new Set::IntSpan $t->[0];
+ my $expected = $t->[1];
+ $actual eq $expected or Not; OK;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/error.t new/Set-IntSpan-1.13/t/error.t
--- old/Set-IntSpan-1.11/t/error.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/error.t 2007-10-27 10:08:34.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/index.t new/Set-IntSpan-1.13/t/index.t
--- old/Set-IntSpan-1.11/t/index.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/index.t 2007-10-27 10:08:40.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/island.t new/Set-IntSpan-1.13/t/island.t
--- old/Set-IntSpan-1.11/t/island.t 2007-03-04 15:57:57.000000000 +0100
+++ new/Set-IntSpan-1.13/t/island.t 2007-10-27 10:08:53.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/iterator.t new/Set-IntSpan-1.13/t/iterator.t
--- old/Set-IntSpan-1.11/t/iterator.t 2007-03-17 00:46:58.000000000 +0100
+++ new/Set-IntSpan-1.13/t/iterator.t 2007-10-27 10:08:59.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07 qw(grep_set map_set);
+use Set::IntSpan 1.13 qw(grep_set map_set);
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/member.t new/Set-IntSpan-1.13/t/member.t
--- old/Set-IntSpan-1.11/t/member.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/member.t 2007-10-27 10:09:04.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
@@ -13,38 +13,38 @@
my @Elements = ( 1..7 );
my $Member = Table < %d\n",
+ printf "#%-12s %-12s %d -> %d\n",
"member", $run_list, $int, $result;
my $expected = $Member->[$s][$i];
$result ? $expected : ! $expected or Not; OK;
@@ -90,11 +90,9 @@
$set->$method($int);
my $result = run_list $set;
- printf "#%-12s %-12s %d -> %s\n",
+ printf "#%-12s %-12s %d -> %s\n",
$method, $run_list, $int, $result;
$result eq $expected->[$s][$i] or Not; OK;
}
}
}
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/overload.t new/Set-IntSpan-1.13/t/overload.t
--- old/Set-IntSpan-1.11/t/overload.t 2007-03-17 18:42:55.000000000 +0100
+++ new/Set-IntSpan-1.13/t/overload.t 2007-10-27 10:09:12.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.11;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/real_set.t new/Set-IntSpan-1.13/t/real_set.t
--- old/Set-IntSpan-1.11/t/real_set.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/real_set.t 2007-10-27 10:09:17.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/relation.t new/Set-IntSpan-1.13/t/relation.t
--- old/Set-IntSpan-1.11/t/relation.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/relation.t 2007-10-27 10:09:22.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/set_spec.t new/Set-IntSpan-1.13/t/set_spec.t
--- old/Set-IntSpan-1.11/t/set_spec.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/set_spec.t 2007-10-27 10:09:30.000000000 +0200
@@ -1,7 +1,7 @@
-# -*- perl -*-
-
+# -*- perl -*-
+
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/spans.t new/Set-IntSpan-1.13/t/spans.t
--- old/Set-IntSpan-1.11/t/spans.t 2007-03-04 15:57:57.000000000 +0100
+++ new/Set-IntSpan-1.13/t/spans.t 2007-10-27 10:09:35.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.10 qw(grep_spans map_spans);
+use Set::IntSpan 1.13 qw(grep_spans map_spans);
my $N = 1;
sub Not { print "not " }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/subclass.t new/Set-IntSpan-1.13/t/subclass.t
--- old/Set-IntSpan-1.11/t/subclass.t 2007-02-19 01:25:56.000000000 +0100
+++ new/Set-IntSpan-1.13/t/subclass.t 2007-10-27 10:09:40.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.07;
+use Set::IntSpan 1.13;
@Foo::Bar::ISA = qw(Set::IntSpan);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Set-IntSpan-1.11/t/unary.t new/Set-IntSpan-1.13/t/unary.t
--- old/Set-IntSpan-1.11/t/unary.t 2007-03-17 04:01:51.000000000 +0100
+++ new/Set-IntSpan-1.13/t/unary.t 2007-10-27 10:09:45.000000000 +0200
@@ -1,7 +1,7 @@
# -*- perl -*-
use strict;
-use Set::IntSpan 1.11;
+use Set::IntSpan 1.13;
my $N = 1;
sub Not { print "not " }
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
