CCAR: fix a performance problem when adding references in study (AttributeTarget)

replace the vector<DF_Attribute*> by a map< std::string , DF_Attribute* >
where the key is the label of the DF_Attribute* to improve access time to an attribute
with given label (main performance bottleneck during explode)

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx
index 72eeda9c8521f09fb6e7f41986656b15c83ace95..ae2c2414f51a26b535e9d661fb5ba2b01fdd17ca 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.cxx
@@ -86,8 +86,7 @@ void SALOMEDSImpl_AttributeTarget::Add(const SALOMEDSImpl_SObject& theSO)
   DF_Label aRefLabel = theSO.GetLabel();
   SALOMEDSImpl_AttributeReference* aReference;
   if ((aReference=(SALOMEDSImpl_AttributeReference*)aRefLabel.FindAttribute(SALOMEDSImpl_AttributeReference::GetID()))) {
-    for(int i = 0, len = myVariables.size(); i<len; i++) if(myVariables[i]->Label() == aRefLabel) return; //BugID: PAL6192    
-    myVariables.push_back(aReference);
+    myVariables[aRefLabel.Entry()]=aReference;
   } 
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
@@ -101,8 +100,8 @@ std::vector<SALOMEDSImpl_SObject> SALOMEDSImpl_AttributeTarget::Get()
 {
   std::vector<SALOMEDSImpl_SObject> aSeq;
   
-  for(int i = 0, len = myVariables.size(); i<len; i++) 
-    aSeq.push_back( SALOMEDSImpl_Study::SObject(myVariables[i]->Label()));
+  for (std::map< std::string , DF_Attribute* >::iterator iter = myVariables.begin(); iter != myVariables.end(); ++iter)
+    aSeq.push_back( SALOMEDSImpl_Study::SObject(iter->second->Label()));
   
   return aSeq;
 }
@@ -116,15 +115,7 @@ void SALOMEDSImpl_AttributeTarget::Remove(const SALOMEDSImpl_SObject& theSO)
   Backup();
   DF_Label aRefLabel = theSO.GetLabel();
 
-  std::vector<DF_Attribute*> va;
-  for(int i = 0, len = myVariables.size(); i<len; i++) {
-    DF_Label L = myVariables[i]->Label();
-    if(myVariables[i]->Label() == aRefLabel) continue;
-    va.push_back(myVariables[i]);       
-  }
-
-  myVariables.clear();
-  myVariables = va;    
+  myVariables.erase(aRefLabel.Entry());
   
   SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved 
 }
@@ -144,8 +135,8 @@ void SALOMEDSImpl_AttributeTarget::Restore(DF_Attribute* With)
   SALOMEDSImpl_AttributeTarget* REL = dynamic_cast<SALOMEDSImpl_AttributeTarget*>(With);
   myRelation = REL->GetRelation();
   myVariables.clear();
-  for (int i = 0, len = REL->myVariables.size(); i<len; i++) {
-    myVariables.push_back(REL->myVariables[i]);
+  for (std::map< std::string , DF_Attribute* >::iterator iter = REL->myVariables.begin(); iter != REL->myVariables.end(); ++iter){
+    myVariables[iter->first]=iter->second;
   }
 }
 
@@ -167,7 +158,7 @@ void SALOMEDSImpl_AttributeTarget::Paste(DF_Attribute* into)
   SALOMEDSImpl_AttributeTarget* REL = dynamic_cast<SALOMEDSImpl_AttributeTarget*>(into);
   REL->SetRelation(myRelation);
   REL->myVariables.clear();
-  for (int i = 0, len = myVariables.size(); i<len; i++) {
-    REL->myVariables.push_back(myVariables[i]);
+  for (std::map< std::string , DF_Attribute* >::iterator iter = myVariables.begin(); iter != myVariables.end(); ++iter){
+    REL->myVariables[iter->first]=iter->second;
   }  
 }   

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
index f5a1849bfb2e033ac904cda5bca0551189746018..842931bc4c844f335515cb81e598e82356442349 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
@@ -33,13 +33,14 @@
 #include <string>
 #include "SALOMEDSImpl_GenericAttribute.hxx"
 #include "SALOMEDSImpl_SObject.hxx"
+#include <map>
 
 class SALOMEDSIMPL_EXPORT SALOMEDSImpl_AttributeTarget :
   public SALOMEDSImpl_GenericAttribute 
 {
 private:
   std::string myRelation;
-  std::vector<DF_Attribute*>  myVariables;
+  std::map< std::string , DF_Attribute* > myVariables;
 
 public:
   static const std::string& GetID() ;
@@ -50,7 +51,7 @@ public:
   void Remove(const SALOMEDSImpl_SObject& theSO);
   std::string GetRelation() { return myRelation; }
   void SetRelation(const std::string& theRelation); 
-  std::vector<DF_Attribute*>& GetVariables() { return myVariables; }
+  std::map< std::string , DF_Attribute* >& GetVariables() { return myVariables; }
   const std::string& ID() const;
   void Restore(DF_Attribute* with) ;
   DF_Attribute* NewEmpty() const;