diff --git a/docs/README.md b/docs/README.md index 92706d15f9..75166c99b7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -84,19 +84,19 @@ nupic │   │   ├── common_models │   │   │   └── cluster_params.py [TODO] │   │   ├── exceptions.py [TODO] -│   │   ├── expdescriptionapi.py [TODO] -│   │   ├── expdescriptionhelpers.py [TODO] +│   │   ├── exp_description_api.py [TODO] +│   │   ├── exp_description_helpers.py [TODO] │   │   ├── experiment_runner.py [TODO] │   │   ├── jsonschema │   │   ├── metrics.py [TODO] │   │   ├── model.py [TODO] -│   │   ├── modelcallbacks.py [TODO] -│   │   ├── modelfactory.py [TODO] -│   │   ├── opfbasicenvironment.py [TODO] -│   │   ├── opfenvironment.py [TODO] -│   │   ├── opfhelpers.py [TODO] -│   │   ├── opftaskdriver.py [TODO] -│   │   ├── opfutils.py [TODO] +│   │   ├── model_callbacks.py [TODO] +│   │   ├── model_factory.py [TODO] +│   │   ├── opf_basic_environment.py [TODO] +│   │   ├── opf_environment.py [TODO] +│   │   ├── opf_helpers.py [TODO] +│   │   ├── opf_task_driver.py [TODO] +│   │   ├── opf_utils.py [TODO] │ │ │ ├── ModelResults [OK] │ │ │ └── SensorInput [OK] │   │   ├── periodic.py [TODO] diff --git a/docs/examples/opf/complete-example.py b/docs/examples/opf/complete-example.py index c452f1caa6..d476d66763 100644 --- a/docs/examples/opf/complete-example.py +++ b/docs/examples/opf/complete-example.py @@ -4,7 +4,7 @@ import yaml from itertools import islice -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory _NUM_RECORDS = 3000 _EXAMPLE_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/docs/examples/opf/create-model-example.py b/docs/examples/opf/create-model-example.py index 128e272cb0..b3b288ce4b 100644 --- a/docs/examples/opf/create-model-example.py +++ b/docs/examples/opf/create-model-example.py @@ -1,5 +1,5 @@ import yaml -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory _PARAMS_PATH = "/path/to/model.yaml" diff --git a/docs/source/api/opf/models.rst b/docs/source/api/opf/models.rst index c52a8d7d9f..b884dbf466 100644 --- a/docs/source/api/opf/models.rst +++ b/docs/source/api/opf/models.rst @@ -11,7 +11,7 @@ Model HTMPredictionModel ^^^^^^^^ -.. autoclass:: nupic.frameworks.opf.htmpredictionmodel.HTMPredictionModel +.. autoclass:: nupic.frameworks.opf.htm_prediction_model.HTMPredictionModel :members: :show-inheritance: ======= @@ -26,5 +26,5 @@ TwoGramModel ModelFactory ^^^^^^^^^^^^ -.. autoclass:: nupic.frameworks.opf.modelfactory.ModelFactory +.. autoclass:: nupic.frameworks.opf.model_factory.ModelFactory :members: diff --git a/docs/source/api/opf/utils.rst b/docs/source/api/opf/utils.rst index 6688d1ad95..83390f7239 100644 --- a/docs/source/api/opf/utils.rst +++ b/docs/source/api/opf/utils.rst @@ -10,5 +10,5 @@ Common Models Helpers ^^^^^^^ -.. automodule:: nupic.frameworks.opf.opfhelpers +.. automodule:: nupic.frameworks.opf.opf_helpers :members: diff --git a/docs/source/guides/opf.md b/docs/source/guides/opf.md index 44f7d7e550..d152522bf0 100644 --- a/docs/source/guides/opf.md +++ b/docs/source/guides/opf.md @@ -138,7 +138,7 @@ binary numpy arrays, one for each field in dataRow. The concept of InferenceElements is a key part of the OPF. A model's inference may have multiple parts to it. For example, a model may output both a prediction and an anomaly score. Models output their set of inferences as a dictionary that is keyed by the enumerated type InferenceElement. Each entry in an inference dictionary is considered a separate inference element, and is handled independently by the OPF. -Data structures related to inference elements are located in [**opfutils.py**](https://github.com/numenta/nupic/blob/master/nupic/frameworks/opf/opfutils.py). +Data structures related to inference elements are located in [**opf_utils.py**](https://github.com/numenta/nupic/blob/master/nupic/frameworks/opf/opf_utils.py). #### Inference Data Types diff --git a/docs/source/guides/swarming/running.md b/docs/source/guides/swarming/running.md index 1eda670c5a..33130ded19 100644 --- a/docs/source/guides/swarming/running.md +++ b/docs/source/guides/swarming/running.md @@ -55,7 +55,7 @@ In addition to the information printed to stdout, run_swarm also generates the f * **permutations.py**: This is a swarming permutations file that defines the extent of the search space used during the swarm. For example, it includes the min and max allowed value for each parameter. Unless you want to perform a more advanced swarm (see below), you can ignore this file. * **model_0/description.py**: This is an OPF description file which overrides specific parameters from the above description.py with the best values found during the swarming process. This description file can be run using run_opf_experiment.py. * **model_0/params.csv**: A csv file containing the parameter values chosen for this best model. This is for reference only. -* **model_0/model_params.py**: The model parameters, which can be used for creating models manually through the [`ModelFactory`](https://github.com/numenta/nupic/blob/master/py/nupic/frameworks/opf/modelfactory.py#L33). +* **model_0/model_params.py**: The model parameters, which can be used for creating models manually through the [`ModelFactory`](https://github.com/numenta/nupic/blob/master/py/nupic/frameworks/opf/model_factory.py#L33). * **search_def_Report.csv**: This is a spreadsheet that lists information on each of the models that were evaluated as part of the swarm. For each model, it has the parameters that were used and the results that that model generated on each of the error metrics that were evaluated. **Note:** when running the swarm, if you get an error such as "No handlers could be found for logger..." it could be a MySQL setup issue. You can check this using the [above script](#prerequisites). diff --git a/examples/NuPIC Walkthrough.ipynb b/examples/NuPIC Walkthrough.ipynb index 15b461019b..ccb3ecf38b 100644 --- a/examples/NuPIC Walkthrough.ipynb +++ b/examples/NuPIC Walkthrough.ipynb @@ -1252,7 +1252,7 @@ }, "outputs": [], "source": [ - "from nupic.frameworks.opf.modelfactory import ModelFactory\n", + "from nupic.frameworks.opf.model_factory import ModelFactory\n", "model = ModelFactory.create(MODEL_PARAMS)\n", "model.enableInference({'predictedField': 'consumption'})" ] @@ -1759,7 +1759,7 @@ }, "outputs": [], "source": [ - "from nupic.frameworks.opf.modelfactory import ModelFactory\n", + "from nupic.frameworks.opf.model_factory import ModelFactory\n", "model = ModelFactory.create(MODEL_PARAMS)\n", "model.enableInference({'predictedField': 'consumption'})" ] @@ -1903,4 +1903,4 @@ }, "nbformat": 4, "nbformat_minor": 0 -} \ No newline at end of file +} diff --git a/examples/opf/clients/cpu/cpu.py b/examples/opf/clients/cpu/cpu.py index cb04c77392..c9dacbe24f 100755 --- a/examples/opf/clients/cpu/cpu.py +++ b/examples/opf/clients/cpu/cpu.py @@ -28,7 +28,7 @@ import matplotlib.pyplot as plt from nupic.data.inference_shifter import InferenceShifter -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory import model_params @@ -81,10 +81,10 @@ def runCPU(): actline.set_ydata(actHistory) # update the data predline.set_ydata(predHistory) # update the data plt.draw() - plt.legend( ('actual','predicted') ) + plt.legend( ('actual','predicted') ) # Make sure we wait a total of 2 seconds per iteration. - try: + try: plt.pause(SECONDS_PER_STEP) except: pass diff --git a/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py b/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py index 68f0d3299f..b6c97eb15c 100755 --- a/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py +++ b/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py @@ -31,7 +31,7 @@ from pkg_resources import resource_filename -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory import model_params diff --git a/examples/opf/clients/hotgym/anomaly/one_gym/run.py b/examples/opf/clients/hotgym/anomaly/one_gym/run.py index 82506f3046..201c9312b2 100755 --- a/examples/opf/clients/hotgym/anomaly/one_gym/run.py +++ b/examples/opf/clients/hotgym/anomaly/one_gym/run.py @@ -28,7 +28,7 @@ import datetime from nupic.data.inference_shifter import InferenceShifter -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory import nupic_anomaly_output diff --git a/examples/opf/clients/hotgym/prediction/one_gym/run.py b/examples/opf/clients/hotgym/prediction/one_gym/run.py index 2a3d622d02..dfb229fe9c 100755 --- a/examples/opf/clients/hotgym/prediction/one_gym/run.py +++ b/examples/opf/clients/hotgym/prediction/one_gym/run.py @@ -29,7 +29,7 @@ from nupic.data.inference_shifter import InferenceShifter from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory from nupic.frameworks.opf.predictionmetricsmanager import MetricsManager import nupic_output diff --git a/examples/opf/clients/hotgym/simple/hotgym.py b/examples/opf/clients/hotgym/simple/hotgym.py index f2e2b5d6df..4b2f25660b 100755 --- a/examples/opf/clients/hotgym/simple/hotgym.py +++ b/examples/opf/clients/hotgym/simple/hotgym.py @@ -28,7 +28,7 @@ from pkg_resources import resource_filename from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory from nupic.frameworks.opf.predictionmetricsmanager import MetricsManager import model_params diff --git a/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py b/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py index 479549b3b8..9e2166b12f 100755 --- a/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py +++ b/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py @@ -31,7 +31,7 @@ from pkg_resources import resource_filename -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory import model_params diff --git a/examples/opf/experiments/anomaly/spatial/10field_few2_skewed/description.py b/examples/opf/experiments/anomaly/spatial/10field_few2_skewed/description.py index 9ce50fc1be..bd7775d3a4 100644 --- a/examples/opf/experiments/anomaly/spatial/10field_few2_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/10field_few2_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -379,7 +379,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/10field_few_skewed/description.py b/examples/opf/experiments/anomaly/spatial/10field_few_skewed/description.py index 9ce50fc1be..bd7775d3a4 100644 --- a/examples/opf/experiments/anomaly/spatial/10field_few_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/10field_few_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -379,7 +379,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/10field_many_skewed/description.py b/examples/opf/experiments/anomaly/spatial/10field_many_skewed/description.py index 0e7f74befb..cc3786257d 100644 --- a/examples/opf/experiments/anomaly/spatial/10field_many_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/10field_many_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -370,7 +370,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/1field_few_balanced/description.py b/examples/opf/experiments/anomaly/spatial/1field_few_balanced/description.py index 40a00cc506..1945409ec2 100644 --- a/examples/opf/experiments/anomaly/spatial/1field_few_balanced/description.py +++ b/examples/opf/experiments/anomaly/spatial/1field_few_balanced/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -370,7 +370,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/1field_few_skewed/description.py b/examples/opf/experiments/anomaly/spatial/1field_few_skewed/description.py index 0e7f74befb..cc3786257d 100644 --- a/examples/opf/experiments/anomaly/spatial/1field_few_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/1field_few_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -370,7 +370,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2field_few_6040/description.py b/examples/opf/experiments/anomaly/spatial/2field_few_6040/description.py index 6adc144dc3..e6356fd657 100644 --- a/examples/opf/experiments/anomaly/spatial/2field_few_6040/description.py +++ b/examples/opf/experiments/anomaly/spatial/2field_few_6040/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2field_few_balanced/description.py b/examples/opf/experiments/anomaly/spatial/2field_few_balanced/description.py index 28fc417e64..fd3158f709 100644 --- a/examples/opf/experiments/anomaly/spatial/2field_few_balanced/description.py +++ b/examples/opf/experiments/anomaly/spatial/2field_few_balanced/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2field_few_skewed/description.py b/examples/opf/experiments/anomaly/spatial/2field_few_skewed/description.py index 6adc144dc3..e6356fd657 100644 --- a/examples/opf/experiments/anomaly/spatial/2field_few_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/2field_few_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2field_many_balanced/description.py b/examples/opf/experiments/anomaly/spatial/2field_many_balanced/description.py index 6adc144dc3..e6356fd657 100644 --- a/examples/opf/experiments/anomaly/spatial/2field_many_balanced/description.py +++ b/examples/opf/experiments/anomaly/spatial/2field_many_balanced/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2field_many_novelAtEnd/description.py b/examples/opf/experiments/anomaly/spatial/2field_many_novelAtEnd/description.py index 6adc144dc3..e6356fd657 100644 --- a/examples/opf/experiments/anomaly/spatial/2field_many_novelAtEnd/description.py +++ b/examples/opf/experiments/anomaly/spatial/2field_many_novelAtEnd/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/2fields_many_skewed/description.py b/examples/opf/experiments/anomaly/spatial/2fields_many_skewed/description.py index 6adc144dc3..e6356fd657 100644 --- a/examples/opf/experiments/anomaly/spatial/2fields_many_skewed/description.py +++ b/examples/opf/experiments/anomaly/spatial/2fields_many_skewed/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/novel_combination/description.py b/examples/opf/experiments/anomaly/spatial/novel_combination/description.py index 9846b3228a..490d82f663 100644 --- a/examples/opf/experiments/anomaly/spatial/novel_combination/description.py +++ b/examples/opf/experiments/anomaly/spatial/novel_combination/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/spatial/simple/description.py b/examples/opf/experiments/anomaly/spatial/simple/description.py index 7fccc93324..c2135096d6 100644 --- a/examples/opf/experiments/anomaly/spatial/simple/description.py +++ b/examples/opf/experiments/anomaly/spatial/simple/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -371,7 +371,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/anomaly/temporal/hotgym/description.py b/examples/opf/experiments/anomaly/temporal/hotgym/description.py index 08b0de415a..5538c3a2e7 100644 --- a/examples/opf/experiments/anomaly/temporal/hotgym/description.py +++ b/examples/opf/experiments/anomaly/temporal/hotgym/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/anomaly/temporal/saw_200/description.py b/examples/opf/experiments/anomaly/temporal/saw_200/description.py index 36e26977a6..280ee6b2a7 100644 --- a/examples/opf/experiments/anomaly/temporal/saw_200/description.py +++ b/examples/opf/experiments/anomaly/temporal/saw_200/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/anomaly/temporal/saw_big/description.py b/examples/opf/experiments/anomaly/temporal/saw_big/description.py index bc79f91f0e..cc17fc8f67 100644 --- a/examples/opf/experiments/anomaly/temporal/saw_big/description.py +++ b/examples/opf/experiments/anomaly/temporal/saw_big/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/anomaly/temporal/simple/description.py b/examples/opf/experiments/anomaly/temporal/simple/description.py index c09fcf2bc3..5bb9968fc4 100644 --- a/examples/opf/experiments/anomaly/temporal/simple/description.py +++ b/examples/opf/experiments/anomaly/temporal/simple/description.py @@ -27,20 +27,20 @@ '~/nupic/current/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/classification/base_category/UNDER_DEVELOPMENT b/examples/opf/experiments/classification/base_category/UNDER_DEVELOPMENT index 95a2f9c2f1..1ec8c6a032 100644 --- a/examples/opf/experiments/classification/base_category/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/classification/base_category/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '~/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/classification/base_category/description.py b/examples/opf/experiments/classification/base_category/description.py index 608be39190..1332e14f25 100644 --- a/examples/opf/experiments/classification/base_category/description.py +++ b/examples/opf/experiments/classification/base_category/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -379,7 +379,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/classification/base_scalar/UNDER_DEVELOPMENT b/examples/opf/experiments/classification/base_scalar/UNDER_DEVELOPMENT index 95a2f9c2f1..1ec8c6a032 100644 --- a/examples/opf/experiments/classification/base_scalar/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/classification/base_scalar/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '~/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/classification/base_scalar/description.py b/examples/opf/experiments/classification/base_scalar/description.py index 502b5527f5..7fc4692e27 100644 --- a/examples/opf/experiments/classification/base_scalar/description.py +++ b/examples/opf/experiments/classification/base_scalar/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -381,7 +381,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/classification/category_TP_0/description.py b/examples/opf/experiments/classification/category_TP_0/description.py index 8d6ed4193f..b97fb0417e 100644 --- a/examples/opf/experiments/classification/category_TP_0/description.py +++ b/examples/opf/experiments/classification/category_TP_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/classification/category_TP_1/description.py b/examples/opf/experiments/classification/category_TP_1/description.py index ec44ec2c77..dfc770dc53 100644 --- a/examples/opf/experiments/classification/category_TP_1/description.py +++ b/examples/opf/experiments/classification/category_TP_1/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/classification/category_hub_TP_0/description.py b/examples/opf/experiments/classification/category_hub_TP_0/description.py index ec2081e9e5..7483a67694 100644 --- a/examples/opf/experiments/classification/category_hub_TP_0/description.py +++ b/examples/opf/experiments/classification/category_hub_TP_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/classification/scalar_TP_0/description.py b/examples/opf/experiments/classification/scalar_TP_0/description.py index af14d51e4c..4283a69347 100644 --- a/examples/opf/experiments/classification/scalar_TP_0/description.py +++ b/examples/opf/experiments/classification/scalar_TP_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/classification/scalar_TP_1/description.py b/examples/opf/experiments/classification/scalar_TP_1/description.py index b5a8df65fe..560c1b58e3 100644 --- a/examples/opf/experiments/classification/scalar_TP_1/description.py +++ b/examples/opf/experiments/classification/scalar_TP_1/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/classification/scalar_encoder_0/UNDER_DEVELOPMENT b/examples/opf/experiments/classification/scalar_encoder_0/UNDER_DEVELOPMENT index 4d660ccdb7..7b7a3ed2d1 100644 --- a/examples/opf/experiments/classification/scalar_encoder_0/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/classification/scalar_encoder_0/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '/Users/ronmarianetti/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/classification/scalar_encoder_0/description.py b/examples/opf/experiments/classification/scalar_encoder_0/description.py index 5dc81d9d15..f58467b2d8 100644 --- a/examples/opf/experiments/classification/scalar_encoder_0/description.py +++ b/examples/opf/experiments/classification/scalar_encoder_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/missing_record/base/UNDER_DEVELOPMENT b/examples/opf/experiments/missing_record/base/UNDER_DEVELOPMENT index 95a2f9c2f1..1ec8c6a032 100644 --- a/examples/opf/experiments/missing_record/base/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/missing_record/base/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '~/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/missing_record/base/description.py b/examples/opf/experiments/missing_record/base/description.py index ae50b8584b..6f34e5d9a5 100644 --- a/examples/opf/experiments/missing_record/base/description.py +++ b/examples/opf/experiments/missing_record/base/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/missing_record/simple_0/description.py b/examples/opf/experiments/missing_record/simple_0/description.py index 2677a84c46..9dfe967eee 100644 --- a/examples/opf/experiments/missing_record/simple_0/description.py +++ b/examples/opf/experiments/missing_record/simple_0/description.py @@ -22,17 +22,17 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ -{ - 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), +{ + 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), '../datasets/simple_0.csv'), - + 'windowSize': 25, - 'modelParams': { - 'sensorParams': { + 'modelParams': { + 'sensorParams': { 'verbosity': 0, 'encoders': { 'timestamp_timeOfDay': None, diff --git a/examples/opf/experiments/multistep/base/UNDER_DEVELOPMENT b/examples/opf/experiments/multistep/base/UNDER_DEVELOPMENT index 95a2f9c2f1..1ec8c6a032 100644 --- a/examples/opf/experiments/multistep/base/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/multistep/base/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '~/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/multistep/base/description.py b/examples/opf/experiments/multistep/base/description.py index 6650ac23fb..300f7e5ee2 100644 --- a/examples/opf/experiments/multistep/base/description.py +++ b/examples/opf/experiments/multistep/base/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/multistep/first_order_0/description.py b/examples/opf/experiments/multistep/first_order_0/description.py index 9749d0e130..135573ef89 100644 --- a/examples/opf/experiments/multistep/first_order_0/description.py +++ b/examples/opf/experiments/multistep/first_order_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym/description.py b/examples/opf/experiments/multistep/hotgym/description.py index d18a5494c1..179cba6032 100644 --- a/examples/opf/experiments/multistep/hotgym/description.py +++ b/examples/opf/experiments/multistep/hotgym/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/multistep/hotgym_best_enc/description.py b/examples/opf/experiments/multistep/hotgym_best_enc/description.py index c00cc90c4c..13fb64c62a 100644 --- a/examples/opf/experiments/multistep/hotgym_best_enc/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_enc/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_sp/description.py b/examples/opf/experiments/multistep/hotgym_best_sp/description.py index 61e11c19f9..19b5564f61 100644 --- a/examples/opf/experiments/multistep/hotgym_best_sp/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_sp/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_sp_16K/description.py b/examples/opf/experiments/multistep/hotgym_best_sp_16K/description.py index b9139c0c86..c8152ecfa1 100644 --- a/examples/opf/experiments/multistep/hotgym_best_sp_16K/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_sp_16K/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_sp_5step/description.py b/examples/opf/experiments/multistep/hotgym_best_sp_5step/description.py index 5015a7c26c..55883e68ce 100644 --- a/examples/opf/experiments/multistep/hotgym_best_sp_5step/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_sp_5step/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_sp_5step_16K/description.py b/examples/opf/experiments/multistep/hotgym_best_sp_5step_16K/description.py index cdf46e82d6..9ac89a0f41 100644 --- a/examples/opf/experiments/multistep/hotgym_best_sp_5step_16K/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_sp_5step_16K/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_tp/description.py b/examples/opf/experiments/multistep/hotgym_best_tp/description.py index 7ab8b5bc30..06f856b570 100644 --- a/examples/opf/experiments/multistep/hotgym_best_tp/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_tp/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_tp_16K/description.py b/examples/opf/experiments/multistep/hotgym_best_tp_16K/description.py index f78f5e5999..f42db0603f 100644 --- a/examples/opf/experiments/multistep/hotgym_best_tp_16K/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_tp_16K/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/hotgym_best_tp_5step/description.py b/examples/opf/experiments/multistep/hotgym_best_tp_5step/description.py index e2245cddf2..4bcfc63684 100644 --- a/examples/opf/experiments/multistep/hotgym_best_tp_5step/description.py +++ b/examples/opf/experiments/multistep/hotgym_best_tp_5step/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_0/description.py b/examples/opf/experiments/multistep/simple_0/description.py index 850d248d84..a32d7ec724 100644 --- a/examples/opf/experiments/multistep/simple_0/description.py +++ b/examples/opf/experiments/multistep/simple_0/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_0_f2/description.py b/examples/opf/experiments/multistep/simple_0_f2/description.py index 4ce9ad8858..9c26309346 100644 --- a/examples/opf/experiments/multistep/simple_0_f2/description.py +++ b/examples/opf/experiments/multistep/simple_0_f2/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_1/description.py b/examples/opf/experiments/multistep/simple_1/description.py index f31f1439c2..3dd314aede 100644 --- a/examples/opf/experiments/multistep/simple_1/description.py +++ b/examples/opf/experiments/multistep/simple_1/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_1_f2/description.py b/examples/opf/experiments/multistep/simple_1_f2/description.py index cd0ca09d36..f5ebc5d5e2 100644 --- a/examples/opf/experiments/multistep/simple_1_f2/description.py +++ b/examples/opf/experiments/multistep/simple_1_f2/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_2/description.py b/examples/opf/experiments/multistep/simple_2/description.py index c48e3139c2..8ac17da67b 100644 --- a/examples/opf/experiments/multistep/simple_2/description.py +++ b/examples/opf/experiments/multistep/simple_2/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_3/description.py b/examples/opf/experiments/multistep/simple_3/description.py index 56238ef0c1..3efafaacbb 100644 --- a/examples/opf/experiments/multistep/simple_3/description.py +++ b/examples/opf/experiments/multistep/simple_3/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_3_enc/description.py b/examples/opf/experiments/multistep/simple_3_enc/description.py index a07210c566..ef9f50b6e8 100644 --- a/examples/opf/experiments/multistep/simple_3_enc/description.py +++ b/examples/opf/experiments/multistep/simple_3_enc/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_3_f2/description.py b/examples/opf/experiments/multistep/simple_3_f2/description.py index 1a60987515..d10996219d 100644 --- a/examples/opf/experiments/multistep/simple_3_f2/description.py +++ b/examples/opf/experiments/multistep/simple_3_f2/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/multistep/simple_3_sp/description.py b/examples/opf/experiments/multistep/simple_3_sp/description.py index 45ec3fb78a..7b76b6311d 100644 --- a/examples/opf/experiments/multistep/simple_3_sp/description.py +++ b/examples/opf/experiments/multistep/simple_3_sp/description.py @@ -22,7 +22,7 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/examples/opf/experiments/opfrunexperiment_test/checkpoints/UNDER_DEVELOPMENT b/examples/opf/experiments/opfrunexperiment_test/checkpoints/UNDER_DEVELOPMENT index 95a2f9c2f1..1ec8c6a032 100644 --- a/examples/opf/experiments/opfrunexperiment_test/checkpoints/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/opfrunexperiment_test/checkpoints/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '~/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/opfrunexperiment_test/checkpoints/a/description.py b/examples/opf/experiments/opfrunexperiment_test/checkpoints/a/description.py index ba5a142213..0e54073df4 100644 --- a/examples/opf/experiments/opfrunexperiment_test/checkpoints/a/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/checkpoints/a/description.py @@ -30,7 +30,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/examples/opf/experiments/opfrunexperiment_test/checkpoints/a_plus_b/description.py b/examples/opf/experiments/opfrunexperiment_test/checkpoints/a_plus_b/description.py index 358a63d3c0..155ec75e97 100644 --- a/examples/opf/experiments/opfrunexperiment_test/checkpoints/a_plus_b/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/checkpoints/a_plus_b/description.py @@ -30,7 +30,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/examples/opf/experiments/opfrunexperiment_test/checkpoints/b/description.py b/examples/opf/experiments/opfrunexperiment_test/checkpoints/b/description.py index f8e21a2272..d50b0ccbd3 100644 --- a/examples/opf/experiments/opfrunexperiment_test/checkpoints/b/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/checkpoints/b/description.py @@ -30,7 +30,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/examples/opf/experiments/opfrunexperiment_test/checkpoints/base.py b/examples/opf/experiments/opfrunexperiment_test/checkpoints/base.py index be882d37c3..a6184ab462 100644 --- a/examples/opf/experiments/opfrunexperiment_test/checkpoints/base.py +++ b/examples/opf/experiments/opfrunexperiment_test/checkpoints/base.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym/description.py b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym/description.py index 15aecbd4b1..fc51d07671 100644 --- a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_1hr_agg/description.py b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_1hr_agg/description.py index 4fdc7b41e7..83cd6a6b32 100644 --- a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_1hr_agg/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_1hr_agg/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_no_agg/description.py b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_no_agg/description.py index e577ec80a8..6490f18fd0 100644 --- a/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_no_agg/description.py +++ b/examples/opf/experiments/opfrunexperiment_test/simpleOPF/hotgym_no_agg/description.py @@ -27,20 +27,20 @@ '~/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/params/EnsembleOnline.py b/examples/opf/experiments/params/EnsembleOnline.py index f7427abf6e..3fc8fef616 100644 --- a/examples/opf/experiments/params/EnsembleOnline.py +++ b/examples/opf/experiments/params/EnsembleOnline.py @@ -1,7 +1,7 @@ import random import multiprocessing import numpy as np -from nupic.frameworks.opf import opfhelpers +from nupic.frameworks.opf import opf_helpers from nupic.frameworks.opf.client import Client from random import shuffle from random import randrange, uniform @@ -168,7 +168,7 @@ def getFieldPermutations(config, predictedField): def getModelDescriptionLists(numProcesses, experiment): - config, control = opfhelpers.loadExperiment(experiment) + config, control = opf_helpers.loadExperiment(experiment) encodersList=getFieldPermutations(config, 'pounds') ns=range(50, 140, 120) clAlphas=np.arange(0.01, 0.16, 0.104) diff --git a/examples/opf/experiments/params/test_all.py b/examples/opf/experiments/params/test_all.py index 8ba71b2a0f..071bca94c3 100644 --- a/examples/opf/experiments/params/test_all.py +++ b/examples/opf/experiments/params/test_all.py @@ -25,7 +25,7 @@ from pprint import pprint import time -from nupic.frameworks.opf import opfhelpers +from nupic.frameworks.opf import opf_helpers from nupic.frameworks.opf.client import Client # Experiment directories relative to "trunk/examples/opf/experiments." @@ -38,7 +38,7 @@ def testAll(experiments): for experiment in experiments: experimentBase = os.path.join(os.getcwd(), experimentsDir, experiment) - config, control = opfhelpers.loadExperiment(experimentBase) + config, control = opf_helpers.loadExperiment(experimentBase) if control['environment'] == 'opfExperiment': experimentTasks = control['tasks'] diff --git a/examples/opf/experiments/spatial_classification/auto_generated/UNDER_DEVELOPMENT b/examples/opf/experiments/spatial_classification/auto_generated/UNDER_DEVELOPMENT index 4d660ccdb7..7b7a3ed2d1 100644 --- a/examples/opf/experiments/spatial_classification/auto_generated/UNDER_DEVELOPMENT +++ b/examples/opf/experiments/spatial_classification/auto_generated/UNDER_DEVELOPMENT @@ -27,20 +27,20 @@ This description.py file was generated by: '/Users/ronmarianetti/nta/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, +from nupic.frameworks.opf.opf_utils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -376,7 +376,7 @@ tasks = [ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/examples/opf/experiments/spatial_classification/base/description.py b/examples/opf/experiments/spatial_classification/base/description.py index 22019f7de2..fddf39055e 100644 --- a/examples/opf/experiments/spatial_classification/base/description.py +++ b/examples/opf/experiments/spatial_classification/base/description.py @@ -25,20 +25,20 @@ """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/examples/opf/experiments/spatial_classification/category_0/description.py b/examples/opf/experiments/spatial_classification/category_0/description.py index 098734ea99..8280eb5e2b 100644 --- a/examples/opf/experiments/spatial_classification/category_0/description.py +++ b/examples/opf/experiments/spatial_classification/category_0/description.py @@ -22,19 +22,19 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ -{ - 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), +{ + 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), '../datasets/category_0.csv'), - + 'errorMetric': 'avg_err', - - 'modelParams': { + + 'modelParams': { 'sensorParams': { 'verbosity': 0}, - 'clParams': { + 'clParams': { 'verbosity': 0, }, } diff --git a/examples/opf/experiments/spatial_classification/category_1/description.py b/examples/opf/experiments/spatial_classification/category_1/description.py index f3ca7e5cb7..bfc23df6ed 100644 --- a/examples/opf/experiments/spatial_classification/category_1/description.py +++ b/examples/opf/experiments/spatial_classification/category_1/description.py @@ -22,18 +22,18 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ -{ - 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), +{ + 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), '../datasets/category_1.csv'), 'errorMetric': 'avg_err', - 'modelParams': { + 'modelParams': { 'sensorParams': { 'verbosity': 0}, - 'clParams': { + 'clParams': { 'verbosity': 0, }, } diff --git a/examples/opf/experiments/spatial_classification/scalar_0/description.py b/examples/opf/experiments/spatial_classification/scalar_0/description.py index 195bde5faf..6cf2a8ca4c 100644 --- a/examples/opf/experiments/spatial_classification/scalar_0/description.py +++ b/examples/opf/experiments/spatial_classification/scalar_0/description.py @@ -22,20 +22,20 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ -{ - 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), +{ + 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), '../datasets/scalar_0.csv'), 'errorMetric': 'aae', - 'modelParams': { - 'sensorParams': { + 'modelParams': { + 'sensorParams': { 'verbosity': 0, - 'encoders': { - 'field1': { + 'encoders': { + 'field1': { 'clipInput': True, 'fieldname': u'field1', 'maxval': 0.1, @@ -45,7 +45,7 @@ 'type': 'ScalarEncoder', 'w': 21 }, - 'classification': { + 'classification': { 'classifierOnly': True, 'clipInput': True, 'fieldname': u'classification', @@ -58,7 +58,7 @@ }, }, }, - 'clParams': { + 'clParams': { 'verbosity': 0, }, } diff --git a/examples/opf/experiments/spatial_classification/scalar_1/description.py b/examples/opf/experiments/spatial_classification/scalar_1/description.py index 355d46b238..8ae1c7fbcd 100644 --- a/examples/opf/experiments/spatial_classification/scalar_1/description.py +++ b/examples/opf/experiments/spatial_classification/scalar_1/description.py @@ -22,20 +22,20 @@ ## This file defines parameters for a prediction experiment. import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ -{ - 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), +{ + 'dataSource': 'file://' + os.path.join(os.path.dirname(__file__), '../datasets/scalar_1.csv'), 'errorMetric': 'aae', - 'modelParams': { - 'sensorParams': { + 'modelParams': { + 'sensorParams': { 'verbosity': 0, - 'encoders': { - 'field1': { + 'encoders': { + 'field1': { 'clipInput': True, 'fieldname': u'field1', 'maxval': 5.0, @@ -45,7 +45,7 @@ 'type': 'ScalarEncoder', 'w': 21 }, - 'classification': { + 'classification': { 'classifierOnly': True, 'clipInput': True, 'fieldname': u'classification', @@ -58,7 +58,7 @@ }, }, }, - 'clParams': { + 'clParams': { 'verbosity': 0, }, } diff --git a/examples/opf/experiments/template/base/descriptionTemplate.py b/examples/opf/experiments/template/base/descriptionTemplate.py index 0f40726e56..cfaa1eb4f9 100644 --- a/examples/opf/experiments/template/base/descriptionTemplate.py +++ b/examples/opf/experiments/template/base/descriptionTemplate.py @@ -27,16 +27,16 @@ integrate future template improvements into your description.py. """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) from nupic.frameworks.opf.predictionmetricsmanager import MetricSpec -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer, @@ -402,7 +402,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), @@ -411,7 +411,7 @@ ], - # Inference specifications: sequence of opftaskdriver.InferenceSpecXXXXX + # Inference specifications: sequence of opf_task_driver.InferenceSpecXXXXX # instances that indicate which inferences to perform and which metrics to # gather for each inference step. Note that it is up to the client # to decide what to do with these metrics diff --git a/examples/prediction/category_prediction/run.py b/examples/prediction/category_prediction/run.py index 25593d0e99..ecb27bdddd 100755 --- a/examples/prediction/category_prediction/run.py +++ b/examples/prediction/category_prediction/run.py @@ -26,7 +26,7 @@ import re from nupic.data.inference_shifter import InferenceShifter -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory # Prepare textfile and tokenize: diff --git a/src/nupic/data/inference_shifter.py b/src/nupic/data/inference_shifter.py index ca5103063d..6c3c5e893e 100644 --- a/src/nupic/data/inference_shifter.py +++ b/src/nupic/data/inference_shifter.py @@ -24,7 +24,7 @@ import collections import copy -from nupic.frameworks.opf.opfutils import InferenceElement, ModelResult +from nupic.frameworks.opf.opf_utils import InferenceElement, ModelResult class InferenceShifter(object): diff --git a/src/nupic/frameworks/opf/client.py b/src/nupic/frameworks/opf/client.py index ad50216f0d..ceb52447b9 100644 --- a/src/nupic/frameworks/opf/client.py +++ b/src/nupic/frameworks/opf/client.py @@ -21,8 +21,8 @@ """Simple OPF client.""" -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf.opfbasicenvironment import BasicDatasetReader +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf.opf_basic_environment import BasicDatasetReader from nupic.frameworks.opf.predictionmetricsmanager import MetricsManager @@ -58,7 +58,7 @@ def __iter__(self): return self def _processRecord(self, inputRecord): - + modelResult = self.model.run(inputRecord) modelResult.metrics = self.metricsManager.update(modelResult) if self.sink: @@ -68,7 +68,7 @@ def _processRecord(self, inputRecord): def next(self): record = self.datasetReader.next() return self._processRecord(record) - + def skipNRecords(self, n): for i in range(n): self.datasetReader.next() @@ -77,7 +77,7 @@ def nextTruthPrediction(self, field): prediction=self._processRecord(record).inferences['prediction'][0] truth=record[field] return truth, prediction - + def run(self): result = None diff --git a/src/nupic/frameworks/opf/common_models/cluster_params.py b/src/nupic/frameworks/opf/common_models/cluster_params.py index 05d038a36a..bb34856d4c 100644 --- a/src/nupic/frameworks/opf/common_models/cluster_params.py +++ b/src/nupic/frameworks/opf/common_models/cluster_params.py @@ -60,7 +60,7 @@ def getScalarMetricWithTimeOfDayAnomalyParams(metricData, :rtype: dict Example: - from nupic.frameworks.opf.modelfactory import ModelFactory + from nupic.frameworks.opf.model_factory import ModelFactory from nupic.frameworks.opf.common_models.cluster_params import ( getScalarMetricWithTimeOfDayAnomalyParams) diff --git a/src/nupic/frameworks/opf/expdescriptionapi.py b/src/nupic/frameworks/opf/exp_description_api.py similarity index 98% rename from src/nupic/frameworks/opf/expdescriptionapi.py rename to src/nupic/frameworks/opf/exp_description_api.py index bc7b7618b6..526be2e81c 100644 --- a/src/nupic/frameworks/opf/expdescriptionapi.py +++ b/src/nupic/frameworks/opf/exp_description_api.py @@ -43,9 +43,9 @@ from pkg_resources import resource_filename -from nupic.frameworks.opf.opfutils import validateOpfJsonValue -from nupic.frameworks.opf.opftaskdriver import (IterationPhaseSpecInferOnly, - IterationPhaseSpecLearnAndInfer) +from nupic.frameworks.opf.opf_utils import validateOpfJsonValue +from nupic.frameworks.opf.opf_task_driver import (IterationPhaseSpecInferOnly, + IterationPhaseSpecLearnAndInfer) from nupic.support.enum import Enum diff --git a/src/nupic/frameworks/opf/expdescriptionhelpers.py b/src/nupic/frameworks/opf/exp_description_helpers.py similarity index 100% rename from src/nupic/frameworks/opf/expdescriptionhelpers.py rename to src/nupic/frameworks/opf/exp_description_helpers.py diff --git a/src/nupic/frameworks/opf/experiment_runner.py b/src/nupic/frameworks/opf/experiment_runner.py index 47900eda8d..c752d5858f 100644 --- a/src/nupic/frameworks/opf/experiment_runner.py +++ b/src/nupic/frameworks/opf/experiment_runner.py @@ -36,12 +36,12 @@ import numpy from nupic.data import jsonhelpers -from nupic.frameworks.opf import opfbasicenvironment, opfhelpers -from nupic.frameworks.opf.expdescriptionapi import OpfEnvironment -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf.opftaskdriver import OPFTaskDriver -from nupic.frameworks.opf.opfutils import (InferenceElement, matchPatterns, - validateOpfJsonValue) +from nupic.frameworks.opf import opf_basic_environment, opf_helpers +from nupic.frameworks.opf.exp_description_api import OpfEnvironment +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf.opf_task_driver import OPFTaskDriver +from nupic.frameworks.opf.opf_utils import (InferenceElement, matchPatterns, + validateOpfJsonValue) from nupic.support import initLogging @@ -378,9 +378,9 @@ def _runExperimentImpl(options, model=None): # Load the experiment's description.py module experimentDir = options.experimentDir - descriptionPyModule = opfhelpers.loadExperimentDescriptionScriptFromDir( + descriptionPyModule = opf_helpers.loadExperimentDescriptionScriptFromDir( experimentDir) - expIface = opfhelpers.getExperimentDescriptionInterfaceFromModule( + expIface = opf_helpers.getExperimentDescriptionInterfaceFromModule( descriptionPyModule) # Handle "list checkpoints" request @@ -622,7 +622,7 @@ def __init__(self, model, task, cmdOptions): # Generate a new dataset from streamDef and create the dataset reader streamDef = task['dataset'] - datasetReader = opfbasicenvironment.BasicDatasetReader(streamDef) + datasetReader = opf_basic_environment.BasicDatasetReader(streamDef) self.__model = model self.__datasetReader = datasetReader @@ -630,7 +630,7 @@ def __init__(self, model, task, cmdOptions): self.__cmdOptions = cmdOptions - self.__predictionLogger = opfbasicenvironment.BasicPredictionLogger( + self.__predictionLogger = opf_basic_environment.BasicPredictionLogger( fields=model.getFieldInfo(), experimentDir=cmdOptions.experimentDir, label=task['taskLabel'], @@ -650,7 +650,7 @@ def __init__(self, model, task, cmdOptions): self.__predictionLogger.setLoggedMetrics(loggedMetricLabels) # Create a prediction metrics logger - self.__metricsLogger = opfbasicenvironment.BasicPredictionMetricsLogger( + self.__metricsLogger = opf_basic_environment.BasicPredictionMetricsLogger( experimentDir=cmdOptions.experimentDir, label=task['taskLabel']) diff --git a/src/nupic/frameworks/opf/htmpredictionmodel.py b/src/nupic/frameworks/opf/htm_prediction_model.py similarity index 99% rename from src/nupic/frameworks/opf/htmpredictionmodel.py rename to src/nupic/frameworks/opf/htm_prediction_model.py index 5360bd61ba..514cffdc7c 100644 --- a/src/nupic/frameworks/opf/htmpredictionmodel.py +++ b/src/nupic/frameworks/opf/htm_prediction_model.py @@ -19,7 +19,7 @@ # http://numenta.org/licenses/ # ---------------------------------------------------------------------- -""" @file htmpredictionmodel.py +""" @file htm_prediction_model.py Encapsulation of CLAnetwork that implements the ModelBase. @@ -43,11 +43,11 @@ from nupic.encoders import MultiEncoder, DeltaEncoder from nupic.engine import Network from nupic.support.fshelpers import makeDirectoryFromAbsolutePath -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement, - SensorInput, - ClassifierInput, - initLogger) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement, + SensorInput, + ClassifierInput, + initLogger) try: import capnp @@ -236,7 +236,7 @@ def getParameter(self, paramName): if paramName == '__numRunCalls': return self.__numRunCalls else: - raise RuntimeError("'%s' parameter is not exposed by htmpredictionmodel." % \ + raise RuntimeError("'%s' parameter is not exposed by htm_prediction_model." % \ (paramName)) @@ -356,7 +356,7 @@ def run(self, inputRecord): nupic.data.RecordStream.getNextRecordDict() result format. return: - An ModelResult class (see opfutils.py) The contents of + An ModelResult class (see opf_utils.py) The contents of ModelResult.inferences depends on the the specific inference type of this model, which can be queried by getInferenceType() """ diff --git a/src/nupic/frameworks/opf/htmpredictionmodelcallbacks.py b/src/nupic/frameworks/opf/htm_prediction_model_callbacks.py similarity index 96% rename from src/nupic/frameworks/opf/htmpredictionmodelcallbacks.py rename to src/nupic/frameworks/opf/htm_prediction_model_callbacks.py index e6f5d1062f..1ad4b1b060 100644 --- a/src/nupic/frameworks/opf/htmpredictionmodelcallbacks.py +++ b/src/nupic/frameworks/opf/htm_prediction_model_callbacks.py @@ -26,7 +26,7 @@ import os from nupic.support.fshelpers import makeDirectoryFromAbsolutePath -from htmpredictionmodel import HTMPredictionModel +from htm_prediction_model import HTMPredictionModel @@ -52,7 +52,7 @@ def htmPredictionModelControlDisableSPLearningCb(htmPredictionModel): retaining the ability to re-enable SP learning in the future. See also: htmPredictionModelControlEnableSPLearningCb. - See also: modelcallbacks.modelControlFinishLearningCb. + See also: model_callbacks.modelControlFinishLearningCb. htmPredictionModel: pointer to a HTMPredictionModel instance @@ -88,7 +88,7 @@ def htmPredictionModelControlDisableTPLearningCb(htmPredictionModel): retaining the ability to re-enable TP learning in the future. See also: htmPredictionModelControlEnableTPLearningCb. - See also: modelcallbacks.modelControlFinishLearningCb. + See also: model_callbacks.modelControlFinishLearningCb. htmPredictionModel: pointer to a HTMPredictionModel instance diff --git a/src/nupic/frameworks/opf/htmpredictionmodel_classifier_helper.py b/src/nupic/frameworks/opf/htm_prediction_model_classifier_helper.py similarity index 97% rename from src/nupic/frameworks/opf/htmpredictionmodel_classifier_helper.py rename to src/nupic/frameworks/opf/htm_prediction_model_classifier_helper.py index ba179d4d46..5a95d4b91b 100644 --- a/src/nupic/frameworks/opf/htmpredictionmodel_classifier_helper.py +++ b/src/nupic/frameworks/opf/htm_prediction_model_classifier_helper.py @@ -59,10 +59,10 @@ class HTMPredictionModelClassifierHelper(object): __VERSION__ = 3 - def __init__(self, htmpredictionmodel, anomalyParams={}): + def __init__(self, htm_prediction_model, anomalyParams={}): if anomalyParams is None: anomalyParams = {} - self.htmpredictionmodel = htmpredictionmodel + self.htm_prediction_model = htm_prediction_model self._version = HTMPredictionModelClassifierHelper.__VERSION__ @@ -97,7 +97,7 @@ def __init__(self, htmpredictionmodel, anomalyParams={}): self._vectorType = anomalyParams['anomalyVectorType'] self._activeColumnCount = \ - self.htmpredictionmodel._getSPRegion().getSelf().getParameter('numActiveColumnsPerInhArea') + self.htm_prediction_model._getSPRegion().getSelf().getParameter('numActiveColumnsPerInhArea') # Storage for last run self._anomalyVectorLength = None @@ -146,7 +146,7 @@ def getLabels(self, start=None, end=None): 'recordLabels': [] } - classifier = self.htmpredictionmodel._getAnomalyClassifier() + classifier = self.htm_prediction_model._getAnomalyClassifier() knn = classifier.getSelf()._knn ROWIDX = numpy.array( @@ -325,7 +325,7 @@ def _addRecordToKNN(self, record): """ This method will add the record to the KNN classifier. """ - classifier = self.htmpredictionmodel._getAnomalyClassifier() + classifier = self.htm_prediction_model._getAnomalyClassifier() knn = classifier.getSelf()._knn prototype_idx = classifier.getSelf().getParameter('categoryRecencyList') @@ -350,7 +350,7 @@ def _deleteRecordsFromKNN(self, recordsToDelete): ------------ recordsToDelete - list of records to delete from the classififier """ - classifier = self.htmpredictionmodel._getAnomalyClassifier() + classifier = self.htm_prediction_model._getAnomalyClassifier() knn = classifier.getSelf()._knn prototype_idx = classifier.getSelf().getParameter('categoryRecencyList') @@ -373,7 +373,7 @@ def _deleteRangeFromKNN(self, start=0, end=None): end - integer representing the ROWID of the end of the deletion range, if None, it will default to end. """ - classifier = self.htmpredictionmodel._getAnomalyClassifier() + classifier = self.htm_prediction_model._getAnomalyClassifier() knn = classifier.getSelf()._knn prototype_idx = numpy.array( @@ -405,7 +405,7 @@ def _recomputeRecordFromKNN(self, record): "categoryProbabilitiesOut":numpy.zeros((1,))} # Run inference only to capture state before learning - classifier = self.htmpredictionmodel._getAnomalyClassifier() + classifier = self.htm_prediction_model._getAnomalyClassifier() knn = classifier.getSelf()._knn # Only use points before record to classify and after the wait period. @@ -439,12 +439,12 @@ def _recomputeRecordFromKNN(self, record): def _constructClassificationRecord(self): """ Construct a _HTMClassificationRecord based on the current state of the - htmpredictionmodel of this classifier. + htm_prediction_model of this classifier. ***This will look into the internals of the model and may depend on the SP, TP, and KNNClassifier*** """ - model = self.htmpredictionmodel + model = self.htm_prediction_model sp = model._getSPRegion() tp = model._getTPRegion() tpImp = tp.getSelf()._tfdr diff --git a/src/nupic/frameworks/opf/jsonschema/opfTaskControlSchema.json b/src/nupic/frameworks/opf/jsonschema/opfTaskControlSchema.json index 59c6f3d1eb..16d20e15ef 100644 --- a/src/nupic/frameworks/opf/jsonschema/opfTaskControlSchema.json +++ b/src/nupic/frameworks/opf/jsonschema/opfTaskControlSchema.json @@ -3,15 +3,15 @@ "type":"object", "additionalProperties":false, "properties":{ - + "iterationCycle":{ - "description":"Iteration cycle description consisting of a sequence of opftaskdriver.IterationPhaseSpecXXXXX elements that are performed in the specified order", + "description":"Iteration cycle description consisting of a sequence of opf_task_driver.IterationPhaseSpecXXXXX elements that are performed in the specified order", "required":true, "type":"array", "minItems":0 }, - - + + "metrics":{ "description": "Sequence of regular expressions specifying which metrics should be logged along with predictions", "required":false, @@ -19,7 +19,7 @@ "uniqueItems":true, "minItems":0 }, - + "loggedMetrics":{ "description": "Sequence of regular expressions specifying which metrics should be logged along with predictions", "required":false, @@ -27,7 +27,7 @@ "uniqueItems":true, "minItems":0 }, - + "callbacks":{ "description":"Callbacks for experimentation/research", "required":false, diff --git a/src/nupic/frameworks/opf/metrics.py b/src/nupic/frameworks/opf/metrics.py index 60115065e1..aaa8181ac9 100644 --- a/src/nupic/frameworks/opf/metrics.py +++ b/src/nupic/frameworks/opf/metrics.py @@ -31,7 +31,7 @@ from nupic.data.fieldmeta import FieldMetaType import nupic.math.roc_utils as roc from nupic.data import SENTINEL_VALUE_FOR_MISSING_DATA -from nupic.frameworks.opf.opfutils import InferenceType +from nupic.frameworks.opf.opf_utils import InferenceType from nupic.utils import MovingAverage from collections import deque @@ -281,7 +281,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): now this is only used by CLA networks result: - An ModelResult class (see opfutils.py) + An ModelResult class (see opf_utils.py) return: The average error as computed over the metric's window size @@ -327,7 +327,7 @@ def accumulate(self, groundTruth, prediction, accumulatedError, historyBuffer, r If historyBuffer = None, it means that no history is being kept. - result: An ModelResult class (see opfutils.py), used for advanced + result: An ModelResult class (see opf_utils.py), used for advanced metric calculation (e.g., MetricNegativeLogLikelihood) retval: @@ -401,13 +401,13 @@ def __init__(self, metricSpec): # Parse the metric's parameters if metricSpec is not None and metricSpec.params is not None: - + self.id = metricSpec.params.get('id', None) self._predictionSteps = metricSpec.params.get('steps', [0]) # Make sure _predictionSteps is a list if not hasattr(self._predictionSteps, '__iter__'): self._predictionSteps = [self._predictionSteps] - + self.verbosity = metricSpec.params.get('verbosity', 0) self._maxRecords = metricSpec.params.get('maxRecords', None) @@ -432,7 +432,7 @@ def __init__(self, metricSpec): def _getShiftedGroundTruth(self, groundTruth): """ Utility function that saves the passed in groundTruth into a local - history buffer, and returns the groundTruth from self._predictionSteps ago, + history buffer, and returns the groundTruth from self._predictionSteps ago, where self._predictionSteps is defined by the 'steps' parameter. This can be called from the beginning of a derived class's addInstance() before it passes groundTruth and prediction onto accumulate(). @@ -673,12 +673,12 @@ class MetricMAPE(AggregateMetric): computes the "Classic" Mean Absolute Percent Error. This computes the percent error for each sample, and then gets - an average. Note that this can suffer from samples where the actual value is - very small or zero - this one sample can drastically alter the mean. To - avoid this potential issue, use 'altMAPE' instead. - + an average. Note that this can suffer from samples where the actual value is + very small or zero - this one sample can drastically alter the mean. To + avoid this potential issue, use 'altMAPE' instead. + This metric is provided mainly as a convenience when comparing results against - other investigations that have also used MAPE. + other investigations that have also used MAPE. """ @@ -702,7 +702,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): print "Ignoring sample with groundTruth of 0" self.steps += 1 return self.aggregateError - + if self.verbosity > 0: print "MetricMAPE:\n groundTruth: %s\n Prediction: " \ "%s\n Error: %s" % (groundTruth, prediction, pctError) @@ -740,22 +740,22 @@ class MetricPassThruPrediction(MetricsIface): This metric class simply takes the prediction and outputs that as the aggregateMetric value. """ - + def __init__(self, metricSpec): self.spec = metricSpec self.window = metricSpec.params.get("window", 1) self.avg = MovingAverage(self.window) - + self.value = None - + def addInstance(self, groundTruth, prediction, record = None, result = None): """Compute and store metric value""" self.value = self.avg(prediction) - + def getMetric(self): """Return the metric value """ return {"value": self.value} - + #def accumulate(self, groundTruth, prediction, accumulatedError, historyBuffer): # # Simply return the prediction as the accumulated error @@ -778,7 +778,7 @@ def __init__(self, metricSpec): metricSpec.params['steps'] = 1 super(MetricMovingMean, self).__init__(metricSpec) - + # Only supports 1 item in _predictionSteps assert (len(self._predictionSteps) == 1) @@ -872,7 +872,7 @@ def pushToEnd(self,obj): return ret def __len__(self): return self.elements - + def __init__(self,metricSpec): self.metricSpec = metricSpec self.steps = 0 @@ -905,28 +905,28 @@ def __init__(self,metricSpec): assert not "customFuncSource" in metricSpec.params assert not "customExpr" in metricSpec.params self.evalError = metricSpec.params["customFuncDef"] - + def getPrediction(self,n): #Get prediction from n steps ago return self.recordStore.getItem(n)["prediction"] - + def getFieldValue(self,n,field): #Get field value from record n steps ago record = self.recordStore.getItem(n)["record"] value = record[field] return value - + def getGroundTruth(self,n): #Get the groundTruth from n steps ago return self.recordStore.getItem(n)["groundTruth"] - + def getBufferLen(self): return len(self.recordStore) - + def storeData(self,name,obj): #Store custom user data self.userDataStore[name] = obj - + def getData(self,name): #Retrieve user data if name in self.userDataStore: @@ -942,7 +942,7 @@ def mostLikely(self, pred): mostLikelyOutcome = None maxProbability = 0 - + for prediction, probability in pred.items(): if probability > maxProbability: mostLikelyOutcome = prediction @@ -951,12 +951,12 @@ def mostLikely(self, pred): return mostLikelyOutcome def expValue(self, pred): - """ Helper function to return a scalar value representing the expected + """ Helper function to return a scalar value representing the expected value of a probability distribution """ if len(pred) == 1: return pred.keys()[0] - + return sum([x*p for x,p in pred.items()]) def evalAbsErr(self,pred,ground): @@ -970,7 +970,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): #If missing data, if groundTruth == SENTINEL_VALUE_FOR_MISSING_DATA or prediction is None: return self.averageError - + self.recordStore.pushToEnd({"groundTruth":groundTruth, "prediction":prediction,"record":record}) @@ -987,7 +987,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): self.error+= error self.averageError = float(self.error)/self.errorStore.elements self.steps+=1 - + return self.averageError @@ -1007,7 +1007,7 @@ def __init__(self, metricSpec): if metricSpec.params.has_key('mode_window'): assert metricSpec.params['mode_window'] >= 1 self.mode_window = metricSpec.params['mode_window'] - + # Only supports one stepsize assert len(self._predictionSteps) == 1 @@ -1096,7 +1096,7 @@ def __init__(self, metricSpec): metricSpec.params['steps'] = 1 super(MetricTwoGram, self).__init__(metricSpec) - + # Only supports 1 stepsize assert len(self._predictionSteps) == 1 @@ -1342,9 +1342,9 @@ class MetricMultiStep(AggregateMetric): Note that the metrics manager has already performed the time shifting for us - it passes us the prediction element from 'steps' steps ago and asks us to compare that to the current ground truth. - + When multiple steps of prediction are requested, we average the results of - the underlying metric for each step. + the underlying metric for each step. """ def __init__(self, metricSpec): @@ -1357,7 +1357,7 @@ def getMetric(self): def addInstance(self, groundTruth, prediction, record = None, result = None): - + # If missing data, if groundTruth == SENTINEL_VALUE_FOR_MISSING_DATA: return self.aggregateError @@ -1367,10 +1367,10 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): try: for step, subErrorMetric in \ zip(self._predictionSteps, self._subErrorMetrics): - + stepPrediction = prediction[step] - # Unless this is a custom_error_metric, when we have a dict of - # probabilities, get the most probable one. For custom error metrics, + # Unless this is a custom_error_metric, when we have a dict of + # probabilities, get the most probable one. For custom error metrics, # we pass the probabilities in so that it can decide how best to deal with # them. if isinstance(stepPrediction, dict) \ @@ -1379,28 +1379,28 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): stepPrediction.iteritems()] predictions.sort() stepPrediction = predictions[-1][1] - + # Get sum of the errors aggErr = subErrorMetric.addInstance(groundTruth, stepPrediction, record, result) if self.verbosity >= 2: print "MetricMultiStep %s: aggErr for stepSize %d: %s" % \ (self._predictionSteps, step, aggErr) - + aggErrSum += aggErr except: pass - + # Return average aggregate error across all step sizes self.aggregateError = aggErrSum / len(self._subErrorMetrics) if self.verbosity >= 2: - print "MetricMultiStep %s: aggErrAvg: %s" % (self._predictionSteps, + print "MetricMultiStep %s: aggErrAvg: %s" % (self._predictionSteps, self.aggregateError) self.steps += 1 if self.verbosity >= 1: print "\nMetricMultiStep %s: \n groundTruth: %s\n Predictions: %s" \ - "\n Metric: %s" % (self._predictionSteps, groundTruth, prediction, + "\n Metric: %s" % (self._predictionSteps, groundTruth, prediction, self.getMetric()) return self.aggregateError @@ -1435,7 +1435,7 @@ def __init__(self, metricSpec): + " specify the name of another base metric via the 'errorMetric' " \ + " parameter." - # Force all subErrorMetric windows to 1. This is necessary because by + # Force all subErrorMetric windows to 1. This is necessary because by # default they each do their own history averaging assuming that their # addInstance() gets called once per interation. But, in this metric # we actually call into each subErrorMetric multiple times per iteration @@ -1457,16 +1457,16 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): if self.verbosity >= 1: print "\nMetricMultiStepProbability %s: \n groundTruth: %s\n " \ - "Predictions: %s" % (self._predictionSteps, groundTruth, + "Predictions: %s" % (self._predictionSteps, groundTruth, prediction) - + # Get the aggregateErrors for all requested step sizes and average them aggErrSum = 0 for step, subErrorMetric in \ zip(self._predictionSteps, self._subErrorMetrics): - + stepPrediction = prediction[step] - + # If it's a dict of probabilities, get the expected value error = 0 if isinstance(stepPrediction, dict): @@ -1478,9 +1478,9 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): else: error += subErrorMetric.addInstance(groundTruth, stepPrediction, record) - + if self.verbosity >= 2: - print ("MetricMultiStepProbability %s: aggErr for stepSize %d: %s" % + print ("MetricMultiStepProbability %s: aggErr for stepSize %d: %s" % (self._predictionSteps, step, error)) aggErrSum += error @@ -1492,10 +1492,10 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): if self.verbosity >= 2: print ("MetricMultiStepProbability %s: aggErr over all steps, this " "iteration (%d): %s" % (self._predictionSteps, self.steps, avgAggErr)) - print ("MetricMultiStepProbability %s: aggErr moving avg: %s" % + print ("MetricMultiStepProbability %s: aggErr moving avg: %s" % (self._predictionSteps, self.aggregateError)) self.steps += 1 - + if self.verbosity >= 1: print "MetricMultiStepProbability %s: \n Error: %s\n Metric: %s" % \ (self._predictionSteps, avgAggErr, self.getMetric()) @@ -1505,7 +1505,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): class MetricMulti(MetricsIface): - """Multi metric can combine multiple other (sub)metrics and + """Multi metric can combine multiple other (sub)metrics and weight them to provide combined score.""" def __init__(self, metricSpec): @@ -1514,12 +1514,12 @@ def __init__(self, metricSpec): "Use MetricMulti(weights,metrics) constructor instead.") def __init__(self, weights, metrics, window=None): - """MetricMulti + """MetricMulti @param weights - [list of floats] used as weights - @param metrics - [list of submetrics] + @param metrics - [list of submetrics] @param window - (opt) window size for moving average, or None when disabled """ - if (weights is None or not isinstance(weights, list) or + if (weights is None or not isinstance(weights, list) or not len(weights) > 0 or not isinstance(weights[0], float)): raise ValueError("MetricMulti requires 'weights' parameter as a [list of floats]") @@ -1555,7 +1555,7 @@ def addInstance(self, groundTruth, prediction, record = None, result = None): def __repr__(self): - return "MetricMulti(weights=%s, metrics=%s)" % (self.weights, self.metrics) + return "MetricMulti(weights=%s, metrics=%s)" % (self.weights, self.metrics) def getMetric(self): diff --git a/src/nupic/frameworks/opf/model.py b/src/nupic/frameworks/opf/model.py index 2a7fca84af..bf6253baaa 100644 --- a/src/nupic/frameworks/opf/model.py +++ b/src/nupic/frameworks/opf/model.py @@ -26,7 +26,7 @@ import shutil from abc import ABCMeta, abstractmethod -import nupic.frameworks.opf.opfutils as opfutils +import nupic.frameworks.opf.opf_utils as opf_utils @@ -41,7 +41,7 @@ class Model(object): def __init__(self, inferenceType): """ Model constructor. - @param inferenceType (nupic.frameworks.opf.opfutils.InferenceType) + @param inferenceType (nupic.frameworks.opf.opf_utils.InferenceType) A value that specifies the type of inference (i.e. TemporalNextStep, Classification, etc.). """ @@ -58,7 +58,7 @@ def run(self, inputRecord): nupic.data.record_stream.RecordStreamIface.getNextRecord() or nupic.data.record_stream.RecordStreamIface.getNextRecordDict() result format. - @returns (nupic.frameworks.opf.opfutils.ModelResult) + @returns (nupic.frameworks.opf.opf_utils.ModelResult) An ModelResult namedtuple. The contents of ModelResult.inferences depends on the the specific inference type of this model, which can be queried by getInferenceType() @@ -68,7 +68,7 @@ def run(self, inputRecord): self._numPredictions += 1 else: predictionNumber = None - result = opfutils.ModelResult(predictionNumber=predictionNumber, + result = opf_utils.ModelResult(predictionNumber=predictionNumber, rawInput=inputRecord) return result @@ -132,7 +132,7 @@ def _getLogger(self): def getInferenceType(self): """ Return the InferenceType of this model. This is immutable. - @returns (nupic.frameworks.opf.opfutils.InferenceType) An inference type + @returns (nupic.frameworks.opf.opf_utils.InferenceType) An inference type """ return self.__inferenceType @@ -319,7 +319,7 @@ def load(cls, savedModelDir): Directory of where the experiment is to be or was saved @returns (Model) The loaded model instance """ - logger = opfutils.initLogger(cls) + logger = opf_utils.initLogger(cls) logger.debug("Loading model from local checkpoint at %r...", savedModelDir) # Load the model diff --git a/src/nupic/frameworks/opf/modelcallbacks.py b/src/nupic/frameworks/opf/model_callbacks.py similarity index 100% rename from src/nupic/frameworks/opf/modelcallbacks.py rename to src/nupic/frameworks/opf/model_callbacks.py diff --git a/src/nupic/frameworks/opf/modelfactory.py b/src/nupic/frameworks/opf/model_factory.py similarity index 94% rename from src/nupic/frameworks/opf/modelfactory.py rename to src/nupic/frameworks/opf/model_factory.py index 6d56cd7501..ddb89c99de 100644 --- a/src/nupic/frameworks/opf/modelfactory.py +++ b/src/nupic/frameworks/opf/model_factory.py @@ -19,17 +19,17 @@ # http://numenta.org/licenses/ # ---------------------------------------------------------------------- -""" @file modelfactory.py +""" @file model_factory.py Model factory. """ import logging -import nupic.frameworks.opf.opfutils as opfutils +import nupic.frameworks.opf.opf_utils as opf_utils # Import models -from htmpredictionmodel import HTMPredictionModel +from htm_prediction_model import HTMPredictionModel from model import Model from two_gram_model import TwoGramModel from previousvaluemodel import PreviousValueModel @@ -49,7 +49,7 @@ def __getLogger(cls): @returns (Logger) A Logger object. """ if cls.__logger is None: - cls.__logger = opfutils.initLogger(cls) + cls.__logger = opf_utils.initLogger(cls) return cls.__logger diff --git a/src/nupic/frameworks/opf/opfbasicenvironment.py b/src/nupic/frameworks/opf/opf_basic_environment.py similarity index 97% rename from src/nupic/frameworks/opf/opfbasicenvironment.py rename to src/nupic/frameworks/opf/opf_basic_environment.py index 8a992669b4..7900be847e 100644 --- a/src/nupic/frameworks/opf/opfbasicenvironment.py +++ b/src/nupic/frameworks/opf/opf_basic_environment.py @@ -20,7 +20,7 @@ # ---------------------------------------------------------------------- """ -This script provides a file-based implementation of the opfenvironment +This script provides a file-based implementation of the opf_environment interfaces (OPF). This "basic" implementation of the interface (need a better name @@ -29,7 +29,7 @@ This implementation is used by research tools, such as run_opf_experiment. -The opfenvironment interfaces encapsulate external specifics, such as +The opf_environment interfaces encapsulate external specifics, such as data source (e.g., .csv file or database, etc.), prediction sink (.csv file or databse, etc.), report and serialization destination, etc. """ @@ -44,15 +44,15 @@ import shutil import StringIO -import opfutils -import opfenvironment as opfenv +import opf_utils +import opf_environment as opfenv from nupic.data.file_record_stream import FileRecordStream from nupic.data.stream_reader import StreamReader from nupic.data.fieldmeta import (FieldMetaInfo, FieldMetaType, FieldMetaSpecial) from nupic.data.inference_shifter import InferenceShifter -from opfutils import InferenceType, InferenceElement +from opf_utils import InferenceType, InferenceElement @@ -322,7 +322,7 @@ def __init__(self, experimentDir, label, inferenceType, inferenceType: - An constant from opfutils.InferenceType for the + An constant from opf_utils.InferenceType for the requested prediction writer fields: a non-empty sequence of nupic.data.fieldmeta.FieldMetaInfo @@ -342,7 +342,7 @@ def __init__(self, experimentDir, label, inferenceType, self.__experimentDir = experimentDir - # opfutils.InferenceType kind value + # opf_utils.InferenceType kind value self.__inferenceType = inferenceType # A tuple of nupic.data.fieldmeta.FieldMetaInfo @@ -436,7 +436,7 @@ def __openDatafile(self, modelResult): # Consctruct the prediction dataset file path filename = (self.__label + "." + - opfutils.InferenceType.getLabel(self.__inferenceType) + + opf_utils.InferenceType.getLabel(self.__inferenceType) + ".predictionLog.csv") self.__datasetPath = os.path.join(inferenceDir, filename) @@ -564,7 +564,7 @@ def append(self, modelResult): """ [virtual method override] Emits a single prediction as input versus predicted. - modelResult: An opfutils.ModelResult object that contains the model input + modelResult: An opf_utils.ModelResult object that contains the model input and output for the current timestep. """ @@ -741,7 +741,7 @@ def close(self): def update(self, modelResult): """ Emit a input/prediction pair, if possible. - modelResult: An opfutils.ModelResult object that contains the model input + modelResult: An opf_utils.ModelResult object that contains the model input and output for the current timestep. """ self.__writer.append(modelResult) @@ -783,7 +783,7 @@ def update(self, modelResult): FIFO and would not be able to emit a meaningful input/prediction pair. - modelResult: An opfutils.ModelResult object that contains the model input + modelResult: An opf_utils.ModelResult object that contains the model input and output for the current timestep. """ self.__writer.append(self.__inferenceShifter.shift(modelResult)) @@ -860,7 +860,7 @@ def writeRecord(self, modelResult): """ Emits a set of inputs data, inferences, and metrics from a model resulting from a single record. - modelResult: An opfutils.ModelResult object that contains the model input + modelResult: An opf_utils.ModelResult object that contains the model input and output for the current timestep. """ @@ -871,7 +871,7 @@ def writeRecord(self, modelResult): def writeRecords(self, modelResults, progressCB=None): """ Same as writeRecord above, but emits multiple rows in one shot. - modelResults: a list of opfutils.ModelResult objects, Each dictionary + modelResults: a list of opf_utils.ModelResult objects, Each dictionary represents one record. progressCB: an optional callback method that will be called after each diff --git a/src/nupic/frameworks/opf/opfenvironment.py b/src/nupic/frameworks/opf/opf_environment.py similarity index 96% rename from src/nupic/frameworks/opf/opfenvironment.py rename to src/nupic/frameworks/opf/opf_environment.py index 8f35ea3fd0..e3ff1f6540 100644 --- a/src/nupic/frameworks/opf/opfenvironment.py +++ b/src/nupic/frameworks/opf/opf_environment.py @@ -51,7 +51,7 @@ def writeRecord(self, modelResult): """ Emits a set of inputs data, inferences, and metrics from a model resulting from a single record. - modelResult: An opfutils.ModelResult object that contains the model input + modelResult: An opf_utils.ModelResult object that contains the model input and output for the current timestep. """ @@ -60,7 +60,7 @@ def writeRecord(self, modelResult): def writeRecords(self, modelResults, progressCB=None): """ Same as writeRecord above, but emits multiple rows in one shot. - modelResults: a list of opfutils.ModelResult objects, Each dictionary + modelResults: a list of opf_utils.ModelResult objects, Each dictionary represents one record. progressCB: an optional callback method that will be called after each batch of records is written. diff --git a/src/nupic/frameworks/opf/opfhelpers.py b/src/nupic/frameworks/opf/opf_helpers.py similarity index 91% rename from src/nupic/frameworks/opf/opfhelpers.py rename to src/nupic/frameworks/opf/opf_helpers.py index 45879c6956..2cb644a5d7 100644 --- a/src/nupic/frameworks/opf/opfhelpers.py +++ b/src/nupic/frameworks/opf/opf_helpers.py @@ -21,7 +21,7 @@ # This file contains utility functions that are may be imported # by clients of the framework. Functions that are used only by -# the prediction framework should be in opfutils.py +# the prediction framework should be in opf_utils.py # # TODO: Rename as helpers.py once we're ready to replace the legacy # helpers.py @@ -29,7 +29,7 @@ import imp import os -import expdescriptionapi +import exp_description_api def loadExperiment(path): @@ -65,11 +65,11 @@ def getExperimentDescriptionInterfaceFromModule(module): """ module: imported description.py module - Returns: An expdescriptionapi.DescriptionIface-based instance that + Returns: An exp_description_api.DescriptionIface-based instance that represents the experiment description """ result = module.descriptionInterface - assert isinstance(result, expdescriptionapi.DescriptionIface), \ + assert isinstance(result, exp_description_api.DescriptionIface), \ "expected DescriptionIface-based instance, but got %s" % type(result) return result @@ -96,7 +96,7 @@ def _loadDescriptionFile(descriptionPyPath): raise RuntimeError("Experiment description file %s does not define %s" % \ (descriptionPyPath, "descriptionInterface")) - if not isinstance(mod.descriptionInterface, expdescriptionapi.DescriptionIface): + if not isinstance(mod.descriptionInterface, exp_description_api.DescriptionIface): raise RuntimeError(("Experiment description file %s defines %s but it " + \ "is not DescriptionIface-based") % \ (descriptionPyPath, name)) diff --git a/src/nupic/frameworks/opf/opftaskdriver.py b/src/nupic/frameworks/opf/opf_task_driver.py similarity index 99% rename from src/nupic/frameworks/opf/opftaskdriver.py rename to src/nupic/frameworks/opf/opf_task_driver.py index 44d2b6e72b..e9c19dfb98 100644 --- a/src/nupic/frameworks/opf/opftaskdriver.py +++ b/src/nupic/frameworks/opf/opf_task_driver.py @@ -297,7 +297,7 @@ def handleInputRecord(self, inputRecord): inputRecord: record object formatted according to nupic.data.FileSource.getNext() result format. - Returns: An opfutils.ModelResult object + Returns: An opf_utils.ModelResult object """ assert inputRecord, "Invalid inputRecord: %r" % inputRecord @@ -377,7 +377,7 @@ def handleInputRecord(self, inputRecord): inputRecord: record object formatted according to nupic.data.FileSource.getNext() result format. - Returns: An opfutils.ModelResult object with the inputs and inferences + Returns: An opf_utils.ModelResult object with the inputs and inferences after the current record is processed by the model """ diff --git a/src/nupic/frameworks/opf/opfutils.py b/src/nupic/frameworks/opf/opf_utils.py similarity index 100% rename from src/nupic/frameworks/opf/opfutils.py rename to src/nupic/frameworks/opf/opf_utils.py diff --git a/src/nupic/frameworks/opf/predictionmetricsmanager.py b/src/nupic/frameworks/opf/predictionmetricsmanager.py index 14dbeb0c0b..580991b8c3 100644 --- a/src/nupic/frameworks/opf/predictionmetricsmanager.py +++ b/src/nupic/frameworks/opf/predictionmetricsmanager.py @@ -31,7 +31,7 @@ from nupic.data.inference_shifter import InferenceShifter from nupic.frameworks.opf import metrics -from opfutils import InferenceType, InferenceElement +from opf_utils import InferenceType, InferenceElement @@ -64,7 +64,7 @@ def __init__(self, metricSpecs, fieldInfo, inferenceType): metricSpecs: A sequence of MetricSpecs that specify which metrics should be calculated - inferenceType: An opfutils.inferenceType value that specifies the inference + inferenceType: An opf_utils.inferenceType value that specifies the inference type of the associated model. This affects how metrics are calculated. FOR EXAMPLE, temporal models save the inference from the previous timestep to match it to the ground truth @@ -96,7 +96,7 @@ def update(self, results): Parameters: ----------------------------------------------------------------------- - results: An opfutils.ModelResult object that was computed during the last + results: An opf_utils.ModelResult object that was computed during the last iteration of the model Returns: A dictionary where each key is the metric-name, and the values are @@ -107,7 +107,7 @@ def update(self, results): #print "\n\n---------------------------------------------------------------" #print "Model results: \nrawInput:%s \ninferences:%s" % \ # (pprint.pformat(results.rawInput), pprint.pformat(results.inferences)) - + self._addResults(results) if not self.__metricSpecs \ @@ -310,7 +310,7 @@ def _testMetricsMgr(): FieldMetaSpecial) from nupic.frameworks.opf.metrics import MetricSpec - from nupic.frameworks.opf.opfutils import ModelResult, SensorInput + from nupic.frameworks.opf.opf_utils import ModelResult, SensorInput onlineMetrics = (MetricSpec(metric="aae", inferenceElement='', \ field="consumption", params={}),) @@ -415,7 +415,7 @@ def _testTemporalShift(): FieldMetaSpecial) from nupic.frameworks.opf.metrics import MetricSpec - from nupic.frameworks.opf.opfutils import ModelResult, SensorInput + from nupic.frameworks.opf.opf_utils import ModelResult, SensorInput onlineMetrics = () modelFieldMetaInfo = ( diff --git a/src/nupic/frameworks/opf/previousvaluemodel.py b/src/nupic/frameworks/opf/previousvaluemodel.py index e47517ba37..9bcc027c41 100644 --- a/src/nupic/frameworks/opf/previousvaluemodel.py +++ b/src/nupic/frameworks/opf/previousvaluemodel.py @@ -25,8 +25,8 @@ from nupic.data import fieldmeta from nupic.frameworks.opf import model -from nupic.frameworks.opf import opfutils -from opfutils import InferenceType +from nupic.frameworks.opf import opf_utils +from opf_utils import InferenceType class PreviousValueModel(model.Model): @@ -39,7 +39,7 @@ def __init__(self, inferenceType=InferenceType.TemporalNextStep, predictionSteps=[]): """ PVM constructor. - inferenceType: An opfutils.InferenceType value that specifies what type of + inferenceType: An opf_utils.InferenceType value that specifies what type of inference (i.e. TemporalNextStep, TemporalMultiStep, etc.) fieldNames: a list of field names fieldTypes: a list of the types for the fields mentioned in fieldNames @@ -49,7 +49,7 @@ def __init__(self, inferenceType=InferenceType.TemporalNextStep, """ super(PreviousValueModel, self).__init__(inferenceType) - self._logger = opfutils.initLogger(self) + self._logger = opf_utils.initLogger(self) self._predictedField = predictedField self._fieldNames = fieldNames self._fieldTypes = fieldTypes @@ -70,30 +70,30 @@ def run(self, inputRecord): nupic.data.FileSource.getNext() result format. Returns: - A ModelResult named tuple (see opfutils.py). The contents of + A ModelResult named tuple (see opf_utils.py). The contents of ModelResult.inferences depends on the specific inference type of this model, which can be queried by getInferenceType(). TODO: Implement getInferenceType()? """ # set the results. note that there is no translation to sensorInput results = super(PreviousValueModel, self).run(inputRecord) - results.sensorInput = opfutils.SensorInput(dataRow= \ + results.sensorInput = opf_utils.SensorInput(dataRow= \ [inputRecord[fn] for fn in self._fieldNames]) - + # select the current value for the prediction with probablity of 1 - results.inferences = { opfutils.InferenceElement.multiStepBestPredictions : \ + results.inferences = {opf_utils.InferenceElement.multiStepBestPredictions : \ dict((steps, inputRecord[self._predictedField]) \ for steps in self._predictionSteps), - opfutils.InferenceElement.multiStepPredictions : \ + opf_utils.InferenceElement.multiStepPredictions : \ dict((steps, {inputRecord[self._predictedField] : 1}) \ for steps in self._predictionSteps) - } + } # set the next step prediction if step of 1 is selected if 1 in self._predictionSteps: - results.inferences[opfutils.InferenceElement.prediction] = \ + results.inferences[opf_utils.InferenceElement.prediction] = \ inputRecord[self._predictedField] - + return results def finishLearning(self): @@ -106,8 +106,8 @@ def finishLearning(self): def setFieldStatistics(self,fieldStats): """ - This method is used for the data source to communicate to the - model any statistics that it knows about the fields + This method is used for the data source to communicate to the + model any statistics that it knows about the fields Since the PVM has no use for this information, this is a no-op """ pass @@ -157,4 +157,4 @@ def __getstate__(self): return self.__dict__ def __setstate__(self): - self._logger = opfutils.initLogger(self) + self._logger = opf_utils.initLogger(self) diff --git a/src/nupic/frameworks/opf/two_gram_model.py b/src/nupic/frameworks/opf/two_gram_model.py index 2535416b80..d71f82eab8 100644 --- a/src/nupic/frameworks/opf/two_gram_model.py +++ b/src/nupic/frameworks/opf/two_gram_model.py @@ -27,8 +27,8 @@ from nupic import encoders from nupic.data import fieldmeta from nupic.frameworks.opf import model -from nupic.frameworks.opf import opfutils -from opfutils import InferenceType +from nupic.frameworks.opf import opf_utils +from opf_utils import InferenceType class TwoGramModel(model.Model): @@ -38,13 +38,13 @@ def __init__(self, inferenceType=InferenceType.TemporalNextStep, encoderParams=()): """ Two-gram model constructor. - inferenceType: An opfutils.InferenceType value that specifies what type of + inferenceType: An opf_utils.InferenceType value that specifies what type of inference (i.e. TemporalNextStep, Classification, etc.) encoders: Sequence of encoder params dictionaries. """ super(TwoGramModel, self).__init__(inferenceType) - self._logger = opfutils.initLogger(self) + self._logger = opf_utils.initLogger(self) self._reset = False self._hashToValueDict = dict() self._learningEnabled = True @@ -61,7 +61,7 @@ def run(self, inputRecord): nupic.data.FileSource.getNext() result format. Returns: - A ModelResult named tuple (see opfutils.py). The contents of + A ModelResult named tuple (see opf_utils.py). The contents of ModelResult.inferences depends on the specific inference type of this model, which can be queried by getInferenceType(). TODO: Implement getInferenceType()? @@ -74,7 +74,7 @@ def run(self, inputRecord): inputFieldEncodings = self._encoder.encodeEachField(inputRecord) inputBuckets = self._encoder.getBucketIndices(inputRecord) - results.sensorInput = opfutils.SensorInput( + results.sensorInput = opf_utils.SensorInput( dataRow=values, dataEncodings=inputFieldEncodings, sequenceReset=int(self._reset)) @@ -110,8 +110,8 @@ def run(self, inputRecord): encodedPredictions.append(self._encoder.encodeField(fieldName, default)) results.inferences = dict() - results.inferences[opfutils.InferenceElement.prediction] = predictions - results.inferences[opfutils.InferenceElement.encodings] = encodedPredictions + results.inferences[opf_utils.InferenceElement.prediction] = predictions + results.inferences[opf_utils.InferenceElement.encodings] = encodedPredictions self._prevValues = inputBuckets self._reset = False @@ -129,8 +129,8 @@ def finishLearning(self): def setFieldStatistics(self,fieldStats): """ - This method is used for the data source to communicate to the - model any statistics that it knows about the fields + This method is used for the data source to communicate to the + model any statistics that it knows about the fields Since the two-gram has no use for this information, this is a no-op """ pass @@ -182,4 +182,4 @@ def __getstate__(self): return self.__dict__ def __setstate__(self): - self._logger = opfutils.initLogger(self) + self._logger = opf_utils.initLogger(self) diff --git a/src/nupic/frameworks/viz/examples/Demo.ipynb b/src/nupic/frameworks/viz/examples/Demo.ipynb index e52c513c28..f5e422db5a 100644 --- a/src/nupic/frameworks/viz/examples/Demo.ipynb +++ b/src/nupic/frameworks/viz/examples/Demo.ipynb @@ -159,7 +159,7 @@ }, "outputs": [], "source": [ - "from nupic.frameworks.opf.modelfactory import ModelFactory\n", + "from nupic.frameworks.opf.model_factory import ModelFactory\n", "\n", "# Note: parameters copied from examples/opf/clients/hotgym/simple/model_params.py\n", "model = ModelFactory.create({'aggregationInfo': {'hours': 1, 'microseconds': 0, 'seconds': 0, 'fields': [('consumption', 'sum')], 'weeks': 0, 'months': 0, 'minutes': 0, 'days': 0, 'milliseconds': 0, 'years': 0}, 'model': 'HTMPrediction', 'version': 1, 'predictAheadTime': None, 'modelParams': {'sensorParams': {'verbosity': 0, 'encoders': {'timestamp_timeOfDay': {'type': 'DateEncoder', 'timeOfDay': (21, 1), 'fieldname': u'timestamp', 'name': u'timestamp_timeOfDay'}, u'consumption': {'resolution': 0.88, 'seed': 1, 'fieldname': u'consumption', 'name': u'consumption', 'type': 'RandomDistributedScalarEncoder'}, 'timestamp_weekend': {'type': 'DateEncoder', 'fieldname': u'timestamp', 'name': u'timestamp_weekend', 'weekend': 21}}, 'sensorAutoReset': None}, 'spParams': {'columnCount': 2048, 'spVerbosity': 0, 'spatialImp': 'cpp', 'synPermConnected': 0.1, 'seed': 1956, 'numActiveColumnsPerInhArea': 40, 'globalInhibition': 1, 'inputWidth': 0, 'synPermInactiveDec': 0.005, 'synPermActiveInc': 0.04, 'potentialPct': 0.85, 'boostStrength': 3.0}, 'spEnable': True, 'clParams': {'implementation': 'cpp', 'alpha': 0.1, 'verbosity': 0, 'steps': '1,5', 'regionName': 'SDRClassifierRegion'}, 'inferenceType': 'TemporalMultiStep', 'tmEnable': True, 'tmParams': {'columnCount': 2048, 'activationThreshold': 16, 'pamLength': 1, 'cellsPerColumn': 32, 'permanenceInc': 0.1, 'minThreshold': 12, 'verbosity': 0, 'maxSynapsesPerSegment': 32, 'outputType': 'normal', 'initialPerm': 0.21, 'globalDecay': 0.0, 'maxAge': 0, 'permanenceDec': 0.1, 'seed': 1960, 'newSynapseCount': 20, 'maxSegmentsPerCell': 128, 'temporalImp': 'cpp', 'inputWidth': 2048}, 'trainSPNetOnlyIfRequested': False}})" @@ -231,4 +231,4 @@ }, "nbformat": 4, "nbformat_minor": 0 -} \ No newline at end of file +} diff --git a/src/nupic/regions/CLAClassifierRegion.py b/src/nupic/regions/CLAClassifierRegion.py index b42e3129ae..f5dbd6556a 100755 --- a/src/nupic/regions/CLAClassifierRegion.py +++ b/src/nupic/regions/CLAClassifierRegion.py @@ -244,7 +244,7 @@ def __init__(self, # prevent backward compatibilities issues with the customCompute() method # being called at the same time as the compute() method. Only compute() # should be called via network.run(). This flag will be removed once we - # get to cleaning up the htmpredictionmodel.py file. + # get to cleaning up the htm_prediction_model.py file. self._computeFlag = False diff --git a/src/nupic/regions/KNNAnomalyClassifierRegion.py b/src/nupic/regions/KNNAnomalyClassifierRegion.py index 02e379f620..d921476d7b 100644 --- a/src/nupic/regions/KNNAnomalyClassifierRegion.py +++ b/src/nupic/regions/KNNAnomalyClassifierRegion.py @@ -38,13 +38,13 @@ class KNNAnomalyClassifierRegion(PyRegion): """ - KNNAnomalyClassifierRegion wraps the KNNClassifierRegion to classify htmpredictionmodel + KNNAnomalyClassifierRegion wraps the KNNClassifierRegion to classify htm_prediction_model state. It allows for individual records to be classified as anomalies and supports anomaly detection even after the model has learned the anomalous sequence. Methods: - compute() - called by htmpredictionmodel during record processing + compute() - called by htm_prediction_model during record processing getLabels() - return points with classification records addLabel() - add a set label to a given set of points removeLabels() - remove labels from a given set of points diff --git a/src/nupic/regions/SDRClassifierRegion.py b/src/nupic/regions/SDRClassifierRegion.py index 61a4e8a8dd..ce2c531c2b 100755 --- a/src/nupic/regions/SDRClassifierRegion.py +++ b/src/nupic/regions/SDRClassifierRegion.py @@ -260,7 +260,7 @@ def __init__(self, # prevent backward compatibilities issues with the customCompute() method # being called at the same time as the compute() method. Only compute() # should be called via network.run(). This flag will be removed once we - # get to cleaning up the htmpredictionmodel.py file. + # get to cleaning up the htm_prediction_model.py file. self._computeFlag = False diff --git a/src/nupic/simple_server.py b/src/nupic/simple_server.py index 25bb00c464..2ecd2cea11 100755 --- a/src/nupic/simple_server.py +++ b/src/nupic/simple_server.py @@ -38,7 +38,7 @@ import json import web -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory diff --git a/src/nupic/swarming/DummyModelRunner.py b/src/nupic/swarming/DummyModelRunner.py index 39e573ec1a..f1231a9b46 100644 --- a/src/nupic/swarming/DummyModelRunner.py +++ b/src/nupic/swarming/DummyModelRunner.py @@ -28,9 +28,9 @@ import sys import time -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf import opfhelpers -from nupic.frameworks.opf.opfutils import ModelResult +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf import opf_helpers +from nupic.frameworks.opf.opf_utils import ModelResult from nupic.swarming import utils from nupic.swarming.ModelRunner import OPFModelRunner @@ -183,7 +183,7 @@ def __init__(self, endIdx'. When present, if we are running the firstIdx'th model up to but not including the endIdx'th model, then do a delay of 10 sec. - while running the model. This causes the + while running the model. This causes the worker to run slower and for some other worker to think the model should be orphaned. @@ -448,7 +448,7 @@ def run(self): (beg,end) = self._delayModelRange if self._modelID in modelIDs[int(beg):int(end)]: time.sleep(10) - + # DEBUG!!!! infinite wait if we have 50 models #if len(modelIDs) >= 50: # jobCancel = self._jobsDAO.jobGetFields(self._jobID, ['cancel'])[0] @@ -560,9 +560,9 @@ def __computeWaitTime(self): def __createModel(self, expDir): # ----------------------------------------------------------------------- # Load the experiment's description.py module - descriptionPyModule = opfhelpers.loadExperimentDescriptionScriptFromDir( + descriptionPyModule = opf_helpers.loadExperimentDescriptionScriptFromDir( expDir) - expIface = opfhelpers.getExperimentDescriptionInterfaceFromModule( + expIface = opf_helpers.getExperimentDescriptionInterfaceFromModule( descriptionPyModule) diff --git a/src/nupic/swarming/HypersearchV2.py b/src/nupic/swarming/HypersearchV2.py index 69ce58bd65..98ef8c73d8 100644 --- a/src/nupic/swarming/HypersearchV2.py +++ b/src/nupic/swarming/HypersearchV2.py @@ -38,7 +38,7 @@ from nupic.swarming.hypersearch.SwarmTerminator import SwarmTerminator from nupic.swarming.hypersearch.HsState import HsState, HsSearchType -from nupic.frameworks.opf import opfhelpers +from nupic.frameworks.opf import opf_helpers from nupic.swarming.experimentutils import InferenceType from nupic.swarming.utils import sortedJSONDumpS, rApply, rCopy from nupic.swarming.utils import clippedObj @@ -1018,7 +1018,7 @@ def __init__(self, searchParams, workerID=None, cjDAO=None, jobID=None, self._baseDescriptionHash = hashlib.md5(self._baseDescription).digest() # Read the model config to figure out the inference type - modelDescription, _ = opfhelpers.loadExperiment(self._basePath) + modelDescription, _ = opf_helpers.loadExperiment(self._basePath) # Read info from permutations file. This sets up the following member # variables: diff --git a/src/nupic/swarming/ModelRunner.py b/src/nupic/swarming/ModelRunner.py index 457aaf5774..ce660151c4 100644 --- a/src/nupic/swarming/ModelRunner.py +++ b/src/nupic/swarming/ModelRunner.py @@ -34,10 +34,10 @@ from nupic.swarming.hypersearch.errorcodes import ErrorCodes from nupic.database.ClientJobsDAO import ClientJobsDAO -from nupic.frameworks.opf import opfhelpers -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf.opfbasicenvironment import BasicPredictionLogger -from nupic.frameworks.opf.opfutils import matchPatterns +from nupic.frameworks.opf import opf_helpers +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf.opf_basic_environment import BasicPredictionLogger +from nupic.frameworks.opf.opf_utils import matchPatterns from nupic.frameworks.opf.periodic import (PeriodicActivityMgr, PeriodicActivityRequest) from nupic.frameworks.opf.predictionmetricsmanager import MetricsManager @@ -94,7 +94,7 @@ def __init__(self, modelCheckpointGUID: A persistent, globally-unique identifier for constructing the model checkpoint key. If None, then - don't bother creating a model checkpoint. + don't bother creating a model checkpoint. logLevel: override logging level to this value, if not None predictionCacheMaxRecords: Maximum number of records for the prediction output cache. @@ -217,9 +217,9 @@ def run(self): """ # ----------------------------------------------------------------------- # Load the experiment's description.py module - descriptionPyModule = opfhelpers.loadExperimentDescriptionScriptFromDir( + descriptionPyModule = opf_helpers.loadExperimentDescriptionScriptFromDir( self._experimentDir) - expIface = opfhelpers.getExperimentDescriptionInterfaceFromModule( + expIface = opf_helpers.getExperimentDescriptionInterfaceFromModule( descriptionPyModule) expIface.normalizeStreamSources() @@ -766,7 +766,7 @@ def _writePrediction(self, result): Parameters: ----------------------------------------------------------------------- - result: A opfutils.ModelResult object, which contains the input and + result: A opf_utils.ModelResult object, which contains the input and output for this iteration """ self.__predictionCache.append(result) diff --git a/src/nupic/swarming/api.py b/src/nupic/swarming/api.py index 3604859646..40451fccc2 100644 --- a/src/nupic/swarming/api.py +++ b/src/nupic/swarming/api.py @@ -26,7 +26,7 @@ import shutil import tempfile -from nupic.frameworks.opf import opfhelpers +from nupic.frameworks.opf import opf_helpers from nupic.database.ClientJobsDAO import ClientJobsDAO from nupic.support.configuration import Configuration @@ -72,44 +72,44 @@ def createAndStartSwarm(client, clientInfo="", clientKey="", params="", def getSwarmModelParams(modelID): """Retrieve the Engine-level model params from a Swarm model - + Args: modelID - Engine-level model ID of the Swarm model - + Returns: JSON-encoded string containing Model Params """ - - # TODO: the use of opfhelpers.loadExperimentDescriptionScriptFromDir when + + # TODO: the use of opf_helpers.loadExperimentDescriptionScriptFromDir when # retrieving module params results in a leakage of pf_base_descriptionNN and # pf_descriptionNN module imports for every call to getSwarmModelParams, so # the leakage is unlimited when getSwarmModelParams is called by a - # long-running process. An alternate solution is to execute the guts of + # long-running process. An alternate solution is to execute the guts of # this function's logic in a seprate process (via multiprocessing module). - + cjDAO = ClientJobsDAO.get() - + (jobID, description) = cjDAO.modelsGetFields( modelID, ["jobId", "genDescription"]) - + (baseDescription,) = cjDAO.jobGetFields(jobID, ["genBaseDescription"]) - + # Construct a directory with base.py and description.py for loading model - # params, and use opfhelpers to extract model params from those files + # params, and use opf_helpers to extract model params from those files descriptionDirectory = tempfile.mkdtemp() try: baseDescriptionFilePath = os.path.join(descriptionDirectory, "base.py") with open(baseDescriptionFilePath, mode="wb") as f: f.write(baseDescription) - + descriptionFilePath = os.path.join(descriptionDirectory, "description.py") with open(descriptionFilePath, mode="wb") as f: f.write(description) - - expIface = opfhelpers.getExperimentDescriptionInterfaceFromModule( - opfhelpers.loadExperimentDescriptionScriptFromDir(descriptionDirectory)) - + + expIface = opf_helpers.getExperimentDescriptionInterfaceFromModule( + opf_helpers.loadExperimentDescriptionScriptFromDir(descriptionDirectory)) + return json.dumps( dict( modelConfig=expIface.getModelDescription(), diff --git a/src/nupic/swarming/exp_generator/claDescriptionTemplate.tpl b/src/nupic/swarming/exp_generator/claDescriptionTemplate.tpl index 2e02420166..388a062bdd 100644 --- a/src/nupic/swarming/exp_generator/claDescriptionTemplate.tpl +++ b/src/nupic/swarming/exp_generator/claDescriptionTemplate.tpl @@ -27,19 +27,19 @@ This description.py file was generated by: $EXP_GENERATOR_PROGRAM_PATH """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer ) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec from nupic.swarming.experimentutils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/src/nupic/swarming/exp_generator/descriptionTemplate.tpl b/src/nupic/swarming/exp_generator/descriptionTemplate.tpl index 3eeffdd294..8ddeb27d61 100644 --- a/src/nupic/swarming/exp_generator/descriptionTemplate.tpl +++ b/src/nupic/swarming/exp_generator/descriptionTemplate.tpl @@ -27,19 +27,19 @@ This description.py file was generated by: $EXP_GENERATOR_PROGRAM_PATH """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec from nupic.swarming.experimentutils import (InferenceType, InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/src/nupic/swarming/exp_generator/opfExperimentTemplate.tpl b/src/nupic/swarming/exp_generator/opfExperimentTemplate.tpl index 337d1000b8..c4daf108bc 100644 --- a/src/nupic/swarming/exp_generator/opfExperimentTemplate.tpl +++ b/src/nupic/swarming/exp_generator/opfExperimentTemplate.tpl @@ -35,7 +35,7 @@ control = { # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/src/nupic/swarming/utils.py b/src/nupic/swarming/utils.py index e213447526..6ac69c80e3 100644 --- a/src/nupic/swarming/utils.py +++ b/src/nupic/swarming/utils.py @@ -97,7 +97,7 @@ def _paramsFileHead(): ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/expgenerator_test.py b/tests/integration/nupic/opf/expgenerator_test.py index 869a862ce4..df20f82aa0 100755 --- a/tests/integration/nupic/opf/expgenerator_test.py +++ b/tests/integration/nupic/opf/expgenerator_test.py @@ -41,10 +41,10 @@ from nupic.swarming import HypersearchWorker from nupic.swarming.permutationhelpers import PermuteChoices from nupic.swarming.utils import generatePersistentJobGUID, rCopy -from nupic.frameworks.opf.expdescriptionapi import OpfEnvironment +from nupic.frameworks.opf.exp_description_api import OpfEnvironment from nupic.swarming.exp_generator import ExpGenerator -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) LOGGER = logging.getLogger(__name__) HOTGYM_INPUT = "extra/hotgym/hotgym.csv" diff --git a/tests/integration/nupic/opf/opf_checkpoint_stress_test.py b/tests/integration/nupic/opf/opf_checkpoint_stress_test.py index d03d5d2c44..09ef22102b 100755 --- a/tests/integration/nupic/opf/opf_checkpoint_stress_test.py +++ b/tests/integration/nupic/opf/opf_checkpoint_stress_test.py @@ -32,7 +32,7 @@ import tempfile import unittest2 as unittest -from nupic.frameworks.opf.modelfactory import ModelFactory +from nupic.frameworks.opf.model_factory import ModelFactory from nupic.support.unittesthelpers.testcasebase import TestCaseBase # Model parameters derived from the Hotgym anomaly example. This example was diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/description.py index c35d812b84..27546385df 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/savedmodels_2012-10-05/DefaultTask.nta/model.pkl b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/savedmodels_2012-10-05/DefaultTask.nta/model.pkl index a5a11d1c0e..a3efd06fcf 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/savedmodels_2012-10-05/DefaultTask.nta/model.pkl +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/a/savedmodels_2012-10-05/DefaultTask.nta/model.pkl @@ -1,7 +1,7 @@ ccopy_reg _reconstructor p1 -(cnupic.frameworks.opf.htmpredictionmodel +(cnupic.frameworks.opf.htm_prediction_model HTMPredictionModel p2 c__builtin__ @@ -43,7 +43,7 @@ p19 ssS'_netInfo' p20 g1 -(cnupic.frameworks.opf.htmpredictionmodel +(cnupic.frameworks.opf.htm_prediction_model NetworkInfo p21 g3 diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/base.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/base.py index 2f1b7fae4b..345986fcd0 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/base.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/backwards_compatibility/base.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a/description.py index 4bad28dcfa..7682d46230 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a_plus_b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a_plus_b/description.py index 2e30d05d8a..7bb205df26 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a_plus_b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/a_plus_b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/b/description.py index 17b1f19cc4..930be4940b 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/base.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/base.py index 55722782a0..860459f855 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/base.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/non_temporal_multi_step/base.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a/description.py index 4bad28dcfa..7682d46230 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a_plus_b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a_plus_b/description.py index 2e30d05d8a..7bb205df26 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a_plus_b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/a_plus_b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/b/description.py index 17b1f19cc4..930be4940b 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/base.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/base.py index 7c500e675e..510618272d 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/base.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_anomaly/base.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a/description.py index 4bad28dcfa..7682d46230 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a_plus_b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a_plus_b/description.py index 2e30d05d8a..7bb205df26 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a_plus_b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/a_plus_b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/b/description.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/b/description.py index ed1779d810..e9302014b9 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/b/description.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/b/description.py @@ -29,7 +29,7 @@ ############################################################################### -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config ={ diff --git a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/base.py b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/base.py index 2f1b7fae4b..345986fcd0 100644 --- a/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/base.py +++ b/tests/integration/nupic/opf/opf_checkpoint_test/experiments/temporal_multi_step/base.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/base.py b/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/base.py index 5df7244ca2..059fba27d5 100644 --- a/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/base.py +++ b/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/base.py @@ -24,20 +24,20 @@ description.py file by replacing $XXXXXXXX tokens with desired values. """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) @@ -373,7 +373,7 @@ # Task Control parameters for OPFTaskDriver (per opfTaskControlSchema.json) 'taskControl' : { - # Iteration cycle list consisting of opftaskdriver.IterationPhaseSpecXXXXX + # Iteration cycle list consisting of opf_task_driver.IterationPhaseSpecXXXXX # instances. 'iterationCycle' : [ #IterationPhaseSpecLearnOnly(1000), diff --git a/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/description.py b/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/description.py index e56e198d45..d5629423af 100644 --- a/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/description.py +++ b/tests/integration/nupic/opf/opf_description_template_test/experiments/gym/description.py @@ -22,7 +22,7 @@ """This file defines parameters for a prediction experiment.""" import os -from nupic.frameworks.opf.expdescriptionhelpers import importBaseDescription +from nupic.frameworks.opf.exp_description_helpers import importBaseDescription # the sub-experiment configuration config = \ diff --git a/tests/integration/nupic/opf/opf_description_template_test/opf_description_template_test.py b/tests/integration/nupic/opf/opf_description_template_test/opf_description_template_test.py index 83f7ab5434..f17ec5c666 100755 --- a/tests/integration/nupic/opf/opf_description_template_test/opf_description_template_test.py +++ b/tests/integration/nupic/opf/opf_description_template_test/opf_description_template_test.py @@ -28,7 +28,7 @@ from pkg_resources import resource_filename -from nupic.frameworks.opf.opfhelpers import ( +from nupic.frameworks.opf.opf_helpers import ( loadExperimentDescriptionScriptFromDir, getExperimentDescriptionInterfaceFromModule ) diff --git a/tests/regression/run_opf_benchmarks_test.py b/tests/regression/run_opf_benchmarks_test.py index 77214a37df..93b2095ad5 100755 --- a/tests/regression/run_opf_benchmarks_test.py +++ b/tests/regression/run_opf_benchmarks_test.py @@ -41,7 +41,7 @@ from nupic.database import ClientJobsDAO as cjdao from nupic.swarming.exp_generator import ExpGenerator -from nupic.frameworks.opf.opfutils import InferenceType +from nupic.frameworks.opf.opf_utils import InferenceType from nupic.support.configuration import Configuration from nupic.support.unittesthelpers.testcasebase import unittest from nupic.swarming import permutations_runner diff --git a/tests/swarming/nupic/swarming/experiments/delta/description.py b/tests/swarming/nupic/swarming/experiments/delta/description.py index d9f2fce074..86c38d6e05 100644 --- a/tests/swarming/nupic/swarming/experiments/delta/description.py +++ b/tests/swarming/nupic/swarming/experiments/delta/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/dummyV2/description.py b/tests/swarming/nupic/swarming/experiments/dummyV2/description.py index 98cd566f9a..9863ddd0d6 100644 --- a/tests/swarming/nupic/swarming/experiments/dummyV2/description.py +++ b/tests/swarming/nupic/swarming/experiments/dummyV2/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/dummy_multi_v2/description.py b/tests/swarming/nupic/swarming/experiments/dummy_multi_v2/description.py index 063195e0d6..e91954df54 100644 --- a/tests/swarming/nupic/swarming/experiments/dummy_multi_v2/description.py +++ b/tests/swarming/nupic/swarming/experiments/dummy_multi_v2/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/field_contrib_temporal/description.py b/tests/swarming/nupic/swarming/experiments/field_contrib_temporal/description.py index e89125008e..8ef13e8adc 100644 --- a/tests/swarming/nupic/swarming/experiments/field_contrib_temporal/description.py +++ b/tests/swarming/nupic/swarming/experiments/field_contrib_temporal/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/field_threshold_temporal/description.py b/tests/swarming/nupic/swarming/experiments/field_threshold_temporal/description.py index a87cb489ac..56898be49d 100644 --- a/tests/swarming/nupic/swarming/experiments/field_threshold_temporal/description.py +++ b/tests/swarming/nupic/swarming/experiments/field_threshold_temporal/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/input_predicted_field/description.py b/tests/swarming/nupic/swarming/experiments/input_predicted_field/description.py index 80def83c86..015734f7cf 100644 --- a/tests/swarming/nupic/swarming/experiments/input_predicted_field/description.py +++ b/tests/swarming/nupic/swarming/experiments/input_predicted_field/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupicengine/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer ) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/legacy_cla_multistep/description.py b/tests/swarming/nupic/swarming/experiments/legacy_cla_multistep/description.py index 3d126b48c7..01555e4960 100644 --- a/tests/swarming/nupic/swarming/experiments/legacy_cla_multistep/description.py +++ b/tests/swarming/nupic/swarming/experiments/legacy_cla_multistep/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupicengine/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer ) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/max_branching_temporal/description.py b/tests/swarming/nupic/swarming/experiments/max_branching_temporal/description.py index 0f7b27457c..8547915420 100644 --- a/tests/swarming/nupic/swarming/experiments/max_branching_temporal/description.py +++ b/tests/swarming/nupic/swarming/experiments/max_branching_temporal/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/oneField/description.py b/tests/swarming/nupic/swarming/experiments/oneField/description.py index 313152bf1b..298460b6b6 100644 --- a/tests/swarming/nupic/swarming/experiments/oneField/description.py +++ b/tests/swarming/nupic/swarming/experiments/oneField/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/simpleV2/description.py b/tests/swarming/nupic/swarming/experiments/simpleV2/description.py index 1785959750..de72c136f4 100644 --- a/tests/swarming/nupic/swarming/experiments/simpleV2/description.py +++ b/tests/swarming/nupic/swarming/experiments/simpleV2/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/simple_cla_multistep/description.py b/tests/swarming/nupic/swarming/experiments/simple_cla_multistep/description.py index e3c8b91f60..4a79ca4d41 100644 --- a/tests/swarming/nupic/swarming/experiments/simple_cla_multistep/description.py +++ b/tests/swarming/nupic/swarming/experiments/simple_cla_multistep/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupicengine/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer ) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/smart_speculation_spatial_classification/description.py b/tests/swarming/nupic/swarming/experiments/smart_speculation_spatial_classification/description.py index 9a5c91dd8f..f550e964ec 100644 --- a/tests/swarming/nupic/swarming/experiments/smart_speculation_spatial_classification/description.py +++ b/tests/swarming/nupic/swarming/experiments/smart_speculation_spatial_classification/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/smart_speculation_temporal/description.py b/tests/swarming/nupic/swarming/experiments/smart_speculation_temporal/description.py index 6c0d50c595..108dce8256 100644 --- a/tests/swarming/nupic/swarming/experiments/smart_speculation_temporal/description.py +++ b/tests/swarming/nupic/swarming/experiments/smart_speculation_temporal/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupic/frameworks/opf/expGenerator/ExpGenerator.py' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/swarming/nupic/swarming/experiments/spatial_classification/description.py b/tests/swarming/nupic/swarming/experiments/spatial_classification/description.py index 89c71bd2ca..89f4d7df56 100644 --- a/tests/swarming/nupic/swarming/experiments/spatial_classification/description.py +++ b/tests/swarming/nupic/swarming/experiments/spatial_classification/description.py @@ -27,20 +27,20 @@ '/Users/ronmarianetti/nupic/eng/lib/python2.6/site-packages/nupicengine/frameworks/opf/expGenerator/ExpGenerator.pyc' """ -from nupic.frameworks.opf.expdescriptionapi import ExperimentDescriptionAPI +from nupic.frameworks.opf.exp_description_api import ExperimentDescriptionAPI -from nupic.frameworks.opf.expdescriptionhelpers import ( +from nupic.frameworks.opf.exp_description_helpers import ( updateConfigFromSubConfig, applyValueGettersToContainer, DeferredDictLookup) -from nupic.frameworks.opf.htmpredictionmodelcallbacks import * +from nupic.frameworks.opf.htm_prediction_model_callbacks import * from nupic.frameworks.opf.metrics import MetricSpec -from nupic.frameworks.opf.opfutils import (InferenceType, - InferenceElement) +from nupic.frameworks.opf.opf_utils import (InferenceType, + InferenceElement) from nupic.support import aggregationDivide -from nupic.frameworks.opf.opftaskdriver import ( +from nupic.frameworks.opf.opf_task_driver import ( IterationPhaseSpecLearnOnly, IterationPhaseSpecInferOnly, IterationPhaseSpecLearnAndInfer) diff --git a/tests/unit/nupic/data/inference_shifter_test.py b/tests/unit/nupic/data/inference_shifter_test.py index 5f02243774..300c65d4e3 100755 --- a/tests/unit/nupic/data/inference_shifter_test.py +++ b/tests/unit/nupic/data/inference_shifter_test.py @@ -22,7 +22,7 @@ """Unit tests for InferenceShifter.""" from nupic.data.inference_shifter import InferenceShifter -from nupic.frameworks.opf.opfutils import InferenceElement, ModelResult +from nupic.frameworks.opf.opf_utils import InferenceElement, ModelResult from nupic.support.unittesthelpers.testcasebase import (TestCaseBase, unittest) diff --git a/tests/unit/nupic/frameworks/opf/common_models/cluster_params_test.py b/tests/unit/nupic/frameworks/opf/common_models/cluster_params_test.py index e937f51504..dc7b60315b 100755 --- a/tests/unit/nupic/frameworks/opf/common_models/cluster_params_test.py +++ b/tests/unit/nupic/frameworks/opf/common_models/cluster_params_test.py @@ -23,8 +23,8 @@ import unittest from nupic.support.unittesthelpers.testcasebase import TestCaseBase -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf.htmpredictionmodel import HTMPredictionModel +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf.htm_prediction_model import HTMPredictionModel from nupic.frameworks.opf.common_models.cluster_params import ( getScalarMetricWithTimeOfDayAnomalyParams) diff --git a/tests/unit/nupic/frameworks/opf/htmpredictionmodel_classifier_helper_test.py b/tests/unit/nupic/frameworks/opf/htmpredictionmodel_classifier_helper_test.py index ee65c6ce1c..9d8b23ae56 100755 --- a/tests/unit/nupic/frameworks/opf/htmpredictionmodel_classifier_helper_test.py +++ b/tests/unit/nupic/frameworks/opf/htmpredictionmodel_classifier_helper_test.py @@ -19,7 +19,7 @@ # http://numenta.org/licenses/ # ---------------------------------------------------------------------- -"""Unit tests for the htmpredictionmodel module.""" +"""Unit tests for the htm_prediction_model module.""" import sys import copy @@ -30,11 +30,11 @@ from nupic.support.unittesthelpers.testcasebase import (unittest, TestOptionParser) -from nupic.frameworks.opf.htmpredictionmodel import HTMPredictionModel -from nupic.frameworks.opf.htmpredictionmodel_classifier_helper import \ +from nupic.frameworks.opf.htm_prediction_model import HTMPredictionModel +from nupic.frameworks.opf.htm_prediction_model_classifier_helper import \ HTMPredictionModelClassifierHelper, _CLAClassificationRecord, Configuration -from nupic.frameworks.opf.opfutils import InferenceType +from nupic.frameworks.opf.opf_utils import InferenceType from nupic.frameworks.opf.exceptions import HTMPredictionModelInvalidRangeError @@ -228,7 +228,7 @@ def testGetLabels(self): } self.helper.saved_categories = ['TestCategory'] categoryList = [1,1,1] - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() classifier.getParameter.side_effect = values.get classifier._knn._categoryList = categoryList @@ -244,7 +244,7 @@ def testGetLabels(self): @patch.object(HTMPredictionModelClassifierHelper, '_getStateAnomalyVector') @patch.object(HTMPredictionModelClassifierHelper, '_updateState') def testAddLabel(self, _updateState, _getStateAnomalyVector): - self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf().getParameter.return_value = [1,2,3] + self.helper.htm_prediction_model._getAnomalyClassifier().getSelf().getParameter.return_value = [1,2,3] self.helper.saved_states = [] self.assertRaises(HTMPredictionModelInvalidRangeError, self.helper.addLabel, start=100, end=100, labelName="test") @@ -275,7 +275,7 @@ def testAddLabel(self, _updateState, _getStateAnomalyVector): self.assertTrue(self.helper.saved_states[1].setByUser) # Verifies record added to KNN classifier - knn = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf()._knn + knn = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf()._knn knn.learn.assert_called_once_with(ANY, ANY, rowID=11) # Verifies records after added label is recomputed @@ -285,7 +285,7 @@ def testAddLabel(self, _updateState, _getStateAnomalyVector): @patch.object(HTMPredictionModelClassifierHelper, '_getStateAnomalyVector') @patch.object(HTMPredictionModelClassifierHelper, '_updateState') def testRemoveLabel(self, _updateState, _getStateAnomalyVector): - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() classifier.getParameter.return_value = [10,11,12] classifier._knn._numPatterns = 3 classifier._knn.removeIds.side_effect = self.mockRemoveIds @@ -319,7 +319,7 @@ def testRemoveLabel(self, _updateState, _getStateAnomalyVector): self.assertTrue('Test' not in self.helper.saved_states[1].anomalyLabel) # Verifies records removed from KNN classifier - knn = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf()._knn + knn = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf()._knn self.assertEqual(knn.removeIds.mock_calls, [call([11]), call([])]) # Verifies records after removed record are updated @@ -329,7 +329,7 @@ def testRemoveLabel(self, _updateState, _getStateAnomalyVector): @patch.object(HTMPredictionModelClassifierHelper, '_getStateAnomalyVector') @patch.object(HTMPredictionModelClassifierHelper, '_updateState') def testRemoveLabelNoFilter(self, _updateState, _getStateAnomalyVector): - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() values = { 'categoryRecencyList': [10, 11, 12] } @@ -348,7 +348,7 @@ def testRemoveLabelNoFilter(self, _updateState, _getStateAnomalyVector): self.assertTrue('Test' not in self.helper.saved_states[1].anomalyLabel) # Verifies records removed from KNN classifier - knn = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf()._knn + knn = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf()._knn self.assertEqual(knn.removeIds.mock_calls, [call([11]), call([])]) # Verifies records after removed record are updated @@ -519,7 +519,7 @@ def testAddRecordToKNN(self, getAnomalyVector): values = { 'categoryRecencyList': [1, 2, 3] } - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() classifier.getParameter.side_effect = values.get state = { "ROWID": 5, @@ -553,7 +553,7 @@ def testDeleteRangeFromKNN(self, getAnomalyVector): values = { 'categoryRecencyList': [1, 2, 3] } - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() classifier.getParameter.side_effect = values.get classifier._knn._numPatterns = len(values['categoryRecencyList']) classifier._knn.removeIds.side_effect = self.mockRemoveIds @@ -580,7 +580,7 @@ def testRecomputeRecordFromKNN(self, getAnomalyVector): 'latestDists': numpy.array([0.7, 0.2, 0.5, 1, 0.3, 0.2, 0.1]), 'categories': ['A','B','C','D','E','F','G'] } - classifier = self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf() + classifier = self.helper.htm_prediction_model._getAnomalyClassifier().getSelf() classifier.getLatestDistances.return_value = values['latestDists'] classifier.getCategoryList.return_value = values['categories'] classifier.getParameter.side_effect = values.get @@ -633,9 +633,9 @@ def testConstructClassificationVector(self): 'topDownOut': numpy.array([1,0,0,0,1]) } } - self.helper.htmpredictionmodel.getParameter.side_effect = modelParams.get - sp = self.helper.htmpredictionmodel._getSPRegion() - tp = self.helper.htmpredictionmodel._getTPRegion() + self.helper.htm_prediction_model.getParameter.side_effect = modelParams.get + sp = self.helper.htm_prediction_model._getSPRegion() + tp = self.helper.htm_prediction_model._getTPRegion() tpImp = tp.getSelf()._tfdr sp.getParameter.side_effect = spVals['params'].get @@ -879,10 +879,10 @@ def testCLAClassificationRecordSetState(self): def mockRemoveIds(self, ids): - self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf()._knn._numPatterns -= len(ids) + self.helper.htm_prediction_model._getAnomalyClassifier().getSelf()._knn._numPatterns -= len(ids) for idx in ids: - if idx in self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf().getParameter('categoryRecencyList'): - self.helper.htmpredictionmodel._getAnomalyClassifier().getSelf().getParameter('categoryRecencyList').remove(idx) + if idx in self.helper.htm_prediction_model._getAnomalyClassifier().getSelf().getParameter('categoryRecencyList'): + self.helper.htm_prediction_model._getAnomalyClassifier().getSelf().getParameter('categoryRecencyList').remove(idx) diff --git a/tests/unit/nupic/frameworks/opf/htmpredictionmodel_test.py b/tests/unit/nupic/frameworks/opf/htmpredictionmodel_test.py index 2fec9ddf46..11afe46c46 100755 --- a/tests/unit/nupic/frameworks/opf/htmpredictionmodel_test.py +++ b/tests/unit/nupic/frameworks/opf/htmpredictionmodel_test.py @@ -19,14 +19,14 @@ # http://numenta.org/licenses/ # ---------------------------------------------------------------------- -"""Unit tests for the htmpredictionmodel module.""" +"""Unit tests for the htm_prediction_model module.""" import datetime import unittest2 as unittest -from nupic.frameworks.opf.htmpredictionmodel import HTMPredictionModel -from nupic.frameworks.opf.modelfactory import ModelFactory -from nupic.frameworks.opf.opfutils import ModelResult +from nupic.frameworks.opf.htm_prediction_model import HTMPredictionModel +from nupic.frameworks.opf.model_factory import ModelFactory +from nupic.frameworks.opf.opf_utils import ModelResult diff --git a/tests/unit/nupic/frameworks/opf/opf_metrics_test.py b/tests/unit/nupic/frameworks/opf/opf_metrics_test.py index b6b5316f87..4d99c6b81c 100755 --- a/tests/unit/nupic/frameworks/opf/opf_metrics_test.py +++ b/tests/unit/nupic/frameworks/opf/opf_metrics_test.py @@ -163,7 +163,7 @@ def testMultistepAAE(self): msp = getModule(MetricSpec("multiStep", None, None, {"verbosity" : OPFMetricsTest.VERBOSITY, "window":100, "errorMetric":"aae", "steps": 3})) - + # Make each ground truth 1 greater than the prediction gt = [i+1 for i in range(100)] p = [{3: {i: .7, 5: 0.3}} for i in range(100)] @@ -179,7 +179,7 @@ def testMultistepAAEMultipleSteps(self): msp = getModule(MetricSpec("multiStep", None, None, {"verbosity" : OPFMetricsTest.VERBOSITY, "window":100, "errorMetric":"aae", "steps": [3,6]})) - + # Make each 3 step prediction +1 over ground truth and each 6 step # prediction +0.5 over ground truth gt = [i for i in range(100)] @@ -485,7 +485,7 @@ def testLongWindowRMSE(self): def testNegativeLogLikelihood(self): # make sure negativeLogLikelihood returns correct LL numbers - # mock objects for ClassifierInput and ModelResult (see opfutils.py) + # mock objects for ClassifierInput and ModelResult (see opf_utils.py) class MockClassifierInput(object): def __init__(self, bucketIdx): self.bucketIndex = bucketIdx @@ -539,7 +539,7 @@ def testNegLLMultiplePrediction(self): # and models that gives single prediction (either most likely outcome or # average outcome) has worse LL - # mock objects for ClassifierInput and ModelResult (see opfutils.py) + # mock objects for ClassifierInput and ModelResult (see opf_utils.py) class MockClassifierInput(object): def __init__(self, bucketIdx): self.bucketIndex = bucketIdx @@ -880,10 +880,10 @@ def testMultiMetric(self): metric1000ref = getModule(ms1) metric10ref = getModule(ms2) - + gt = range(500, 1000) p = range(500) - + for i in xrange(len(gt)): v10=metric10ref.addInstance(gt[i], p[i]) v1000=metric1000ref.addInstance(gt[i], p[i]) diff --git a/tests/unit/nupic/frameworks/opf/previous_value_model_test.py b/tests/unit/nupic/frameworks/opf/previous_value_model_test.py index dd396560ef..67bab1baed 100755 --- a/tests/unit/nupic/frameworks/opf/previous_value_model_test.py +++ b/tests/unit/nupic/frameworks/opf/previous_value_model_test.py @@ -27,7 +27,7 @@ import unittest2 as unittest from nupic.data import dictutils -from nupic.frameworks.opf import opfutils, previousvaluemodel +from nupic.frameworks.opf import opf_utils, previousvaluemodel SEQUENCE_LENGTH = 100 @@ -54,7 +54,7 @@ class PreviousValueModelTest(unittest.TestCase): def _runNextStep(self, data): model = previousvaluemodel.PreviousValueModel( - opfutils.InferenceType.TemporalNextStep, predictedField = 'a') + opf_utils.InferenceType.TemporalNextStep, predictedField ='a') inputRecords = (dictutils.DictObj({'a' : d}) for d in data) @@ -63,15 +63,15 @@ def _runNextStep(self, data): results = model.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertEqual(results.inferences[ - opfutils.InferenceElement.prediction], expectedInference) + opf_utils.InferenceElement.prediction], expectedInference) self.assertEqual(results.inferences[ - opfutils.InferenceElement.multiStepBestPredictions][1], - expectedInference) + opf_utils.InferenceElement.multiStepBestPredictions][1], + expectedInference) def _runMultiStep(self, data): model = previousvaluemodel.PreviousValueModel( - opfutils.InferenceType.TemporalMultiStep, predictedField = 'a', + opf_utils.InferenceType.TemporalMultiStep, predictedField ='a', predictionSteps = [1, 3, 5]) inputRecords = (dictutils.DictObj({'a' : d}) for d in data) @@ -81,16 +81,16 @@ def _runMultiStep(self, data): results = model.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertEqual(results.inferences[ - opfutils.InferenceElement.prediction], expectedInference) + opf_utils.InferenceElement.prediction], expectedInference) self.assertEqual(results.inferences[ - opfutils.InferenceElement.multiStepBestPredictions][1], - expectedInference) + opf_utils.InferenceElement.multiStepBestPredictions][1], + expectedInference) self.assertEqual(results.inferences[ - opfutils.InferenceElement.multiStepBestPredictions][3], - expectedInference) + opf_utils.InferenceElement.multiStepBestPredictions][3], + expectedInference) self.assertEqual(results.inferences[ - opfutils.InferenceElement.multiStepBestPredictions][5], - expectedInference) + opf_utils.InferenceElement.multiStepBestPredictions][5], + expectedInference) def testNextStepIncreasing(self): diff --git a/tests/unit/nupic/frameworks/opf/two_gram_model_test.py b/tests/unit/nupic/frameworks/opf/two_gram_model_test.py index 3d0629e5bc..53f1785524 100755 --- a/tests/unit/nupic/frameworks/opf/two_gram_model_test.py +++ b/tests/unit/nupic/frameworks/opf/two_gram_model_test.py @@ -24,7 +24,7 @@ import unittest2 as unittest from nupic.data import dictutils -from nupic.frameworks.opf import opfutils, two_gram_model +from nupic.frameworks.opf import opf_utils, two_gram_model @@ -41,7 +41,7 @@ def testBasicPredictions(self): "clipInput": True, "forced": True, "type": "ScalarEncoder"}} - inferenceType = opfutils.InferenceType.TemporalNextStep + inferenceType = opf_utils.InferenceType.TemporalNextStep twoGramModel = two_gram_model.TwoGramModel(inferenceType, encoders) inputRecords = (dictutils.DictObj(d) for d in ({"a": 5}, {"a": 6}, @@ -53,7 +53,7 @@ def testBasicPredictions(self): results = twoGramModel.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertSequenceEqual( - results.inferences[opfutils.InferenceElement.prediction], + results.inferences[opf_utils.InferenceElement.prediction], expectedInference) @@ -66,7 +66,7 @@ def testSequenceReset(self): "clipInput": True, "forced": True, "type": "ScalarEncoder"}} - inferenceType = opfutils.InferenceType.TemporalNextStep + inferenceType = opf_utils.InferenceType.TemporalNextStep twoGramModel = two_gram_model.TwoGramModel(inferenceType, encoders) inputRecords = (dictutils.DictObj(d) for d in ({"a": 5}, {"a": 6}, @@ -81,7 +81,7 @@ def testSequenceReset(self): results = twoGramModel.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertSequenceEqual( - results.inferences[opfutils.InferenceElement.prediction], + results.inferences[opf_utils.InferenceElement.prediction], expectedInference) @@ -102,7 +102,7 @@ def testMultipleFields(self): "clipInput": True, "forced": True, "type": "ScalarEncoder"}} - inferenceType = opfutils.InferenceType.TemporalNextStep + inferenceType = opf_utils.InferenceType.TemporalNextStep twoGramModel = two_gram_model.TwoGramModel(inferenceType, encoders) inputRecords = (dictutils.DictObj(d) for d in ({"a": 5, "b": 1}, {"a": 6, "b": 2}, @@ -114,7 +114,7 @@ def testMultipleFields(self): results = twoGramModel.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertSequenceEqual( - results.inferences[opfutils.InferenceElement.prediction], + results.inferences[opf_utils.InferenceElement.prediction], expectedInference) @@ -124,7 +124,7 @@ def testCategoryPredictions(self): "w": 3, "forced": True, "type": "SDRCategoryEncoder"}} - inferenceType = opfutils.InferenceType.TemporalNextStep + inferenceType = opf_utils.InferenceType.TemporalNextStep twoGramModel = two_gram_model.TwoGramModel(inferenceType, encoders) inputRecords = (dictutils.DictObj(d) for d in ({"a": "A"}, {"a": "B"}, @@ -136,7 +136,7 @@ def testCategoryPredictions(self): results = twoGramModel.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertSequenceEqual( - results.inferences[opfutils.InferenceElement.prediction], + results.inferences[opf_utils.InferenceElement.prediction], expectedInference) @@ -149,7 +149,7 @@ def testBucketedScalars(self): "clipInput": True, "forced": True, "type": "ScalarEncoder"}} - inferenceType = opfutils.InferenceType.TemporalNextStep + inferenceType = opf_utils.InferenceType.TemporalNextStep twoGramModel = two_gram_model.TwoGramModel(inferenceType, encoders) inputRecords = (dictutils.DictObj(d) for d in ({"a": 5}, {"a": 6}, @@ -164,7 +164,7 @@ def testBucketedScalars(self): results = twoGramModel.run(inputRecord) self.assertEqual(results.predictionNumber, i) self.assertSequenceEqual( - results.inferences[opfutils.InferenceElement.prediction], + results.inferences[opf_utils.InferenceElement.prediction], expectedInference) diff --git a/tests/unit/nupic/regions/knn_anomaly_classifier_region_test.py b/tests/unit/nupic/regions/knn_anomaly_classifier_region_test.py index bca507c67e..98adba52f3 100755 --- a/tests/unit/nupic/regions/knn_anomaly_classifier_region_test.py +++ b/tests/unit/nupic/regions/knn_anomaly_classifier_region_test.py @@ -19,7 +19,7 @@ # http://numenta.org/licenses/ # ---------------------------------------------------------------------- -"""Unit tests for the htmpredictionmodel module.""" +"""Unit tests for the htm_prediction_model module.""" import sys import copy @@ -30,13 +30,13 @@ from nupic.support.unittesthelpers.testcasebase import (unittest, TestOptionParser) -from nupic.frameworks.opf.opfutils import InferenceType +from nupic.frameworks.opf.opf_utils import InferenceType from nupic.regions.KNNAnomalyClassifierRegion import ( KNNAnomalyClassifierRegion, _CLAClassificationRecord) -from nupic.frameworks.opf.opfutils import InferenceType +from nupic.frameworks.opf.opf_utils import InferenceType from nupic.frameworks.opf.exceptions import (HTMPredictionModelInvalidRangeError)