Merge pull request #2186 from clinssen/vt-inherits

Make volume transmitter inherit from Node instead of ArchivingNode

models/volume_transmitter.cpp

@@ -70,14 +70,14 @@ void ::nest::volume_transmitter::Parameters_::set( const DictionaryDatum& d, Nod
  * ---------------------------------------------------------------- */
 
 nest::volume_transmitter::volume_transmitter()
-  : ArchivingNode()
+  : Node()
   , P_()
   , local_device_id_( 0 )
 {
 }
 
 nest::volume_transmitter::volume_transmitter( const volume_transmitter& n )
-  : ArchivingNode( n )
+  : Node( n )
   , P_( n.P_ )
   , local_device_id_( n.local_device_id_ )
 {
@@ -89,7 +89,6 @@ nest::volume_transmitter::init_buffers_()
   B_.neuromodulatory_spikes_.clear();
   B_.spikecounter_.clear();
   B_.spikecounter_.push_back( spikecounter( 0.0, 0.0 ) ); // insert pseudo last dopa spike at t = 0.0
-  ArchivingNode::clear_history();
 }
 
 void

models/volume_transmitter.h

@@ -24,7 +24,7 @@
 #define VOLUME_TRANSMITTER_H
 
 // Includes from nestkernel:
-#include "archiving_node.h"
+#include "node.h"
 #include "event.h"
 #include "nest_types.h"
 #include "ring_buffer.h"
@@ -103,7 +103,7 @@ EndUserDocs */
 
 class ConnectorBase;
 
-class volume_transmitter : public ArchivingNode
+class volume_transmitter : public Node
 {
 
 public:
@@ -201,7 +201,6 @@ inline void
 volume_transmitter::get_status( DictionaryDatum& d ) const
 {
   P_.get( d );
-  ArchivingNode::get_status( d );
 }
 
 inline void
@@ -210,12 +209,6 @@ volume_transmitter::set_status( const DictionaryDatum& d )
   Parameters_ ptmp = P_; // temporary copy in case of errors
   ptmp.set( d, this );   // throws if BadProperty
 
-  // We now know that (ptmp, stmp) are consistent. We do not
-  // write them back to (P_, S_) before we are also sure that
-  // the properties to be set in the parent class are internally
-  // consistent.
-  ArchivingNode::set_status( d );
-
   // if we get here, temporaries contain consistent set of properties
   P_ = ptmp;
 }