* algebra/cycles.spad.pamphlet (CycleIndicators) [nniBump]: New

	local function.
	[SFunction]: Use it.

7 files changed, 18 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d810dde..37844e25 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2013-05-18  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
+	* algebra/cycles.spad.pamphlet (CycleIndicators) [nniBump]: New
+	local function.
+	[SFunction]: Use it.
+
+2013-05-18  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
 	* algebra/cycles.spad.pamphlet (CycleIndicators)
 	[complete,alternating]:  Change input type to NonNegativeInteger.
 
diff --git a/src/algebra/cycles.spad.pamphlet b/src/algebra/cycles.spad.pamphlet
index 4e313acb..715d49ca 100644
--- a/src/algebra/cycles.spad.pamphlet
+++ b/src/algebra/cycles.spad.pamphlet
@@ -196,9 +196,14 @@ CycleIndicators: Exports == Implementation where
  
     wreath(spol1,spol2) == evspol(mtpol(#1,spol2),spol1)
  
+    nniBump(x: Integer): NNI ==
+      x < 0 => 0
+      x = 0 => 1
+      x::NNI
+
     SFunction li==
       a:Matrix SPOL RN :=
-        matrix [[complete((k -j+i)::PI) for k in li for j in 1..#li]
+        matrix [[complete nniBump(k -j+i) for k in li for j in 1..#li]
                     for i in 1..#li]
       determinant a
  
@@ -211,7 +216,7 @@ CycleIndicators: Exports == Implementation where
       #li1 < #li2 =>
         error "skewSFunction: partition1 does not include partition2"
       li2:=roundup (li1,li2)
-      a:Matrix SPOL RN:=matrix [[complete((k-li2.i-j+i)::PI)
+      a:Matrix SPOL RN:=matrix [[complete nniBump(k-li2.i-j+i)
                for k in li1 for j in 1..#li1]  for i in 1..#li1]
       determinant a
 
diff --git a/src/share/algebra/browse.daase b/src/share/algebra/browse.daase
index b0d0e79d..bcc8cb5e 100644
--- a/src/share/algebra/browse.daase
+++ b/src/share/algebra/browse.daase
@@ -1,5 +1,5 @@
 
-(1969268 . 3577918049)       
+(1969268 . 3577920836)       
 (-18 A S) 
 ((|constructor| (NIL "One-dimensional-array aggregates serves as models for one-dimensional arrays. Categorically,{} these aggregates are finite linear aggregates with the \\spadatt{shallowlyMutable} property,{} that is,{} any component of the array may be changed without affecting the identity of the overall array. Array data structures are typically represented by a fixed area in storage and therefore cannot efficiently grow or shrink on demand as can list structures (see however \\spadtype{FlexibleArray} for a data structure which is a cross between a list and an array). Iteration over,{} and access to,{} elements of arrays is extremely fast (and often can be optimized to open-code). Insertion and deletion however is generally slow since an entirely new data structure must be created for the result."))) 
 NIL 
diff --git a/src/share/algebra/category.daase b/src/share/algebra/category.daase
index 01e4cc4f..02e04201 100644
--- a/src/share/algebra/category.daase
+++ b/src/share/algebra/category.daase
@@ -1,5 +1,5 @@
 
-(200821 . 3577918052)        
+(200821 . 3577920839)        
 ((((-773)) . T)) 
 ((((-773)) . T)) 
 ((((-773)) . T)) 
diff --git a/src/share/algebra/compress.daase b/src/share/algebra/compress.daase
index a7640197..624a169c 100644
--- a/src/share/algebra/compress.daase
+++ b/src/share/algebra/compress.daase
@@ -1,5 +1,5 @@
 
-(30 . 3577918048)            
+(30 . 3577920835)            
 (4000 |Enumeration| |Mapping| |Record| |Union| |ofCategory| |isDomain|
  ATTRIBUTE |package| |domain| |category| CATEGORY |nobranch| AND |Join|
  |ofType| SIGNATURE "failed" "algebra" |OneDimensionalArrayAggregate&|
diff --git a/src/share/algebra/interp.daase b/src/share/algebra/interp.daase
index 818c8794..52cc6490 100644
--- a/src/share/algebra/interp.daase
+++ b/src/share/algebra/interp.daase
@@ -1,5 +1,5 @@
 
-(2819823 . 3577918056)       
+(2819823 . 3577920843)       
 ((-1733 (((-85) (-1 (-85) |#2| |#2|) $) 86 T ELT) (((-85) $) NIL T ELT)) (-1731 (($ (-1 (-85) |#2| |#2|) $) 18 T ELT) (($ $) NIL T ELT)) (-3790 ((|#2| $ (-485) |#2|) NIL T ELT) ((|#2| $ (-1147 (-485)) |#2|) 44 T ELT)) (-2298 (($ $) 80 T ELT)) (-3844 ((|#2| (-1 |#2| |#2| |#2|) $ |#2| |#2|) 52 T ELT) ((|#2| (-1 |#2| |#2| |#2|) $ |#2|) 50 T ELT) ((|#2| (-1 |#2| |#2| |#2|) $) 49 T ELT)) (-3421 (((-485) (-1 (-85) |#2|) $) 27 T ELT) (((-485) |#2| $) NIL T ELT) (((-485) |#2| $ (-485)) 96 T ELT)) (-3520 (($ (-1 (-85) |#2| |#2|) $ $) 64 T ELT) (($ $ $) NIL T ELT)) (-2610 (((-584 |#2|) $) 13 T ELT)) (-3328 (($ (-1 |#2| |#2|) $) 37 T ELT)) (-3960 (($ (-1 |#2| |#2|) $) NIL T ELT) (($ (-1 |#2| |#2| |#2|) $ $) 60 T ELT)) (-2305 (($ |#2| $ (-485)) NIL T ELT) (($ $ $ (-485)) 67 T ELT)) (-1355 (((-3 |#2| "failed") (-1 (-85) |#2|) $) 29 T ELT)) (-1948 (((-85) (-1 (-85) |#2|) $) 23 T ELT)) (-3802 ((|#2| $ (-485) |#2|) NIL T ELT) ((|#2| $ (-485)) NIL T ELT) (($ $ (-1147 (-485))) 66 T ELT)) (-2306 (($ $ (-485)) 76 T ELT) (($ $ (-1147 (-485))) 75 T ELT)) (-1947 (((-695) (-1 (-85) |#2|) $) 34 T ELT) (((-695) |#2| $) NIL T ELT)) (-1732 (($ $ $ (-485)) 69 T ELT)) (-3402 (($ $) 68 T ELT)) (-3532 (($ (-584 |#2|)) 73 T ELT)) (-3804 (($ $ |#2|) NIL T ELT) (($ |#2| $) NIL T ELT) (($ $ $) 87 T ELT) (($ (-584 $)) 85 T ELT)) (-3948 (((-773) $) 92 T ELT)) (-1949 (((-85) (-1 (-85) |#2|) $) 22 T ELT)) (-3058 (((-85) $ $) 95 T ELT)) (-2687 (((-85) $ $) 99 T ELT))) 
 (((-18 |#1| |#2|) (-10 -7 (-15 -3058 ((-85) |#1| |#1|)) (-15 -3948 ((-773) |#1|)) (-15 -1947 ((-695) |#2| |#1|)) (-15 -3328 (|#1| (-1 |#2| |#2|) |#1|)) (-15 -2687 ((-85) |#1| |#1|)) (-15 -1731 (|#1| |#1|)) (-15 -1731 (|#1| (-1 (-85) |#2| |#2|) |#1|)) (-15 -2298 (|#1| |#1|)) (-15 -1732 (|#1| |#1| |#1| (-485))) (-15 -1733 ((-85) |#1|)) (-15 -3520 (|#1| |#1| |#1|)) (-15 -3421 ((-485) |#2| |#1| (-485))) (-15 -3421 ((-485) |#2| |#1|)) (-15 -3421 ((-485) (-1 (-85) |#2|) |#1|)) (-15 -1733 ((-85) (-1 (-85) |#2| |#2|) |#1|)) (-15 -3520 (|#1| (-1 (-85) |#2| |#2|) |#1| |#1|)) (-15 -1949 ((-85) (-1 (-85) |#2|) |#1|)) (-15 -1948 ((-85) (-1 (-85) |#2|) |#1|)) (-15 -1947 ((-695) (-1 (-85) |#2|) |#1|)) (-15 -2610 ((-584 |#2|) |#1|)) (-15 -3844 (|#2| (-1 |#2| |#2| |#2|) |#1|)) (-15 -3844 (|#2| (-1 |#2| |#2| |#2|) |#1| |#2|)) (-15 -3844 (|#2| (-1 |#2| |#2| |#2|) |#1| |#2| |#2|)) (-15 -3790 (|#2| |#1| (-1147 (-485)) |#2|)) (-15 -2305 (|#1| |#1| |#1| (-485))) (-15 -2305 (|#1| |#2| |#1| (-485))) (-15 -2306 (|#1| |#1| (-1147 (-485)))) (-15 -2306 (|#1| |#1| (-485))) (-15 -3960 (|#1| (-1 |#2| |#2| |#2|) |#1| |#1|)) (-15 -3804 (|#1| (-584 |#1|))) (-15 -3804 (|#1| |#1| |#1|)) (-15 -3804 (|#1| |#2| |#1|)) (-15 -3804 (|#1| |#1| |#2|)) (-15 -3802 (|#1| |#1| (-1147 (-485)))) (-15 -3532 (|#1| (-584 |#2|))) (-15 -1355 ((-3 |#2| "failed") (-1 (-85) |#2|) |#1|)) (-15 -3802 (|#2| |#1| (-485))) (-15 -3802 (|#2| |#1| (-485) |#2|)) (-15 -3790 (|#2| |#1| (-485) |#2|)) (-15 -3960 (|#1| (-1 |#2| |#2|) |#1|)) (-15 -3402 (|#1| |#1|))) (-19 |#2|) (-1130)) (T -18)) 
 NIL 
diff --git a/src/share/algebra/operation.daase b/src/share/algebra/operation.daase
index d6135691..5ba58165 100644
--- a/src/share/algebra/operation.daase
+++ b/src/share/algebra/operation.daase
@@ -1,5 +1,5 @@
 
-(631296 . 3577918049)        
+(631296 . 3577920836)        
 (((*1 *2 *3 *4)
   (|partial| -12 (-5 *3 (-1180 *4)) (-4 *4 (-13 (-962) (-581 (-485))))
    (-5 *2 (-1180 (-350 (-485)))) (-5 *1 (-1209 *4)))))