Devel

src/db/db/db.pro

@@ -58,6 +58,7 @@ SOURCES = \
   dbLog.cc \
   dbManager.cc \
   dbMatrix.cc \
+  dbMeasureEval.cc \
   dbMemStatistics.cc \
   dbMutableEdgePairs.cc \
   dbMutableEdges.cc \
@@ -139,6 +140,7 @@ SOURCES = \
   gsiDeclDbLog.cc \
   gsiDeclDbManager.cc \
   gsiDeclDbMatrix.cc \
+  gsiDeclDbMeasureHelpers.cc \
   gsiDeclDbMetaInfo.cc \
   gsiDeclDbPath.cc \
   gsiDeclDbPoint.cc \
@@ -295,6 +297,7 @@ HEADERS = \
   dbLog.h \
   dbManager.h \
   dbMatrix.h \
+  dbMeasureEval.h \
   dbMemStatistics.h \
   dbMetaInfo.h \
   dbMutableEdgePairs.h \
@@ -431,6 +434,7 @@ HEADERS = \
   dbNetShape.h \
   dbShapeCollection.h \
   dbShapeCollectionUtils.h \
+  gsiDeclDbMeasureHelpers.h \
   gsiDeclDbPropertiesSupport.h
 
 RESOURCES = \

src/db/db/dbAsIfFlatEdgePairs.cc

@@ -160,13 +160,17 @@ AsIfFlatEdgePairs::processed (const EdgePairProcessorBase &filter) const
 {
   std::unique_ptr<FlatEdgePairs> edge_pairs (new FlatEdgePairs ());
 
-  std::vector<db::EdgePair> res_edge_pairs;
+  std::vector<db::EdgePairWithProperties> res_edge_pairs;
 
   for (EdgePairsIterator e = begin (); ! e.at_end (); ++e) {
     res_edge_pairs.clear ();
-    filter.process (*e, res_edge_pairs);
-    for (std::vector<db::EdgePair>::const_iterator er = res_edge_pairs.begin (); er != res_edge_pairs.end (); ++er) {
-      edge_pairs->insert (*er);
+    filter.process (e.wp (), res_edge_pairs);
+    for (auto er = res_edge_pairs.begin (); er != res_edge_pairs.end (); ++er) {
+      if (er->properties_id () != 0) {
+        edge_pairs->insert (*er);
+      } else {
+        edge_pairs->insert (er->base ());
+      }
     }
   }
 
@@ -182,17 +186,16 @@ AsIfFlatEdgePairs::processed_to_polygons (const EdgePairToPolygonProcessorBase &
     region->set_merged_semantics (false);
   }
 
-  std::vector<db::Polygon> res_polygons;
+  std::vector<db::PolygonWithProperties> res_polygons;
 
   for (EdgePairsIterator e (begin ()); ! e.at_end (); ++e) {
     res_polygons.clear ();
-    filter.process (*e, res_polygons);
-    for (std::vector<db::Polygon>::const_iterator pr = res_polygons.begin (); pr != res_polygons.end (); ++pr) {
-      db::properties_id_type prop_id = e.prop_id ();
-      if (prop_id != 0) {
-        region->insert (db::PolygonWithProperties (*pr, prop_id));
-      } else {
+    filter.process (e.wp (), res_polygons);
+    for (auto pr = res_polygons.begin (); pr != res_polygons.end (); ++pr) {
+      if (pr->properties_id () != 0) {
         region->insert (*pr);
+      } else {
+        region->insert (pr->base ());
       }
     }
   }
@@ -209,17 +212,16 @@ AsIfFlatEdgePairs::processed_to_edges (const EdgePairToEdgeProcessorBase &filter
     edges->set_merged_semantics (false);
   }
 
-  std::vector<db::Edge> res_edges;
+  std::vector<db::EdgeWithProperties> res_edges;
 
   for (EdgePairsIterator e (begin ()); ! e.at_end (); ++e) {
     res_edges.clear ();
-    filter.process (*e, res_edges);
-    for (std::vector<db::Edge>::const_iterator pr = res_edges.begin (); pr != res_edges.end (); ++pr) {
-      db::properties_id_type prop_id = e.prop_id ();
-      if (prop_id != 0) {
-        edges->insert (db::EdgeWithProperties (*pr, prop_id));
-      } else {
+    filter.process (e.wp (), res_edges);
+    for (auto pr = res_edges.begin (); pr != res_edges.end (); ++pr) {
+      if (pr->properties_id () != 0) {
         edges->insert (*pr);
+      } else {
+        edges->insert (pr->base ());
       }
     }
   }

src/db/db/dbAsIfFlatEdges.cc

@@ -648,13 +648,17 @@ AsIfFlatEdges::processed (const EdgeProcessorBase &filter) const
     edges->set_merged_semantics (false);
   }
 
-  std::vector<db::Edge> res_edges;
+  std::vector<db::EdgeWithProperties> res_edges;
 
   for (EdgesIterator e (filter.requires_raw_input () ? begin () : begin_merged ()); ! e.at_end (); ++e) {
     res_edges.clear ();
-    filter.process (*e, res_edges);
-    for (std::vector<db::Edge>::const_iterator er = res_edges.begin (); er != res_edges.end (); ++er) {
-      edges->insert (*er);
+    filter.process (e.wp (), res_edges);
+    for (auto er = res_edges.begin (); er != res_edges.end (); ++er) {
+      if (er->properties_id () != 0) {
+        edges->insert (*er);
+      } else {
+        edges->insert (er->base ());
+      }
     }
   }
 
@@ -670,13 +674,17 @@ AsIfFlatEdges::processed_to_edge_pairs (const EdgeToEdgePairProcessorBase &filte
     edge_pairs->set_merged_semantics (false);
   }
 
-  std::vector<db::EdgePair> res_edge_pairs;
+  std::vector<db::EdgePairWithProperties> res_edge_pairs;
 
   for (EdgesIterator e (filter.requires_raw_input () ? begin () : begin_merged ()); ! e.at_end (); ++e) {
     res_edge_pairs.clear ();
-    filter.process (*e, res_edge_pairs);
-    for (std::vector<db::EdgePair>::const_iterator epr = res_edge_pairs.begin (); epr != res_edge_pairs.end (); ++epr) {
-      edge_pairs->insert (*epr);
+    filter.process (e.wp (), res_edge_pairs);
+    for (auto epr = res_edge_pairs.begin (); epr != res_edge_pairs.end (); ++epr) {
+      if (epr->properties_id () != 0) {
+        edge_pairs->insert (*epr);
+      } else {
+        edge_pairs->insert (epr->base ());
+      }
     }
   }
 
@@ -692,13 +700,17 @@ AsIfFlatEdges::processed_to_polygons (const EdgeToPolygonProcessorBase &filter)
     region->set_merged_semantics (false);
   }
 
-  std::vector<db::Polygon> res_polygons;
+  std::vector<db::PolygonWithProperties> res_polygons;
 
   for (EdgesIterator e (filter.requires_raw_input () ? begin () : begin_merged ()); ! e.at_end (); ++e) {
     res_polygons.clear ();
-    filter.process (*e, res_polygons);
-    for (std::vector<db::Polygon>::const_iterator pr = res_polygons.begin (); pr != res_polygons.end (); ++pr) {
-      region->insert (*pr);
+    filter.process (e.wp (), res_polygons);
+    for (auto pr = res_polygons.begin (); pr != res_polygons.end (); ++pr) {
+      if (pr->properties_id () != 0) {
+        region->insert (*pr);
+      } else {
+        region->insert (pr->base ());
+      }
     }
   }
 
@@ -731,9 +743,17 @@ AsIfFlatEdges::filtered_pair (const EdgeFilterBase &filter) const
 
   for (EdgesIterator p (begin_merged ()); ! p.at_end (); ++p) {
     if (filter.selected (*p, p.prop_id ())) {
-      new_region_true->insert (*p);
+      if (p.prop_id () != 0) {
+        new_region_true->insert (db::EdgeWithProperties (*p, p.prop_id ()));
+      } else {
+        new_region_true->insert (*p);
+      }
     } else {
-      new_region_false->insert (*p);
+      if (p.prop_id () != 0) {
+        new_region_false->insert (db::EdgeWithProperties (*p, p.prop_id ()));
+      } else {
+        new_region_false->insert (*p);
+      }
     }
   }