Changes after Chetan feedback

chessweb01 · Apr 23, 2015 · 494ad51 · 494ad51
1 parent b0dfcd2
commit 494ad51
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/nupic/bindings/algorithms.i b/nupic/bindings/algorithms.i
@@ -131,9 +131,6 @@ using namespace nupic;
 #define CHECKSIZE(var) \
   NTA_ASSERT((var)->descr->elsize == 4) << " elsize:" << (var)->descr->elsize
 
-
-// TODO: This __really__ belongs somewhere else, but no other good place for it.
-
 %}
 
 // %pythoncode %{

diff --git a/tests/integration/nupic/opf/opf_experiment_results_test.py b/tests/integration/nupic/opf/opf_experiment_results_test.py
@@ -185,7 +185,7 @@ def testExperimentResults(self):
         'results': {
           ('DefaultTask.NontemporalMultiStep.predictionLog.csv',
            "multiStepBestPredictions:multiStep:errorMetric='avg_err':steps=1:window=25:field=field1"):
-                    (0.0, 1.0),
+                    (1.0, 1.0),
         }
       },
 

diff --git a/tests/unit/nupic/algorithms/nab_detector_test.py b/tests/unit/nupic/algorithms/nab_detector_test.py
@@ -168,17 +168,15 @@ def testModelCreator(self):
                       "spParams": {
                         "columnCount": 2048,
                         "synPermInactiveDec": 0.0005,
-                        "randomSP": 0,
                         "maxBoost": 1.0,
                         "spatialImp": "cpp",
                         "inputWidth": 0,
                         "spVerbosity": 0,
-                        "useHighTier": 0,
                         "synPermConnected": 0.1,
                         "synPermActiveInc": 0.0015,
                         "seed": 1956,
                         "numActiveColumnsPerInhArea": 40,
-                        "coincInputPoolPct": 0.8,
+                        "potentialPct": 0.8,
                         "globalInhibition": 1
                       },
                       "trainSPNetOnlyIfRequested": False,

diff --git a/tests/unit/nupic/algorithms/sp_overlap_test.py b/tests/unit/nupic/algorithms/sp_overlap_test.py
@@ -175,9 +175,9 @@ def frequency(self,
     zeros = len([x for x in summ if x==0])
     factor = max(summ)*len(summ)/sum(summ)
     if len(reUsed) < 10:
-      self.assertLessEqual(factor, 40,
+      self.assertLess(factor, 41,
                       "\nComputed factor: %d\nExpected Less than %d" % (
-                          factor, 30))
+                          factor, 41))
       self.assertLess(zeros, 0.99*len(summ),
                       "\nComputed zeros: %d\nExpected Less than %d" % (
                           zeros, 0.99*len(summ)))

diff --git a/tests/unit/nupic/research/inhibition_object_test.py b/tests/unit/nupic/research/inhibition_object_test.py
@@ -39,7 +39,8 @@
 
 class InhibitionObjectTest(unittest.TestCase):
 
-  @unittest.skip("Currently fails due to switch from FDRCSpatial2 to SpatialPooler.")
+  @unittest.skip("Currently fails due to switch from FDRCSpatial2 to SpatialPooler. \
+                  The new SP doesn't have explicit methods to get inhibition.")
   def testInhibition(self):
     """
     Test if the firing number of coincidences after inhibition

diff --git a/tests/unit/nupic/research/sp_learn_inference_test.py b/tests/unit/nupic/research/sp_learn_inference_test.py
@@ -140,7 +140,8 @@ def _runLearnInference(self,
       print "Test succeeded"
 
 
-  @unittest.skip("Currently fails due to switch from FDRCSpatial2 to SpatialPooler.")
+  @unittest.skip("Currently fails due to switch from FDRCSpatial2 to SpatialPooler. \
+                 The new SP doesn't have explicit methods to get inference.")
   def testLearnInference(self):
     self._runLearnInference(n=50, w=15)