fix testTestFacilities

src/Model.cc

@@ -341,17 +341,17 @@ namespace ChimeraTK::Model {
     auto amm = am->getModel();
     assert(amm.isValid());
     boost::remove_edge(amm._d->vertex, _d->vertex, _d->impl->graph);
+    boost::remove_edge(_d->vertex, amm._d->vertex, _d->impl->graph);
 
-    // Note: We cannot really remove the vertex for the variable, since boost::remove_vertex() invalidates all vertex
-    // descriptors, which are the only link between the "real world" and the model.
-
-    /*
     // if only one incoming edge exists any more, remove the entire variable. the one incoming edge is the parenthood
     // relation. ownership relations are also incoming, of which we must have zero.
     if(boost::in_degree(_d->vertex, _d->impl->graph) <= 1) {
-      boost::remove_vertex(_d->vertex, _d->impl->graph);
+      // Note: We cannot really remove the vertex for the variable, since boost::remove_vertex() invalidates all vertex
+      // descriptors, which are the only link between the "real world" and the model.
+      // Instead we completely disconnect it from the rest of the model (in particular the parent directory), so it
+      // usually is no longer found.
+      clear_vertex(_d->vertex, _d->impl->graph);
     }
-    */
   }
 
   /********************************************************************************************************************/

tests/CMakeLists.txt

@@ -16,6 +16,7 @@ endforeach( testExecutableSrcFile )
 # copy config files
 FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test.map DESTINATION ${PROJECT_BINARY_DIR}/tests)
 FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_with_push.map DESTINATION ${PROJECT_BINARY_DIR}/tests)
+FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_readonly.map DESTINATION ${PROJECT_BINARY_DIR}/tests)
 FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test.xlmap DESTINATION ${PROJECT_BINARY_DIR}/tests)
 FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test2.map DESTINATION ${PROJECT_BINARY_DIR}/tests)
 FILE( COPY ${CMAKE_CURRENT_SOURCE_DIR}/test3.map DESTINATION ${PROJECT_BINARY_DIR}/tests)

tests/test.map

-REG1                0x00000001    0x00000000    0x00000004
-REG2                0x00000001    0x00000004    0x00000004
-REG3                0x00000001    0x00000008    0x00000004
-REG4                0x00000001    0x0000000C    0x00000004
-AREA1               0x00000004    0x00000010    0x00000010
+REG1                0x00000001    0x00000000    0x00000004    0    32    0     1     RW
+REG2                0x00000001    0x00000004    0x00000004    0    32    0     1     RW
+REG3                0x00000001    0x00000008    0x00000004    0    32    0     1     RW
+REG4                0x00000001    0x0000000C    0x00000004    0    32    0     1     RW
+AREA1               0x00000004    0x00000010    0x00000010    0    32    0     1     RW

tests/test_readonly.map

+REG1                0x00000001    0x00000000    0x00000004    0    32    0     1     RO
+REG2                0x00000001    0x00000004    0x00000004    0    32    0     1     RO
+REG3                0x00000001    0x00000008    0x00000004    0    32    0     1     RO
+REG4                0x00000001    0x0000000C    0x00000004    0    32    0     1     RO
+AREA1               0x00000004    0x00000010    0x00000010    0    32    0     1     RO