Changeset 2822 for trunk/packages/vizservers/nanovis/BucketSort.h

Timestamp:

Mar 7, 2012 12:21:30 PM (12 years ago)

Author:

ldelgass

Message:

Const correctness fixes, pass vector/matrix objects by reference, various
formatting and style cleanups, don't spam syslog and uncomment openlog() call.
Still needs to be compiled with -DWANT_TRACE to get tracing, but now trace
output will be output to file in /tmp.

File:

• trunk/packages/vizservers/nanovis/BucketSort.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/BucketSort.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef __BUCKETSORT_H_
-#define __BUCKETSORT_H_
+#ifndef BUCKETSORT_H
+#define BUCKETSORT_H
 
 #include <vector>
@@ -13 +13 @@
 class ClusterList {
 public :
-        Cluster* data;
-        ClusterList* next;
+    Cluster* data;
+    ClusterList* next;
 public :
-        ClusterList(Cluster* d, ClusterList* n)
-                : data(d), next(n)
-        {}
+    ClusterList(Cluster *d, ClusterList *n) :
+        data(d), next(n)
+    {}
 
-        ClusterList()
-                : data(0), next(0)
-        {}
+    ClusterList() :
+        data(0), next(0)
+    {}
 
-        ~ClusterList()
-        {
-                //if (next) delete next;
-        }
+    ~ClusterList()
+    {
+        //if (next) delete next;
+    }
 };
 
 class BucketSort {
-        ClusterList** _buffer;
-        int _size;
-        int _count;
+    ClusterList **_buffer;
+    int _size;
+    int _count;
 
-        int _memChuckSize;
-        bool _memChunckUsedFlag;
-        ClusterList* _memChunck;
-        
-        float _invMaxLength;
-private :
-        //void _sort(Cluster* cluster, const Matrix4& cameraMat, int level);
-        void _sort(Cluster* cluster, const Mat4x4& cameraMat, int level);
-public :
-        BucketSort(int maxSize)
-        {
-                _size = maxSize;
-                _buffer = new ClusterList*[maxSize];
-                memset(_buffer, 0, _size * sizeof(ClusterList*));
+    int _memChuckSize;
+    bool _memChunckUsedFlag;
+    ClusterList *_memChunck;
 
-                _memChuckSize = 1000000;
-                _memChunck = new ClusterList[_memChuckSize];
+    float _invMaxLength;
+private:
+    void _sort(Cluster *cluster, const Mat4x4& cameraMat, int level);
+public:
+    BucketSort(int maxSize)
+    {
+        _size = maxSize;
+        _buffer = new ClusterList*[maxSize];
+        memset(_buffer, 0, _size * sizeof(ClusterList*));
 
-                _invMaxLength = 1.0f / 4.0f;
-        }
+        _memChuckSize = 1000000;
+        _memChunck = new ClusterList[_memChuckSize];
 
-        ~BucketSort()
-        {
-                delete [] _buffer;
-                delete [] _memChunck;
-        }
+        _invMaxLength = 1.0f / 4.0f;
+    }
 
-        int getSize() const { return _size; }
-        int getSortedItemCount() const { return _count; }
-        void init();
-        //void sort(ClusterAccel* cluster, const Matrix4& cameraMat, float maxLength);
-        //void sort(ClusterAccel* cluster, const Matrix4& cameraMat, int level);
-        void sort(ClusterAccel* cluster, const Mat4x4& cameraMat, int level);
-        void addBucket(Cluster* cluster, float ratio);
-        ClusterList** getBucket() { return _buffer; }
+    ~BucketSort()
+    {
+        delete [] _buffer;
+        delete [] _memChunck;
+    }
+
+    int getSize() const
+    { return _size; }
+
+    int getSortedItemCount() const
+    { return _count; }
+
+    void init();
+
+    void sort(ClusterAccel* cluster, const Mat4x4& cameraMat, int level);
+
+    void addBucket(Cluster* cluster, float ratio);
+
+    ClusterList **getBucket()
+    { return _buffer; }
 };