//
// $Id$

package com.threerings.stats.data;

import java.io.IOException;
import java.util.HashSet;

import com.samskivert.util.StringUtil;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;

/**
 * Used to track a statistic comprised of a bounded set of integers.
 */
public class IntSetStat extends Stat
{
    /**
     * Constructs a new IntSetStat that will store up to 255 ints.
     */
    public IntSetStat ()
    {
        _maxSize = MAX_MAX_SIZE;
    }

    /**
     * Constructs a new IntSetStat that will store up to maxSize ints.
     *
     * @param the maximum number of ints to store in the IntSetStat. Must be <= 255.
     */
    public IntSetStat (int maxSize)
    {
        _maxSize = Math.min(maxSize, MAX_MAX_SIZE);
    }

    /**
     * Returns the number of values stored in the set.
     */
    public int size ()
    {
        return _intSet.size();
    }

    /**
     * Returns true if the specified int is contained in this set.
     */
    public boolean contains (int key)
    {
        return _intSet.contains(key);
    }

    /**
     * Adds the specified int to this set.
     *
     * @return true if the int was newly added, false if it was already contained in the set, or
     * if the set is full.
     */
    public boolean add (int key)
    {
        return (_intSet.size() < _maxSize ? _intSet.add(key) : false);
    }

    @Override
    public void persistTo (ObjectOutputStream out, AuxDataSource aux)
        throws IOException
    {
        out.writeByte(_maxSize - 128);
        out.writeByte(_intSet.size() - 128);
        for (int key : _intSet) {
            out.writeInt(key);
        }
    }

    @Override
    public void unpersistFrom (ObjectInputStream in, AuxDataSource aux)
        throws IOException, ClassNotFoundException
    {
        _maxSize = ((int)in.readByte()) + 128;
        int numValues = ((int)in.readByte()) + 128;
        _intSet = new HashSet<Integer>(numValues);
        for (int ii = 0; ii < numValues; ii++) {
            _intSet.add(in.readInt());
        }

    }

    @Override
    public String valueToString ()
    {
        return StringUtil.toString(_intSet);
    }

    protected int _maxSize;
    protected HashSet<Integer> _intSet = new HashSet<Integer>();

    protected static final int MAX_MAX_SIZE = 255;

}

@@ -73,35 +73,84 @@
 on;%0A
+%0A
 import 
-java.util.Hash
+com.samskivert.util.ArrayIntSet;%0Aimport com.samskivert.util.Int
 Set;%0A
-%0A
 impo
@@ -1371,22 +1371,34 @@
         
-return
+boolean modified =
  (_intSe
@@ -1420,10 +1420,12 @@
 Size
- ?
+) &&
  _in
@@ -1441,17 +1441,77 @@
 key)
- : false)
+;%0A        setModified(_modified %7C%7C modified);%0A        return modified
 ;%0A  
@@ -2062,32 +2062,27 @@
 t = new 
-HashSet%3CInteger%3E
+ArrayIntSet
 (numValu
@@ -2345,55 +2345,40 @@
 ted 
-HashSet%3CInteger%3E _intSet = new HashSet%3CInteger%3E
+IntSet _intSet = new ArrayIntSet
 ();%0A

Use an ArrayIntSet instead of a HashSet<Integer> as it's way more memory efficient (and almost certainly faster as well for sets of this size).