[MOAB-dev] r3521 - in MOAB/trunk: . test/obb
sjackson at cae.wisc.edu
sjackson at cae.wisc.edu
Mon Feb 1 17:03:45 CST 2010
Author: sjackson
Date: 2010-02-01 17:03:45 -0600 (Mon, 01 Feb 2010)
New Revision: 3521
Modified:
MOAB/trunk/MBOrientedBoxTreeTool.cpp
MOAB/trunk/MBOrientedBoxTreeTool.hpp
MOAB/trunk/test/obb/obb_test.cpp
Log:
Fix typos encountered while working on OBB tree code.
Modified: MOAB/trunk/MBOrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/MBOrientedBoxTreeTool.cpp 2010-02-01 23:01:21 UTC (rev 3520)
+++ MOAB/trunk/MBOrientedBoxTreeTool.cpp 2010-02-01 23:03:45 UTC (rev 3521)
@@ -181,7 +181,7 @@
}
-/**\brief Split trianges by which side of a plane they are on
+/**\brief Split triangles by which side of a plane they are on
*
* Given a plane specified as a bisecting plane normal to one
* of the axes of a box, split triangles based on which side
@@ -514,7 +514,7 @@
return MB_SUCCESS;
}
-/********************** General Sphere/Triangel Intersection ***************/
+/********************** General Sphere/Triangle Intersection ***************/
MBErrorCode MBOrientedBoxTreeTool::sphere_intersect_triangles(
const double* center_v,
@@ -625,7 +625,7 @@
-/********************** General Ray/Tree and Ray/Triangel Intersection ***************/
+/********************** General Ray/Tree and Ray/Triangle Intersection ***************/
class RayIntersector : public MBOrientedBoxTreeTool::Op
@@ -810,8 +810,8 @@
double tolerance,
unsigned min_tol_intersections,
std::vector<double>& intersections,
- std::vector<MBEntityHandle>& surfaces,
- std::vector<MBEntityHandle>& facets )
+ std::vector<MBEntityHandle>& surfaces,
+ std::vector<MBEntityHandle>& facets )
: tool(tool_ptr), minTolInt(min_tol_intersections),
b(ray_point), m(unit_ray_dir),
len(ray_length), tol(tolerance),
@@ -968,7 +968,7 @@
intersections.push_back( t );
sets.push_back( lastSet );
facets.push_back(facet);
- // udpate length. this is currently the closest intersection, so
+ // update length. this is currently the closest intersection, so
// only want further intersections that are closer than this one.
len = &intersections.back();
}
Modified: MOAB/trunk/MBOrientedBoxTreeTool.hpp
===================================================================
--- MOAB/trunk/MBOrientedBoxTreeTool.hpp 2010-02-01 23:01:21 UTC (rev 3520)
+++ MOAB/trunk/MBOrientedBoxTreeTool.hpp 2010-02-01 23:03:45 UTC (rev 3521)
@@ -38,8 +38,8 @@
* Available settings for controlling when and how nodes in the tree
* are split. The constructor will initialize to the default
* settings. All settings except best_split_ratio control when
- * a node is subdivied. best_split_ratio influences the choice
- * of how the node is subdivied.
+ * a node is subdivided. best_split_ratio influences the choice
+ * of how the node is subdivided.
*
* A calculated ratio is used in the determination of when and how
* to split a node. The ratio is calculated as:
@@ -55,8 +55,8 @@
* - Node must contain more than max_leaf_entities entities.
* - The 'ratio' must be less than worst_split_ratio
*
- * The node will be subdivied using a plane normal to one of the
- * box axis and containg the box center. The planes are tested
+ * The node will be subdivided using a plane normal to one of the
+ * box axis and containing the box center. The planes are tested
* beginning with the one orthogonal to the longest box axis and
* finishing with the one orthogonal to the shortest box axis. The
* search will stop at the first plane for which the 'ratio' is
@@ -105,13 +105,13 @@
/**\brief Build a tree of sets, where each set contains triangles.
*
* Build a tree of sets. Each set must contain at least one triangle
- * to define it's geometry. Each passed set will become a leaf of
+ * to define its geometry. Each passed set will become a leaf of
* the OBB tree. Settings controlling tree depth are ignored by
* this method. The tree will be as deep as it needs to be for each
* input set to be a leaf.
*
* To build a tree representing the surfaces of a geometric volume,
- * 1) Build and OBB tree for each surface using the 'build' method
+ * 1) Build an OBB tree for each surface using the 'build' method
* 2) Add each surface to the contents of the resulting OBB tree root set
* 3) Build a tree from all the surface OBB tree root sets using this
* method to get a combined tree for the volume.
@@ -333,7 +333,7 @@
// virtual function but no virtual destructor.
};
- /**\brief Visistor pattern - do operation for each tree node
+ /**\brief Visitor pattern - do operation for each tree node
*
* Do a preorder traversal of the tree, calling the method
* in the passed operation instance for each node in the tree.
Modified: MOAB/trunk/test/obb/obb_test.cpp
===================================================================
--- MOAB/trunk/test/obb/obb_test.cpp 2010-02-01 23:01:21 UTC (rev 3520)
+++ MOAB/trunk/test/obb/obb_test.cpp 2010-02-01 23:03:45 UTC (rev 3521)
@@ -43,7 +43,7 @@
str << " If no file is specified the defautl test files will be used" << std::endl
<< " -h print help text. " << std::endl
<< " -v verbose output (may be specified multiple times) " << std::endl
- << " -q quite (minimal output) " << std::endl
+ << " -q quiet (minimal output) " << std::endl
<< " -f <x>:<y>:<z>:<i>:<j>:<k> Do ray fire" << std::endl
<< " -c write box geometry to Cubit journal file." << std::endl
<< " -k write leaf contents to vtk files." << std::endl
@@ -57,7 +57,7 @@
<< " -s force construction of surface tree" << std::endl
<< " -S do not build surface tree." << std::endl
<< " (Default: surface tree if file contains multiple surfaces" << std::endl
- << " -u use unorderd (MBRange) meshsets for tree nodes" << std::endl
+ << " -u use unordered (MBRange) meshsets for tree nodes" << std::endl
<< " -U use ordered (vector) meshsets for tree nodes" << std::endl
<< " Verbosity (-q sets to 0, each -v increments, default is 1):" << std::endl
<< " 0 - no output" << std::endl
@@ -66,7 +66,7 @@
<< " 3 - output errors for each node" << std::endl
<< " 4 - print tree" << std::endl
<< " 5 - print tree w/ contents of each node" << std::endl
- << " See documentation for MMOrientedBoxTreeTool::Settings for " << std::endl
+ << " See documentation for MBOrientedBoxTreeTool::Settings for " << std::endl
<< " a description of tree generation settings." << std::endl
;
exit( !!error );
@@ -1292,7 +1292,7 @@
continue;
}
- // find closest point usnig tree
+ // find closest point using tree
rval = tool.closest_to_location( points[i].array(),
root_set,
t_result.array(),
More information about the moab-dev
mailing list