[cig-commits] r14074 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2009-02-18 08:14:20 -0800 (Wed, 18 Feb 2009)
New Revision: 14074

Modified:
   cs/cigma/trunk/src/Locator.cpp
   cs/cigma/trunk/src/Locator.h
Log:
Account for new Locator types

Modified: cs/cigma/trunk/src/Locator.cpp
===================================================================
--- cs/cigma/trunk/src/Locator.cpp	2009-02-18 16:14:18 UTC (rev 14073)
+++ cs/cigma/trunk/src/Locator.cpp	2009-02-18 16:14:20 UTC (rev 14074)
@@ -1,15 +1,15 @@
 #include "Locator.h"
-#include <iostream>
+#include "tri_logger.hpp"
 
 using namespace cigma;
 
 Locator::Locator()
 {
-    //std::cout << "Calling Locator()" << std::endl;
+    TRI_LOG_STR("Locator::Locator()");
 }
 
 Locator::~Locator()
 {
-    //std::cout << "Calling ~Locator()" << std::endl;    
+    TRI_LOG_STR("Locator::~Locator()");
 }
 

Modified: cs/cigma/trunk/src/Locator.h
===================================================================
--- cs/cigma/trunk/src/Locator.h	2009-02-18 16:14:18 UTC (rev 14073)
+++ cs/cigma/trunk/src/Locator.h	2009-02-18 16:14:20 UTC (rev 14074)
@@ -1,5 +1,5 @@
-#ifndef __CIGMA_LOCATOR_H__
-#define __CIGMA_LOCATOR_H__
+#ifndef CIGMA_LOCATOR_H
+#define CIGMA_LOCATOR_H
 
 namespace cigma
 {
@@ -12,13 +12,21 @@
     Locator();
     virtual ~Locator();
 
-    virtual void searchBoundingBox(double *bbox) = 0;
-    virtual void searchPoint(double *point) = 0;
+    virtual int n_dim() const = 0;
+    virtual void search(double *point) = 0;
 
-    virtual int n_dim() const = 0;
     virtual int n_idx() const = 0;
     virtual int idx(int i) const = 0;
+
+    enum LocatorType {
+        BruteForceType,
+        BoundingBoxType,
+        KdtreeType,
+        StructuredType,
+        RectilinearType
+    };
+
+    virtual LocatorType getType() const = 0;
 };
 
-
 #endif