more fixes

Author: lemire

runcontainer.go

@@ -2792,15 +2792,20 @@ func (rc *runContainer16) validate() error {
 		    check that the number of runs < (number of distinct values) / 2
 		    (otherwise you could use an array container)
 	*/
-	if MaxIntervalsSum <= intervalsSum {
-		if !(len(rc.iv) < MaxNumIntervals) {
-			return ErrRunIntervalSize
-		}
-	} else {
-		if !(2*len(rc.iv) < intervalsSum) {
-			return ErrRunIntervalSize
-		}
-	}
 
+	sizeAsRunContainer := runContainer16SerializedSizeInBytes(len(rc.iv))
+	sizeAsBitmapContainer := bitmapContainerSizeInBytes()
+	sizeAsArrayContainer := arrayContainerSizeInBytes(intervalsSum)
+	fmt.Println(sizeAsRunContainer, sizeAsBitmapContainer, sizeAsArrayContainer)
+	// this is always ok:
+	if sizeAsRunContainer < minOfInt(sizeAsBitmapContainer, sizeAsArrayContainer) {
+		return nil
+	}
+	if sizeAsRunContainer >= sizeAsBitmapContainer {
+		return ErrRunIntervalSize
+	}
+	if sizeAsRunContainer >= sizeAsArrayContainer {
+		return ErrRunIntervalSize
+	}
 	return nil
 }

runcontainer_test.go

@@ -2588,13 +2588,12 @@ func TestIntervalValidationFailing(t *testing.T) {
 	start := -4
 	for i := 0; i < MaxNumIntervals; i++ {
 		start += 4
-		end := start + 2
+		end := start + 1
 		a := newInterval16Range(uint16(start), uint16(end))
 		rc.iv = append(rc.iv, a)
 
 	}
 	assert.ErrorIs(t, rc.validate(), ErrRunIntervalSize)
-
 	// too many small runs, use array
 	rc = &runContainer16{}
 	start = -3