feature :

add IntervalOfContainers which are described in https://gforge.inria.fr/plugins/wiki/index.php?NewDataStructPage&id=1596&type=g
A new IntervalOfContainer is built only when a certain (10000 for the moment) number of StateChanges or Links are attached to it. (initially only StateChanges were taken into account, but Links are created in parent containers without States, so they were all allocated in the same IntevalOfContainers, making them huge).

This is not activated right now by default, but can be turned on by setting the flag USE_ITC before compiling to perform tests.

src/CMakeLists.txt

@@ -81,6 +81,7 @@ SET(VITE_HDRS
   trace/DrawTrace.hpp
   trace/DrawTree.hpp
   trace/Trace.hpp
+  trace/IntervalOfContainer.hpp
   # Render headers
   render/Palette.hpp
   render/Render.hpp
@@ -176,6 +177,7 @@ SET(VITE_SRCS
   trace/Variable.cpp
   trace/Container.cpp
   trace/Trace.cpp
+  trace/IntervalOfContainer.cpp
   # Render code files
   render/Palette.cpp
   render/Geometry.cpp

src/src.pro

@@ -142,6 +142,7 @@ HEADERS += common/common.hpp  \
            trace/tree/BinaryTree.hpp \
            trace/tree/Node.hpp       \
            trace/tree/Interval.hpp   \
+		   trace/IntervalOfContainer.hpp
 # Statistics headers
            statistics/Stats_window.hpp \
            statistics/Statistic.hpp    \
@@ -194,6 +195,7 @@ SOURCES += common/Message.cpp \
            trace/Container.cpp 	    \
            trace/tree/Interval.cpp  \
            trace/Trace.cpp 	    \
+		   trace/IntervalOfContainer.cpp\
 # Parser code files
            parser/Parser.cpp               \
            parser/ParserFactory.cpp        \

src/trace/Container.hpp

@@ -50,6 +50,9 @@ template <typename E> class Node;
 template <typename E> class BinaryTree;
 class Statistic;
 class Interval;
+#ifdef USE_ITC
+struct IntervalOfContainer;
+#endif
 /*!
  * \class Container
  * \brief Contains others containers or entities
@@ -73,7 +76,11 @@ private:
     StateChange::Vector       _states;
     StateChange::Tree        *_state_tree;
     unsigned int              _n_events;
+	#ifdef USE_ITC
+	Event**					_events;
+	#else
     Event::Vector             _events;
+	#endif
     Event::Tree              *_event_tree;
     Link::Vector              _links;
     unsigned int              _n_variables;
@@ -81,6 +88,9 @@ private:
     std::map<std::string, Value *>       _extra_fields;
     int                       _depth;/* The container depth within the datastructure. The _depth of seed is equal to 0 */
 
+	#ifdef USE_ITC
+    std::list<IntervalOfContainer* >        _intervalsOfContainer;
+	#endif
     /*
      * Temporary stores states before complete definition
      */

src/trace/DrawTrace.hpp

@@ -315,8 +315,12 @@ public:
         _container_positions[container] = position + size; // First line after children
         
         // Use one line for states and events
-        if (!container->get_states()->empty() || !container->get_events()->empty()) {
-            size++;
+#ifdef USE_ITC
+        if ((container->get_states()!=NULL && !container->get_states()->empty() )|| (container->get_events()!=NULL && !container->get_events()->empty())) {
+#else
+		if ((!container->get_states()->empty() )|| (!container->get_events()->empty())) {
+#endif
+			size++;
             _entity_containers.push_back(container);
         }
         
@@ -392,17 +396,30 @@ public:
 	        
                 state_tree = container->get_states();
                 event_tree = container->get_events();
-                if (!state_tree->empty() || !event_tree->empty()) {
-                    // Browse states
-                    DrawTree<T, StateChange>(draw_object, position, lvl_zoom,
-                                             _container_height, _container_v_space, _state_height, _state_v_space)
-                        .draw_tree(state_tree, *interval);
-                    
-                    // Browse events
-                    DrawTree<T, Event>(draw_object, position, lvl_zoom,
-                                       _container_height, _container_v_space, _state_height, _state_v_space)
-                        .draw_tree(event_tree, *interval);
+#ifdef USE_ITC
+                if(state_tree!=NULL){
+#endif
+                    if ( !state_tree->empty() ) {
+                    //printf("drawing states for %s\n", container->get_name().to_string().c_str());
+                        // Browse states
+                        DrawTree<T, StateChange>(draw_object, position, lvl_zoom,
+                                                 _container_height, _container_v_space, _state_height, _state_v_space)
+                            .draw_tree(state_tree, *interval);
+				    }
+#ifdef USE_ITC
+				}
+				if(event_tree!=NULL){
+#endif
+				    if ( !event_tree->empty()){
+				        //printf("drawing events for %s\n", container->get_name().to_string().c_str());
+                        // Browse events
+                        DrawTree<T, Event>(draw_object, position, lvl_zoom,
+                                           _container_height, _container_v_space, _state_height, _state_v_space)
+                            .draw_tree(event_tree, *interval);
+                    }
+#ifdef USE_ITC
                 }
+#endif
             }
         }/* end for (!_stack_states.empty()) */
 
@@ -456,7 +473,7 @@ public:
           
                 container = *c;
                 position = (int)_container_positions[container];
-                if (!container->get_states()->empty() || !container->get_events()->empty())
+				if ((container->get_states()!=NULL && !container->get_states()->empty()) ||(container->get_events()!=NULL && !container->get_events()->empty()))
                     position++;
                 // Browse variables
                 variable_map = container->get_variables();
@@ -587,7 +604,11 @@ public:
         
         // Now browsing for the events of the container root
         // Verification if it is a clic on an event
+#ifndef USE_ITC
         if ((!container->get_events()->empty() || !container->get_states()->empty()) && yr < _container_height+_container_v_space) {
+#else
+		if (((container->get_states()!=NULL && !container->get_states()->empty()) ||(container->get_events()!=NULL && !container->get_events()->empty())) && yr < _container_height+_container_v_space) {
+#endif
             if (!Info::Render::_no_events)
                 if ((event = find_event(container, x, d))) {
                 *Message::get_instance() << "<center><strong>Event</strong></center>"
@@ -616,7 +637,11 @@ public:
             }
         }
         else {
-            if (!container->get_events()->empty() || !container->get_states()->empty())
+#ifndef USE_ITC
+			if ((container->get_states()!=NULL && !container->get_states()->empty()) ||(container->get_events()!=NULL && !container->get_events()->empty()))
+#else
+			if (!container->get_events()->empty() || !container->get_states()->empty())
+#endif
                 yr -= _container_height+_container_v_space;
             const std::map<VariableType *, Variable *> *variable_map = container->get_variables();
             std::map<VariableType *, Variable *>::const_iterator i = variable_map->begin();
@@ -669,7 +694,11 @@ public:
         
         // Calculate the size of the container (without its children)
         int size = 0;
-        if (!container->get_states()->empty() || !container->get_events()->empty())
+#ifdef USE_ITC
+		if ((container->get_states()!=NULL && !container->get_states()->empty()) ||(container->get_events()!=NULL && !container->get_events()->empty()))
+#else
+		if (!container->get_states()->empty() || !container->get_events()->empty())
+#endif
             size++;
         if (container->get_variable_number() > 0)
             size += container->get_variable_number();
@@ -708,7 +737,11 @@ public:
         _container_positions[container] = position + size; // First line after children
         
         // Use one line for states and events
-        if (!container->get_states()->empty() || !container->get_events()->empty()) {
+#ifdef USE_ITC
+		if ((container->get_states()!=NULL && !container->get_states()->empty()) ||(container->get_events()!=NULL && !container->get_events()->empty())){
+#else
+		if (!container->get_states()->empty() || !container->get_events()->empty()) {
+#endif
             size++;
         }
         
@@ -763,7 +796,7 @@ public:
      * \brief Returns the event that occurs at the time x in the container
      */
     const Event *find_event(const Container *container, Element_pos x, Element_pos d) {
-        if(!container)
+        if(!container || container->get_events()==NULL)
             return NULL;
     
         Node<Event> *node = container->get_events()->get_root();
@@ -789,7 +822,7 @@ public:
      * \brief Returns the state at the time x
      */
     const State * find_state(const Container *container, Element_pos x) {
-        if(!container)
+        if(!container || container->get_states()==NULL)
             return NULL;
     
         Node<StateChange> *node = container->get_states()->get_root();

src/trace/Entity.cpp

@@ -50,12 +50,15 @@
 #include "trace/values/Values.hpp"
 #include "trace/EntityTypes.hpp"
 #include "trace/Entitys.hpp"
+#include "trace/Entity.hpp"
 /* -- */
 using namespace std;
 
 Entity::Entity(Container *container, map<std::string, Value *> opt): _container(container)/*, _extra_fields(opt)*/ {
  if(opt.empty())_extra_fields=NULL;
-	else _extra_fields=new map<std::string, Value *>(opt);
+	else{ _extra_fields=new map<std::string, Value *>(opt);
+	opt.clear();
+	}
 			
 
 }
@@ -77,3 +80,8 @@ Entity::~Entity(){
 //         (*it).second = NULL;
 //     }
 }
+
+void Entity::clear(){
+	if(_extra_fields !=NULL)delete _extra_fields;     
+	_extra_fields=NULL;
+}
\ No newline at end of file

src/trace/Entity.hpp

@@ -79,6 +79,8 @@ public:
     const std::map<std::string, Value *> *get_extra_fields() const;
 
      ~Entity();
+
+	void clear();
 };
 
 #endif

src/trace/EntityType.cpp

@@ -53,17 +53,10 @@ using namespace std;
 
 EntityType::EntityType(Name name, ContainerType *container_type, map<std::string, Value *>& opt):
     _name(name), _container_type(container_type) {
-		if (!opt.empty()) {
-			_extra_fields=new map<std::string, Value *>();
-			map<std::string , Value * >::iterator cur = opt.end();
-		   for(map<std::string, Value *>::iterator it = opt.begin();
-				it != cur;
-				it++){
-				_extra_fields->insert(*it);
-			}
-		   opt.clear();
-		}
-		else _extra_fields=NULL;
+	if(opt.empty())_extra_fields=NULL;
+	else{ _extra_fields=new map<std::string, Value *>(opt);
+	opt.clear();
+	}
 
 }
 

src/trace/StateChange.cpp

@@ -90,3 +90,11 @@ StateChange::~StateChange(){
     delete _right;
     _right = NULL;
 }
+void StateChange::clear(){
+        if(_left!=NULL){
+            _left->clear();
+            //free(_left_state);
+         //  Alloc<State2>::Instance().free(_left_state);
+        }
+           
+}
\ No newline at end of file

src/trace/StateChange.hpp

@@ -69,6 +69,8 @@ public:
     const State *get_left_state() const;
     const State *get_right_state() const;
     ~StateChange();
+
+	void clear();
 };
 
 #endif

src/trace/Variable.cpp

@@ -88,7 +88,7 @@ Double Variable::get_max() const {
     return _max;
 }
 
-const VariableType *Variable::get_type() const {
+VariableType *Variable::get_type() const {
     return _type;
 }
 

src/trace/Variable.hpp

@@ -103,7 +103,7 @@ public:
     /*!
      * \brief Get the type of the variable
      */
-    const VariableType *get_type() const;
+    VariableType *get_type() const;
 
 };
 

src/trace/tree/BinaryTree.hpp

@@ -56,6 +56,141 @@ private:
     Node<E> *_root;
 
 public:
+
+ /*!
+     * \brief Constructor
+     * \param list List from which the tree is made
+     * \param size Number of element in the list
+     */
+    BinaryTree(E * list[], unsigned int size) {
+        if (size == 0 || list==NULL ||list[0]==NULL) {
+            _root = NULL;
+            return;
+        }
+    
+        // Calculate n and m as size = 2^n - 1 + m and m < 2^n
+        int n = 0;
+        unsigned int a = 1;
+        while (size >= 2*a - 1) {
+            a *= 2;
+            n++;
+        }
+        int m = size - a + 1;
+        
+        // Initialize the array
+        Node<E> **temp = new Node<E> *[n+1];
+        int start = 0;
+        int i = 0;
+        for (i = 0; i < n+1; i++)
+            temp[i] = NULL;
+        
+        i = 0;
+        // Reads elements from the list and empty it
+       for (unsigned int j=0; j<size; j++)  {
+            E *element = list[j];
+            
+            while (temp[i]) // Find the first free element in temp
+                i++;
+            
+            temp[i] = new Node<E>(element);
+            
+            if (i == 0 && m > 0) { // The node is a leaf and its depth is n+1
+                m--;
+                if (m == 0)
+                    start = 1;
+            }
+            
+            if (i < n && temp[i+1]) { // The node has a parent
+                temp[i]->_parent = temp[i+1];
+                temp[i+1]->_right_child = temp[i];
+            }
+            
+            if (i > 0 && temp[i-1]) { // The node is not a leaf
+                temp[i]->_left_child = temp[i-1];
+                temp[i-1]->_parent = temp[i];
+                while (i > 0) {
+                    i--;
+                    temp[i] = NULL;
+                }
+                i = start;
+            }
+        }
+        
+        _root = temp[n-1+start];
+        
+        delete[] temp;
+       // delete[] list;
+    }
+    
+    
+     /*!
+     * \brief Constructor
+     * \param list List from which the tree is made
+     * \param size Number of element in the list
+     */
+    BinaryTree(E * list, unsigned int size) {
+        if (size == 0 || list==NULL) {
+            _root = NULL;
+            return;
+        }
+    
+        // Calculate n and m as size = 2^n - 1 + m and m < 2^n
+        int n = 0;
+        unsigned int a = 1;
+        while (size >= 2*a - 1) {
+            a *= 2;
+            n++;
+        }
+        int m = size - a + 1;
+        
+        // Initialize the array
+        Node<E> **temp = new Node<E> *[n+1];
+        int start = 0;
+        int i = 0;
+        for (i = 0; i < n+1; i++)
+            temp[i] = NULL;
+        
+        i = 0;
+        // Reads elements from the list and empty it
+       for (unsigned int j=0; j<size; j++)  {
+            E *element = &(list[j]);
+            
+            while (temp[i]) // Find the first free element in temp
+                i++;
+            
+            temp[i] = new Node<E>(element);
+            
+            if (i == 0 && m > 0) { // The node is a leaf and its depth is n+1
+                m--;
+                if (m == 0)
+                    start = 1;
+            }
+            
+            if (i < n && temp[i+1]) { // The node has a parent
+                temp[i]->_parent = temp[i+1];
+                temp[i+1]->_right_child = temp[i];
+            }
+            
+            if (i > 0 && temp[i-1]) { // The node is not a leaf
+                temp[i]->_left_child = temp[i-1];
+                temp[i-1]->_parent = temp[i];
+                while (i > 0) {
+                    i--;
+                    temp[i] = NULL;
+                }
+                i = start;
+            }
+        }
+        
+        _root = temp[n-1+start];
+        
+        delete[] temp;
+       // delete[] list;
+    }
+    
+    
+    
+    
     /*!
      * \brief Constructor
      * \param list List from which the tree is made