Merge pull request #881 from Zbysekz/getSpecDoubleFree2

Get spec double free2

bindings/py/cpp_src/bindings/engine/py_Engine.cpp

@@ -221,8 +221,9 @@ namespace htm_ext
         ///////////////////
         // Spec
         ///////////////////
-        py::class_<Spec> py_Spec(m, "Spec");
+        py::class_<Spec, std::shared_ptr<Spec>> py_Spec(m, "Spec");
 
+        py_Spec.def("toString", &Spec::toString);
 
 
 

py/htm/advanced/regions/GridCellLocationRegion.py

@@ -40,7 +40,7 @@ class GridCellLocationRegion(PyRegion):
     gaussian activity bumps that move as the population receives motor input. When
     two bumps are near each other, the intermediate cells have higher firing rates
     than they would with a single bump. The cells with firing rates above a
-    certain threshold are considered "active". When the network receives a motor
+    certain threshold are considered 'active'. When the network receives a motor
     command, it shifts its bumps.
 
     The cells are distributed uniformly through the rhombus, packed in the optimal

py/htm/advanced/regions/RawValues.py

@@ -26,9 +26,9 @@
 
 class RawValues(PyRegion):
     """
-    RawDate is a simple region used to send raw scalar values into networks.
+    RawValues is a simple region used to send raw scalar values into networks.
 
-    It accepts data using the command "addDataToQueue" or through the function
+    It accepts data using the command 'addDataToQueue' or through the function
     addDataToQueue() which can be called directly from Python. Data is queued up
     in a FIFO and each call to compute pops the top element.
 

py/tests/networkapi/getParameters_test.py

@@ -34,7 +34,7 @@ class NetworkAPI_getParameters_Test(unittest.TestCase):
   """ Unit tests for Network class. """
 
 
-  def testGetSpec(self):
+  def testGetSpecJSON(self):
     """
     A test of the Network.getSpecJSON( ) function.
     """
@@ -127,6 +127,19 @@ def testGetSpec(self):
     net = Network()
     json_str = net.getSpecJSON("RDSEEncoderRegion")
     self.assertEqual(json_str, expected)
+
+  def testGetSpec(self):
+    """
+    Test of region.getSpec() function. Testing if pybind pointers are correctly handled
+    """
+    net = Network()
+    dateRegion = net.addRegion('dateEncoder', 'DateEncoderRegion',
+      str(dict(timeOfDay_width=30,
+           timeOfDay_radius=1,
+           weekend_width=21)))
+
+    dateRegion.getSpec()# twice times to check if no double free arises
+    dateRegion.getSpec()
 
 
   def testGetParameters(self):

src/htm/engine/Region.hpp

@@ -106,7 +106,7 @@ class Region : public Serializable {
    *
    * @returns The spec that describes this region
    */
-  const std::shared_ptr<Spec> &getSpec() const { return spec_; }
+  const std::shared_ptr<Spec> getSpec() const { return spec_; }
 
 
   /**

src/htm/engine/RegionImplFactory.cpp

@@ -207,7 +207,7 @@ RegionImpl *RegionImplFactory::deserializeRegionImpl(const std::string nodeType,
 
 
 
-std::shared_ptr<Spec>& RegionImplFactory::getSpec(const std::string nodeType) {
+std::shared_ptr<Spec> RegionImplFactory::getSpec(const std::string nodeType) {
   auto it = regionSpecMap.find(nodeType);
   if (it == regionSpecMap.end()) {
 	NTA_THROW << "getSpec() -- unknown node type: '" << nodeType

src/htm/engine/RegionImplFactory.hpp

@@ -60,7 +60,7 @@ class RegionImplFactory {
 
 
   // Returns node spec for a specific node type as a shared pointer.
-  std::shared_ptr<Spec>& getSpec(const std::string nodeType);
+  std::shared_ptr<Spec> getSpec(const std::string nodeType);
 
   // RegionImplFactory caches nodespecs and the dynamic library reference
   // This frees up the cached information.

src/htm/regions/SPRegion.cpp

@@ -190,7 +190,7 @@ Spec *SPRegion::createSpec() {
       "SPRegion. This implements the Spatial Pooler algorithm as a plugin "
       "for the Network framework.  The Spatial Pooler manages relationships "
       "between the columns of a region and the inputs bits. The primary "
-      "public interface to this function is the \"compute\" method, which "
+      "public interface to this function is the 'compute' method, which "
       "takes in an input vector and returns a list of activeColumns columns.";
 
 
@@ -372,7 +372,7 @@ Spec *SPRegion::createSpec() {
       ParameterSpec("(float)\n"
                     "The default connected threshold.Any synapse whose "
                     "permanence value is "
-                    "above the connected threshold is a \"connected synapse\", "
+                    "above the connected threshold is a 'connected synapse', "
                     "meaning it can "
                     "contribute to the cell's firing. Default ``0.1``.",
                     NTA_BasicType_Real32,             // type
@@ -404,7 +404,7 @@ Spec *SPRegion::createSpec() {
           "when "
           "either its previously learned inputs are no longer ever active, or "
           "when "
-          "the vast majority of them have been \"hijacked\" by other "
+          "the vast majority of them have been 'hijacked' by other "
           "columns.Default "
           "``0.001``.",
           NTA_BasicType_Real32,             // type