print(<array>, max = <small>) should typically show *some*, compatibly w/ <matrix>

git-svn-id: https://svn.r-project.org/R/trunk@87770 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: maechler

src/main/printarray.c

@@ -444,8 +444,8 @@ void printArray(SEXP x, SEXP dim, int quote, int right, SEXP dimnames)
 	    /* for the last, (nb_pr)th matrix slice, use only nr_last rows;
 	     *  using floor(), not ceil(), since 'nc' could be huge: */
 	    ne_last = R_print.max - b * (nb_pr - 1);
-	    nc_last = (ne_last < nc) ? 0: nc;
-	    nr_last = (ne_last < nc) ? 0: ne_last / nc;
+	    nc_last = (ne_last < nc) ? ne_last : nc;
+	    nr_last = (ne_last < nc) ? 1 : ne_last / nc;
 	    if(nr_last == 0) { nb_pr--; nc_last = nc; nr_last = nr;} 
 	} else {
 	    nb_pr = (nb > 0) ? nb : 1; // do print *something* when dim = c(a,b,0)
@@ -511,12 +511,8 @@ void printArray(SEXP x, SEXP dim, int quote, int right, SEXP dimnames)
 	    if (nb_pr < nb)
 		Rprintf(ngettext(" %d slice", " %d slices", nb - nb_pr), nb - nb_pr);
 	    else if (nb_pr == nb) {
-		if(nr_last < nr) Rprintf(ngettext(" %d row",    " %d rows",    nr - nr_last), nr - nr_last);
-		if(nc_last < nc) Rprintf(ngettext(" %d column", " %d columns", nc - nc_last), nc - nc_last);
-/* == MM: replace the above with
 		if((nr -= nr_last) > 0) Rprintf(ngettext(" %d row",    " %d rows",    nr), nr);
 		if((nc -= nc_last) > 0) Rprintf(ngettext(" %d column", " %d columns", nc), nc);
-*/
 	    }
 	    Rprintf(" ] \n");
 	}

tests/print-tests.R

@@ -348,12 +348,13 @@ print(matrix(nrow =   0, ncol = 4), max = 3)    # omitting 1 column
 print(matrix(nrow =  10, ncol = 2), max = 5)    # omitting rows
 print(matrix(nrow =   1, ncol = 6), max = 5)    # omitting 1 col, at least one row prints
 ## ----- "higher" arrays ("rank >= 3"): --------
-print(array(dim = c(2, 2, 2)), max = 5) # omit 1 slice
+print(array(dim = c(2, 2, 2)), max = 4) # omit 1 slice
+print(array(dim = c(2, 2, 2)), max = 5) # omit 1 row + 1 column
 print(array(dim = c(2, 2, 2)), max = 6) # omit 1 row
 print(array(dim = c(2, 2, 2)), max = 7) # omit 1 row
 #
 print(array(dim = c(2, 2, 1)), max = 2) # omit 1 row
-print(array(dim = c(2, 2, 1)), max = 1) # omit the only slice
+print(array(dim = c(2, 2, 1)), max = 1) # omit 1 row + 1 column
 
 
 

tests/print-tests.Rout.save

@@ -1,5 +1,5 @@
 
-R Under development (unstable) (2025-02-20 r87760) -- "Unsuffered Consequences"
+R Under development (unstable) (2025-02-20 r87768) -- "Unsuffered Consequences"
 Copyright (C) 2025 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu
 
@@ -974,14 +974,27 @@ NULL
 [1,]   NA   NA   NA   NA   NA
  [ reached 'max' / getOption("max.print") -- omitted 1 column ]
 > ## ----- "higher" arrays ("rank >= 3"): --------
-> print(array(dim = c(2, 2, 2)), max = 5) # omit 1 slice
+> print(array(dim = c(2, 2, 2)), max = 4) # omit 1 slice
 , , 1
 
      [,1] [,2]
 [1,]   NA   NA
 [2,]   NA   NA
 
  [ reached 'max' / getOption("max.print") -- omitted 1 slice ] 
+> print(array(dim = c(2, 2, 2)), max = 5) # omit 1 row + 1 column
+, , 1
+
+     [,1] [,2]
+[1,]   NA   NA
+[2,]   NA   NA
+
+, , 2
+
+     [,1]
+[1,]   NA
+
+ [ reached 'max' / getOption("max.print") -- omitted 1 row 1 column ] 
 > print(array(dim = c(2, 2, 2)), max = 6) # omit 1 row
 , , 1
 
@@ -1016,8 +1029,13 @@ NULL
 [1,]   NA   NA
 
  [ reached 'max' / getOption("max.print") -- omitted 1 row ] 
-> print(array(dim = c(2, 2, 1)), max = 1) # omit the only slice
- [ reached 'max' / getOption("max.print") -- omitted 1 slice ] 
+> print(array(dim = c(2, 2, 1)), max = 1) # omit 1 row + 1 column
+, , 1
+
+     [,1]
+[1,]   NA
+
+ [ reached 'max' / getOption("max.print") -- omitted 1 row 1 column ] 
 > 
 > 
 >