January 2008 - moab-dev - mailman3.cels.anl.gov

r1573 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Jan '08

31 Jan '08

Author: kraftche Date: 2008-01-31 16:40:16 -0600 (Thu, 31 Jan 2008) New Revision: 1573 Modified: MOAB/trunk/WriteHDF5.cpp Log: Add proper testing for invalid (stale) handles in set contents. Rather than relying on old dense tag behavior, where we get back the default value for invalid handles, check the return code and explicitly mark invalid handles as 'not to be written'. This is more robust, and is better than wasting an entire day every time I make changes to the tag code trying to figure out why the merge test is failing. Modified: MOAB/trunk/WriteHDF5.cpp =================================================================== --- MOAB/trunk/WriteHDF5.cpp 2008-01-31 20:39:48 UTC (rev 1572) +++ MOAB/trunk/WriteHDF5.cpp 2008-01-31 22:40:16 UTC (rev 1573) @@ -976,7 +976,15 @@ // Get file IDs from handles output_id_list.resize( input_range.size() ); rval = iFace->tag_get_data( idTag, input_range, &output_id_list[0] ); - CHK_MB_ERR_0(rval); + if (MB_ENTITY_NOT_FOUND == rval) { // ignore stale handles + MBRange::const_iterator i; + std::vector<id_t>::iterator j = output_id_list.begin(); + for (i = input_range.begin(); i != input_range.end(); ++i, ++j) + if (MB_SUCCESS != iFace->tag_get_data( idTag, &*i, 1, &*j )) + *j = 0; + } + else + CHK_MB_ERR_0(rval); std::sort( output_id_list.begin(), output_id_list.end() ); // Count the number of ranges in the id list @@ -1046,7 +1054,10 @@ { handle = *i_iter; rval = iFace->tag_get_data( idTag, &handle, 1, &id ); - CHK_MB_ERR_0(rval); + if (MB_ENTITY_NOT_FOUND == rval) // ignore stale handles + id = 0; + else + CHK_MB_ERR_0(rval); *o_iter = id; ++o_iter; ++i_iter;

1 0

r1571 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Jan '08

31 Jan '08

Author: kraftche Date: 2008-01-31 13:56:52 -0600 (Thu, 31 Jan 2008) New Revision: 1571 Modified: MOAB/trunk/MBBits.hpp MOAB/trunk/TagServer.cpp Log: More bit tag fixes: - Make low-level code fail to get non-existant tag values. - Make higher-level code test for failure and return default value if available or zero otherwise. Default value now works for bit tags, but old behavior (implicit default value of zero) is kept if no default value is specified. Modified: MOAB/trunk/MBBits.hpp =================================================================== --- MOAB/trunk/MBBits.hpp 2008-01-31 19:37:10 UTC (rev 1570) +++ MOAB/trunk/MBBits.hpp 2008-01-31 19:56:52 UTC (rev 1571) @@ -401,7 +401,7 @@ if(which_page >= mBitPagesSize) { bits = 0; - return MB_SUCCESS; + return MB_TAG_NOT_FOUND; } // return bits from bit page Modified: MOAB/trunk/TagServer.cpp =================================================================== --- MOAB/trunk/TagServer.cpp 2008-01-31 19:37:10 UTC (rev 1570) +++ MOAB/trunk/TagServer.cpp 2008-01-31 19:56:52 UTC (rev 1571) @@ -226,7 +226,18 @@ { if(TYPE_FROM_HANDLE(entity_handle) >= MBMAXTYPE) return MB_TYPE_OUT_OF_RANGE; - return mBitServer->get_bits(ID_FROM_TAG_HANDLE(tag_handle), entity_handle, data); + MBErrorCode rval = mBitServer->get_bits(ID_FROM_TAG_HANDLE(tag_handle), entity_handle, data); + if (MB_TAG_NOT_FOUND == rval) { + const TagInfo* info = get_tag_info( tag_handle ); + if (!info) + return MB_FAILURE; + if (info->default_value()) + data = *reinterpret_cast<const unsigned char*>(info->default_value()); + else + data = '\0'; + return MB_SUCCESS; + } + return rval; } MBErrorCode TagServer::set_mesh_data( const MBTag tag_handle,

1 0

r1570 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Jan '08

31 Jan '08

Author: kraftche Date: 2008-01-31 13:37:10 -0600 (Thu, 31 Jan 2008) New Revision: 1570 Modified: MOAB/trunk/MBBits.hpp Log: fix write past end of array in previous checkin Modified: MOAB/trunk/MBBits.hpp =================================================================== --- MOAB/trunk/MBBits.hpp 2008-01-31 18:24:11 UTC (rev 1569) +++ MOAB/trunk/MBBits.hpp 2008-01-31 19:37:10 UTC (rev 1570) @@ -278,7 +278,10 @@ // individually. default: memset(mBitArray, 0, mPageSize); - for (int i = 0; i < 8 * mPageSize; i += num_bits_per_flag) + // Subtract 1 from mPageSize because last byte is unused, allowing + // questionable MBBitManipulator code to read/write 1 past end + // of array. + for (int i = 0; i < 8 * (mPageSize-1); i += num_bits_per_flag) MBBitManipulator::set_bits( i, num_bits_per_flag, defval, mBitArray ); } }

1 0

r1569 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Jan '08

31 Jan '08

Author: kraftche Date: 2008-01-31 12:24:11 -0600 (Thu, 31 Jan 2008) New Revision: 1569 Modified: MOAB/trunk/TestUtil.hpp Log: add new error codes Modified: MOAB/trunk/TestUtil.hpp =================================================================== --- MOAB/trunk/TestUtil.hpp 2008-01-31 18:15:15 UTC (rev 1568) +++ MOAB/trunk/TestUtil.hpp 2008-01-31 18:24:11 UTC (rev 1569) @@ -293,6 +293,8 @@ case MB_FILE_WRITE_ERROR : return "File Write Error"; case MB_NOT_IMPLEMENTED : return "Not Implemented"; case MB_ALREADY_ALLOCATED : return "Already Allocated"; + case MB_VARIABLE_DATA_LENGTH : return "Variable Data Length"; + case MB_INVALID_SIZE : return "Invalid Size"; case MB_FAILURE : return "Failure"; default : return "(unknown)"; }

1 0

r1568 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Jan '08

31 Jan '08

Author: kraftche Date: 2008-01-31 12:15:15 -0600 (Thu, 31 Jan 2008) New Revision: 1568 Modified: MOAB/trunk/MBBits.hpp MOAB/trunk/TagServer.cpp Log: Fix bug: Bit tags sometimes return zero rather than default_value for unset tags. Need to initialize MBBitPage data to default value rather than zero when a default value is available. Modified: MOAB/trunk/MBBits.hpp =================================================================== --- MOAB/trunk/MBBits.hpp 2008-01-30 00:10:50 UTC (rev 1567) +++ MOAB/trunk/MBBits.hpp 2008-01-31 18:15:15 UTC (rev 1568) @@ -181,7 +181,8 @@ MBErrorCode get_bits(int offset, int num_bits_per_flag, unsigned char& bits); //! set the bits in a bit page - MBErrorCode set_bits(int offset, int num_bits_per_flag, unsigned char bits); + MBErrorCode set_bits(int offset, int num_bits_per_flag, unsigned char bits, + const unsigned char* default_value); //! set the bits in a bit page only if space has been allocated MBErrorCode weak_set_bits(int offset, int num_bits_per_flag, unsigned char bits); @@ -238,13 +239,49 @@ takes the bits to set */ inline MBErrorCode MBBitPage::set_bits(int offset, - int num_bits_per_flag, unsigned char bits) + int num_bits_per_flag, unsigned char bits, + const unsigned char* default_value) { // if memory hasn't been allocated, allocate it and zero the memory if(!mBitArray) { mBitArray = new unsigned char[mPageSize]; - memset(mBitArray, 0, mPageSize); + // Modifed by J.Kraftcheck : 31 Jan, 2008: + // Need to initialize to default value to ensure that we return + // the default value for unset entities. + + // Zero memory if no default value. Also, if default value is + // zero, we can zero all the memory w/out worring about the + // number of bits per entity. + if (!default_value || !*default_value) + memset(mBitArray, 0, mPageSize); + // Otherwise initialize memory using default value + else { + // Mask unused bits of default value so that we can set + // individual bits using bitwise-OR w/out having to worry + // about masking unwanted stuff. + unsigned char defval = (*default_value) & ((1u << num_bits_per_flag) - 1); + + switch (num_bits_per_flag) { + // If number of bits is a power of two (a byte contains a whole + // number of tag bit values) then use memset to initialize the memory. + // Note fall-through for switch cases: for 1-bit tags we first + // copy the lsb into the adjacent bit, then fall through to 2-bit + // case, copying last two bits into next two, and so on. + case 1: defval |= (defval << 1); + case 2: defval |= (defval << 2); + case 4: defval |= (defval << 4); + case 8: memset( mBitArray, defval, mPageSize ); + break; + // If num_bits_per_flag is not a power of two, then values do + // not align with byte boundaries. Need to initialize values + // individually. + default: + memset(mBitArray, 0, mPageSize); + for (int i = 0; i < 8 * mPageSize; i += num_bits_per_flag) + MBBitManipulator::set_bits( i, num_bits_per_flag, defval, mBitArray ); + } + } } // set the bits using bit manipulator @@ -293,7 +330,8 @@ MBErrorCode get_bits(MBEntityHandle handle, unsigned char& bits); //! set bits in bit pages - MBErrorCode set_bits(MBEntityHandle handle, unsigned char bits); + MBErrorCode set_bits(MBEntityHandle handle, unsigned char bits, + const unsigned char* default_value); //! set bits in bit pages only if the bit page allocated memory MBErrorCode weak_set_bits(MBEntityHandle handle, unsigned char bits); @@ -371,7 +409,9 @@ takes entity handle takes the bits to set */ -inline MBErrorCode MBBitPageGroup::set_bits(MBEntityHandle handle, unsigned char bits) +inline MBErrorCode MBBitPageGroup::set_bits( MBEntityHandle handle, + unsigned char bits, + const unsigned char* default_value ) { // strip off the entity type handle = ID_FROM_HANDLE(handle); @@ -387,7 +427,9 @@ } // return set of bits in page - return mBitPages[which_page]->set_bits( (handle - ( which_page * mOffsetFactor )), mBitsPerFlag, bits); + return mBitPages[which_page]-> + set_bits( (handle - ( which_page * mOffsetFactor )), + mBitsPerFlag, bits, default_value ); } @@ -461,7 +503,8 @@ //! get the bits associated with an entity handle MBErrorCode get_bits(MBTagId tag_id, MBEntityHandle handle, unsigned char& bits); //! set the bits associated with an entity handle - MBErrorCode set_bits(MBTagId tag_id, MBEntityHandle handle, unsigned char bits); + MBErrorCode set_bits(MBTagId tag_id, MBEntityHandle handle, unsigned char bits, + const unsigned char* default_value); //! set the bits associated with an entity handle, only if memory has been allocated MBErrorCode weak_set_bits(MBTagId tag_id, MBEntityHandle handle, unsigned char bits); @@ -520,14 +563,16 @@ } /*! set some bits based on a tag id and handle */ -inline MBErrorCode MBBitServer::set_bits(MBTagId tag_id, - MBEntityHandle handle, unsigned char bits) +inline MBErrorCode MBBitServer::set_bits( MBTagId tag_id, + MBEntityHandle handle, + unsigned char bits, + const unsigned char* default_value ) { --tag_id; // First ID is 1. if(tag_id >= mBitPageGroupsSize || (*mBitPageGroups)[tag_id] == NULL) return MB_FAILURE; - return mBitPageGroups[TYPE_FROM_HANDLE(handle)][tag_id]->set_bits(handle, bits); + return mBitPageGroups[TYPE_FROM_HANDLE(handle)][tag_id]->set_bits(handle, bits, default_value); } /*! set some bits based on a tag id and handle only if memory has been allocated*/ Modified: MOAB/trunk/TagServer.cpp =================================================================== --- MOAB/trunk/TagServer.cpp 2008-01-30 00:10:50 UTC (rev 1567) +++ MOAB/trunk/TagServer.cpp 2008-01-31 18:15:15 UTC (rev 1568) @@ -214,7 +214,11 @@ { if(TYPE_FROM_HANDLE(entity_handle) >= MBMAXTYPE) return MB_TYPE_OUT_OF_RANGE; - return mBitServer->set_bits(ID_FROM_TAG_HANDLE(tag_handle), entity_handle, data); + const TagInfo* info = get_tag_info( tag_handle ); + if (!info) + return MB_TAG_NOT_FOUND; + return mBitServer->set_bits(ID_FROM_TAG_HANDLE(tag_handle), entity_handle, data, + reinterpret_cast<const unsigned char*>(info->default_value())); } //! get the value of a tag

1 0

r1567 - MOAB/trunk
by kraftche＠mcs.anl.gov 29 Jan '08

29 Jan '08

Author: kraftche Date: 2008-01-29 18:10:50 -0600 (Tue, 29 Jan 2008) New Revision: 1567 Modified: MOAB/trunk/MBCore.cpp MOAB/trunk/MBCore.hpp MOAB/trunk/MBInterface.hpp Log: const fixes Modified: MOAB/trunk/MBCore.cpp =================================================================== --- MOAB/trunk/MBCore.cpp 2008-01-29 20:04:20 UTC (rev 1566) +++ MOAB/trunk/MBCore.cpp 2008-01-30 00:10:50 UTC (rev 1567) @@ -1288,7 +1288,7 @@ MBErrorCode MBCore::get_number_entities_by_type_and_tag(const MBEntityHandle meshset, const MBEntityType type, const MBTag *tag_handles, - const void** values, + const void* const* values, const int num_tags, int &num_entities, const bool recursive) const Modified: MOAB/trunk/MBCore.hpp =================================================================== --- MOAB/trunk/MBCore.hpp 2008-01-29 20:04:20 UTC (rev 1566) +++ MOAB/trunk/MBCore.hpp 2008-01-30 00:10:50 UTC (rev 1567) @@ -392,7 +392,7 @@ virtual MBErrorCode get_number_entities_by_type_and_tag(const MBEntityHandle meshset, const MBEntityType type, const MBTag *tag_handles, - const void** values, + const void* const* values, const int num_tags, int &num_entities, const bool recursive = false) const; Modified: MOAB/trunk/MBInterface.hpp =================================================================== --- MOAB/trunk/MBInterface.hpp 2008-01-29 20:04:20 UTC (rev 1566) +++ MOAB/trunk/MBInterface.hpp 2008-01-30 00:10:50 UTC (rev 1567) @@ -746,7 +746,7 @@ virtual MBErrorCode get_number_entities_by_type_and_tag(const MBEntityHandle meshset, const MBEntityType type, const MBTag *tag_handles, - const void** values, + const void* const* values, const int num_tags, int &num_entities, const bool recursive = false) const = 0;

1 0

r1564 - MOAB/trunk
by kraftche＠mcs.anl.gov 25 Jan '08

25 Jan '08

Author: kraftche Date: 2008-01-25 14:04:27 -0600 (Fri, 25 Jan 2008) New Revision: 1564 Modified: MOAB/trunk/SparseTagCollection.cpp MOAB/trunk/SparseTagCollection.hpp MOAB/trunk/SparseTagSuperCollection.cpp MOAB/trunk/SparseTagSuperCollection.hpp Log: low level code for varialbe-length sparse tag values Modified: MOAB/trunk/SparseTagCollection.cpp =================================================================== --- MOAB/trunk/SparseTagCollection.cpp 2008-01-25 19:55:30 UTC (rev 1563) +++ MOAB/trunk/SparseTagCollection.cpp 2008-01-25 20:04:27 UTC (rev 1564) @@ -33,6 +33,7 @@ #include "SparseTagCollection.hpp" #include "MBRange.hpp" #include "TagCompare.hpp" +#include "VarLenTag.hpp" SparseTagCollection::SparseTagCollection(int data_size) { @@ -57,6 +58,9 @@ MBErrorCode SparseTagCollection::set_data(const MBEntityHandle entity_handle, const void* data) { + if (mDataSize == MB_VARIABLE_LENGTH) + return MB_VARIABLE_DATA_LENGTH; + MBErrorCode ret_val = MB_TAG_NOT_FOUND; std::map<MBEntityHandle, void*>::iterator iterator = @@ -82,6 +86,9 @@ MBErrorCode SparseTagCollection::get_data(const MBEntityHandle entity_handle, void* data) { + if (mDataSize == MB_VARIABLE_LENGTH) + return MB_VARIABLE_DATA_LENGTH; + std::map<MBEntityHandle, void*>::iterator iter = mData.find(entity_handle); @@ -92,8 +99,55 @@ return MB_SUCCESS; } +MBErrorCode SparseTagCollection::set_data(const MBEntityHandle entity_handle, const void* data, int size) +{ + std::map<MBEntityHandle, void*>::iterator iterator = + mData.lower_bound(entity_handle); + + if (mDataSize == MB_VARIABLE_LENGTH) { + if (iterator == mData.end() || iterator->first != entity_handle) { + void* new_data = mAllocator.allocate(sizeof(VarLenTag)); + new (new_data) VarLenTag; + iterator = mData.insert( iterator, std::pair<const MBEntityHandle,void*>(entity_handle, new_data) ); + } + reinterpret_cast<VarLenTag*>(iterator->second)->set( data, size ); + } + else { + if (size != 0 && size != mDataSize) + return MB_INVALID_SIZE; + + if (iterator == mData.end() || iterator->first != entity_handle) { + void* new_data = mAllocator.allocate(mDataSize); + iterator = mData.insert( iterator, std::pair<const MBEntityHandle,void*>(entity_handle, new_data) ); + } + memcpy( iterator->second, data, mDataSize); + } + return MB_SUCCESS; +} +MBErrorCode SparseTagCollection::get_data(const MBEntityHandle entity_handle, const void*& data, int& size) +{ + std::map<MBEntityHandle, void*>::iterator iter = + mData.find(entity_handle); + + if(iter == mData.end()) + return MB_TAG_NOT_FOUND; + + if (mDataSize == MB_VARIABLE_LENGTH) { + const VarLenTag* vtag = reinterpret_cast<const VarLenTag*>(iter->second); + size = vtag->size(); + data = vtag->data(); + } + else { + size = mDataSize; + data = iter->second; + } + return MB_SUCCESS; +} + + + MBErrorCode SparseTagCollection::remove_data( const MBEntityHandle entity_handle ) { std::map<MBEntityHandle, void*>::iterator iterator = Modified: MOAB/trunk/SparseTagCollection.hpp =================================================================== --- MOAB/trunk/SparseTagCollection.hpp 2008-01-25 19:55:30 UTC (rev 1563) +++ MOAB/trunk/SparseTagCollection.hpp 2008-01-25 20:04:27 UTC (rev 1564) @@ -78,7 +78,13 @@ //! get the tag data for an entity id MBErrorCode get_data(const MBEntityHandle entity_handle, void* data); + + //! set variable-length tag data for an entity id + MBErrorCode set_data(const MBEntityHandle entity_handle, const void* data, int length); + //! get the variable-length data for an entity id + MBErrorCode get_data(const MBEntityHandle entity_handle, const void*& data, int& length); + //! removes the data MBErrorCode remove_data(const MBEntityHandle entity_handle); Modified: MOAB/trunk/SparseTagSuperCollection.cpp =================================================================== --- MOAB/trunk/SparseTagSuperCollection.cpp 2008-01-25 19:55:30 UTC (rev 1563) +++ MOAB/trunk/SparseTagSuperCollection.cpp 2008-01-25 20:04:27 UTC (rev 1564) @@ -62,7 +62,7 @@ MBErrorCode SparseTagSuperCollection::reserve_tag_id(int data_size, MBTagId tag_id) { - if(data_size<=0) + if(data_size<=0 && data_size != MB_VARIABLE_LENGTH) return MB_FAILURE; if (tag_id >= mDataTags.size()) @@ -105,7 +105,21 @@ return coll ? coll->get_data( entity_handle, data ) : MB_TAG_NOT_FOUND; } +MBErrorCode SparseTagSuperCollection::set_data(const MBTagId tag_handle, + const MBEntityHandle entity_handle, const void* data, int size) +{ + SparseTagCollection* coll = get_collection(tag_handle); + return coll ? coll->set_data( entity_handle, data, size ) : MB_TAG_NOT_FOUND; +} +MBErrorCode SparseTagSuperCollection::get_data(const MBTagId tag_handle, + const MBEntityHandle entity_handle, const void*& data, int& size) +{ + SparseTagCollection* coll = get_collection(tag_handle); + return coll ? coll->get_data( entity_handle, data, size ) : MB_TAG_NOT_FOUND; +} + + MBErrorCode SparseTagSuperCollection::remove_data( const MBTagId tag_handle, const MBEntityHandle entity_handle ) { Modified: MOAB/trunk/SparseTagSuperCollection.hpp =================================================================== --- MOAB/trunk/SparseTagSuperCollection.hpp 2008-01-25 19:55:30 UTC (rev 1563) +++ MOAB/trunk/SparseTagSuperCollection.hpp 2008-01-25 20:04:27 UTC (rev 1564) @@ -78,6 +78,12 @@ //! get the data of a tag MBErrorCode get_data(const MBTagId tag_handle, const MBEntityHandle entity_handle, void* data); + //! set the data of a variable-length tag + MBErrorCode set_data(const MBTagId tag_handle, const MBEntityHandle entity_handle, const void* data, int length); + + //! get the data of a variable-length tag + MBErrorCode get_data(const MBTagId tag_handle, const MBEntityHandle entity_handle, const void*& data, int& length); + //! removes data MBErrorCode remove_data(const MBTagId tag_handle, const MBEntityHandle entity_handle);

1 0

r1563 - MOAB/trunk
by kraftche＠mcs.anl.gov 25 Jan '08

25 Jan '08

Author: kraftche Date: 2008-01-25 13:55:30 -0600 (Fri, 25 Jan 2008) New Revision: 1563 Modified: MOAB/trunk/MBAdaptiveKDTree.cpp MOAB/trunk/MBAdaptiveKDTree.hpp Log: Add tolerance value to kD-tree neighbor-search o tolerance on test if projection of two leaves onto an axis overlap o a negative value can be used to eliminate edge-adjacent or corner-adjacnet neighbors Modified: MOAB/trunk/MBAdaptiveKDTree.cpp =================================================================== --- MOAB/trunk/MBAdaptiveKDTree.cpp 2008-01-25 16:59:41 UTC (rev 1562) +++ MOAB/trunk/MBAdaptiveKDTree.cpp 2008-01-25 19:55:30 UTC (rev 1563) @@ -534,7 +534,8 @@ MBErrorCode MBAdaptiveKDTreeIter::get_neighbors( MBAdaptiveKDTree::Axis norm, bool neg, - std::vector<MBAdaptiveKDTreeIter>& results ) const + std::vector<MBAdaptiveKDTreeIter>& results, + double epsilon ) const { StackObj node, parent; MBErrorCode rval; @@ -616,9 +617,9 @@ iter.mBox[1-neg][plane.norm] = plane.coord; } // if left child is adjacent - else if (this->mBox[BMIN][plane.norm] < plane.coord) { + else if (this->mBox[BMIN][plane.norm] - plane.coord <= epsilon) { // if right child is also adjacent, add to list - if (this->mBox[BMAX][plane.norm] > plane.coord) { + if (plane.coord - this->mBox[BMAX][plane.norm] <= epsilon) { list.push_back( iter ); list.back().mStack.push_back( StackObj( iter.childVect[1], iter.mBox[BMIN][plane.norm] ) ); list.back().mBox[BMIN][plane.norm] = plane.coord; @@ -633,7 +634,7 @@ else { // if left child is not adjacent, right must be or something // is really messed up. - assert(this->mBox[BMAX][plane.norm] > plane.coord); + assert(plane.coord - this->mBox[BMAX][plane.norm] <= epsilon); // continue with left child node.entity = iter.childVect[1]; node.coord = iter.mBox[BMIN][plane.norm]; Modified: MOAB/trunk/MBAdaptiveKDTree.hpp =================================================================== --- MOAB/trunk/MBAdaptiveKDTree.hpp 2008-01-25 16:59:41 UTC (rev 1562) +++ MOAB/trunk/MBAdaptiveKDTree.hpp 2008-01-25 19:55:30 UTC (rev 1563) @@ -304,10 +304,22 @@ //! E.g. if norm == Y and neg == false, then get neighbor(s) //! adjacent to the side of the box with y = maximum y of bounding box. //! - //! Results are appended to list. This function does not clear any - //! existing values in the 'results' vector. + //!\param norm Normal vector for box side (X, Y, or Z) + //!\param neg Which of two planes with norm (true->smaller coord, + //! false->larget coord) + //!\param results List to which to append results. This function does + //! *not* clear existing values in list. + //!\param epsilon Tolerance on overlap. A positive value E will + //! result in nodes that are separated by as much as E + //! to be considered touching. A negative value -E will + //! cause leaves that do not overlap by at least E to be + //! considered non-overlapping. Amongst other things, + //! this value can be used to control whether or not + //! leaves adjacent at only their edges or corners are + //! returned. MBErrorCode get_neighbors( MBAdaptiveKDTree::Axis norm, bool neg, - std::vector<MBAdaptiveKDTreeIter>& results ) const; + std::vector<MBAdaptiveKDTreeIter>& results, + double epsilon = 0.0 ) const; //! Get split plane that separates this node from its immediate sibling. MBErrorCode get_parent_split_plane( MBAdaptiveKDTree::Plane& plane ) const;

1 0

r1562 - MOAB/trunk
by kraftche＠mcs.anl.gov 25 Jan '08

25 Jan '08

Author: kraftche Date: 2008-01-25 10:59:41 -0600 (Fri, 25 Jan 2008) New Revision: 1562 Modified: MOAB/trunk/MBAdaptiveKDTree.hpp Log: fix typo in comment Modified: MOAB/trunk/MBAdaptiveKDTree.hpp =================================================================== --- MOAB/trunk/MBAdaptiveKDTree.hpp 2008-01-24 23:38:46 UTC (rev 1561) +++ MOAB/trunk/MBAdaptiveKDTree.hpp 2008-01-25 16:59:41 UTC (rev 1562) @@ -297,7 +297,7 @@ //! Get adjacent leaf nodes on side indicated by norm and neg. //! //! E.g. if norm == X and neg == true, then get neighbor(s) - //! adjacent to the size of the box contained in the plane + //! adjacent to the side of the box contained in the plane //! with normal to the X axis and with the x coordinate equal //! to the minimum x of the bounding box. //!

1 0

r1561 - MOAB/trunk
by kraftche＠mcs.anl.gov 24 Jan '08

24 Jan '08

Author: kraftche Date: 2008-01-24 17:38:46 -0600 (Thu, 24 Jan 2008) New Revision: 1561 Modified: MOAB/trunk/CMakeLists.txt Log: split two classes defined in SparseTagCollections.?pp into separate files Modified: MOAB/trunk/CMakeLists.txt =================================================================== --- MOAB/trunk/CMakeLists.txt 2008-01-24 23:38:12 UTC (rev 1560) +++ MOAB/trunk/CMakeLists.txt 2008-01-24 23:38:46 UTC (rev 1561) @@ -149,7 +149,8 @@ ScdVertexData.cpp SequenceData.cpp SequenceManager.cpp - SparseTagCollections.cpp + SparseTagSuperCollection.cpp + SparseTagCollection.cpp StructuredElementSeq.cpp TagInfo.cpp TagServer.cpp

1 0