* Added src/nupic/frameworks/opf/common_models/ cluster_params.py and supporting files from numenta-apps htmengine. A separate numenta-apps PR will remove this code from htmengine. * fixes #2592 * fix for #2265 * fix for bug #2265 * Fixup Dockerfile to install nupic.bindings , and other cleanup * Adding C++ compiler requirement to README. * Fix for test failure * Fixed stream definition reference error. * Reduce default reestimation period. * Remove greedy reestimation of distribution * Pointing README to proper bindings version. * Continuing work on 0.3.4.dev0. * removing a test that depends on nupic.vision * PCA_Node test : some fixes, WIP * formatting * test for PCANode region * remove Pillow from requirements.txt as it was used for vision only * fix merge mistake in csv file * move test from PCANode to nupic.vision unittest

[Derouiche <kamel.derouiche%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Derouiche <kamel.derouiche%gmail.com@localhost>
Pushed By:	jihbed
Date:		Thu Oct 1 01:32:09 2015 +0100
Changeset:	0ab7cac3d0482edefd0e5fbb46a9e4dd35370328

Modified Files:
	py-nupic/DESCR
	py-nupic/Makefile
	py-nupic/PLIST
	py-nupic/distinfo
Removed Files:
	py-nupic/patches/patch-setup.py

Log Message:
* Added src/nupic/frameworks/opf/common_models/cluster_params.py and supporting files from numenta-apps htmengine. A separate numenta-apps PR will remove this code from htmengine.
* fixes #2592
* fix for #2265
* fix for bug #2265
* Fixup Dockerfile to install nupic.bindings, and other cleanup
* Adding C++ compiler requirement to README.
* Fix for test failure
* Fixed stream definition reference error.
* Reduce default reestimation period.
* Remove greedy reestimation of distribution
* Pointing README to proper bindings version.
* Continuing work on 0.3.4.dev0.
* removing a test that depends on nupic.vision
* PCA_Node test: some fixes, WIP
* formatting
* test for PCANode region
* remove Pillow from requirements.txt as it was used for vision only
* fix merge mistake in csv file
* move test from PCANode to nupic.vision unittest

* Include additional file types in MANIFEST.in, consistent with setup.py
* Pattern and Sequence machines using nupic::Random
* Wrap sparse matrix implementations with cortical column-centric semantics as a way to abstract away the underlying implementation
* Re-enable testHotgymRegression

* Update to nupic.bindings version with fix for platform differences
* Rename nupic directory to src/nupic
* Updated S3 URL to nupic.bindings for Linux install
* Fix paths for data files in an integration test
* Fix issue with storing temporary file in wrong location in integration test

* Specify nupic.bindings version to match commit sha (0.2).
* Use logging.debug for emitting the message about not being able to import matplotlib; we log it at debug level to avoid polluting the logs of apps and services that don't care about plotting.
* Add Dockerfile ready to perform swarming.
* Removes PCANode
* Updated Linux binary install instructions.

* Updated comment about greedy stats refresh when likelihood > 0.99

* Implemented unit tests for the new features in AnomalyLikelihood class.
* Convert AnomalyLikelihood._historicalScores to a user-configurable sliding window, instead of accumulating all of the incoming data points. This improved performance a ton! Added AnomalyLikelihood.forceModelRefresh() method.
* Update nupic.core to include backwards compatibility fix for RandomImpl.
* Uninstall pycapnp to avoid running tests that utilize the functionality and currently fail with Duplicate ID error.
* Makes pycapnp and corresponding serialization optional. If pycapnp is not installed then the corresponding serialization tests will be skipped.
* Add Multiple Prediction Test for NegLL Metric
* Add test for NegLL Error Metric
* Fix Orphan Decay Bug in temporal memory test
* Change decreasing overlaps test for coordinate encoder to not require a strict decrease (staying the same is ok).
* Allow specifying MonitoredTemporalMemory as TM implementation through OPF
* include bucket likelihood and classifier input in clamodel
* update metrics managers to pass model results to metrics
* introducting a computeFlag to prevent double-computation. * The flag is used to prevent double computation in the event that customCompute() is called at the same time as compute()
* Added `numRecords` param for consitency with the newly added `infer` method in FastCLACLassifier
* checking if classifier has a `maxCategoryCount` attribute. If not, set it to solve backward compatibilities issues
* renaming numCategories to maxCategoryCount to be constistent between KNN and CLA classifier
* made new experimentutils file containing InferenceElement, InferenceType, and ModelResult duplicates which we will want to change in the future

* Updating nupic.core sha.
* Updated location of NuPIC Linux wheel on S3.

* Updating bindings version.

* Added pip install command for linux bindings.
* Change term predictedColumns to predictedActiveColumns in the TemporalMemory

* Updated to correct pypi license string.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0ab7cac3d0482edefd0e5fbb46a9e4dd35370328

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-nupic/DESCR                  |   4 -
 py-nupic/Makefile               |  10 +-
 py-nupic/PLIST                  | 572 ++++++++++++++++++----------------------
 py-nupic/distinfo               |   7 +-
 py-nupic/patches/patch-setup.py |  11 -
 5 files changed, 263 insertions(+), 341 deletions(-)

diffs:
diff --git a/py-nupic/DESCR b/py-nupic/DESCR
index e674358..e69de29 100644
--- a/py-nupic/DESCR
+++ b/py-nupic/DESCR
@@ -1,4 +0,0 @@
-NuPIC is a library that provides the building blocks for online prediction
-systems. The library contains the Cortical Learning Algorithm (CLA),
-but also the Online Prediction Framework (OPF) that allows clients to build
-prediction systems out of encoders, models and metrics
diff --git a/py-nupic/Makefile b/py-nupic/Makefile
index e280e6a..8275a0a 100644
--- a/py-nupic/Makefile
+++ b/py-nupic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/07/26 09:50:17 jihbed Exp $
+# $NetBSD$
 
-DISTNAME=	nupic-0.1.0
+DISTNAME=	nupic-0.3.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	https://pypi.python.org/packages/source/n/nupic/
@@ -8,10 +8,10 @@ MASTER_SITES=	https://pypi.python.org/packages/source/n/nupic/
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://github.com/numenta/nupic
 COMMENT=	Numenta Platform for Intelligent Computing
-LICENSE=	gnu-gpl-v3
+LICENSE=	gnu-agpl-v3
 
-USE_LANGUAGES=	# none
+DEPENDS+=	${PYPKGPREFIX}-wheel>=0.24.0:../../wip/py-wheel
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.mk"
\ No newline at end of file
diff --git a/py-nupic/PLIST b/py-nupic/PLIST
index c3cb4ab..a37b174 100644
--- a/py-nupic/PLIST
+++ b/py-nupic/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2014/07/26 09:50:17 jihbed Exp $
+@comment $NetBSD$
+${PYSITELIB}/${EGG_NAME}-nspkg.pth
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/nupic/__init__.py
-${PYSITELIB}/nupic/__init__.pyc
-${PYSITELIB}/nupic/__init__.pyo
 ${PYSITELIB}/nupic/algorithms/CLAClassifier.py
 ${PYSITELIB}/nupic/algorithms/CLAClassifier.pyc
 ${PYSITELIB}/nupic/algorithms/CLAClassifier.pyo
@@ -30,18 +31,9 @@ ${PYSITELIB}/nupic/algorithms/cla_classifier_factory.pyo
 ${PYSITELIB}/nupic/bindings/__init__.py
 ${PYSITELIB}/nupic/bindings/__init__.pyc
 ${PYSITELIB}/nupic/bindings/__init__.pyo
-${PYSITELIB}/nupic/bindings/algorithms.py
-${PYSITELIB}/nupic/bindings/algorithms.pyc
-${PYSITELIB}/nupic/bindings/algorithms.pyo
-${PYSITELIB}/nupic/bindings/engine_internal.py
-${PYSITELIB}/nupic/bindings/engine_internal.pyc
-${PYSITELIB}/nupic/bindings/engine_internal.pyo
-${PYSITELIB}/nupic/bindings/iorange.py
-${PYSITELIB}/nupic/bindings/iorange.pyc
-${PYSITELIB}/nupic/bindings/iorange.pyo
-${PYSITELIB}/nupic/bindings/math.py
-${PYSITELIB}/nupic/bindings/math.pyc
-${PYSITELIB}/nupic/bindings/math.pyo
+${PYSITELIB}/nupic/bindings/proto/__init__.py
+${PYSITELIB}/nupic/bindings/proto/__init__.pyc
+${PYSITELIB}/nupic/bindings/proto/__init__.pyo
 ${PYSITELIB}/nupic/data/CategoryFilter.py
 ${PYSITELIB}/nupic/data/CategoryFilter.pyc
 ${PYSITELIB}/nupic/data/CategoryFilter.pyo
@@ -51,9 +43,6 @@ ${PYSITELIB}/nupic/data/__init__.pyo
 ${PYSITELIB}/nupic/data/aggregator.py
 ${PYSITELIB}/nupic/data/aggregator.pyc
 ${PYSITELIB}/nupic/data/aggregator.pyo
-${PYSITELIB}/nupic/data/datasethelpers.py
-${PYSITELIB}/nupic/data/datasethelpers.pyc
-${PYSITELIB}/nupic/data/datasethelpers.pyo
 ${PYSITELIB}/nupic/data/dictutils.py
 ${PYSITELIB}/nupic/data/dictutils.pyc
 ${PYSITELIB}/nupic/data/dictutils.pyo
@@ -69,6 +58,24 @@ ${PYSITELIB}/nupic/data/filters.pyo
 ${PYSITELIB}/nupic/data/functionsource.py
 ${PYSITELIB}/nupic/data/functionsource.pyc
 ${PYSITELIB}/nupic/data/functionsource.pyo
+${PYSITELIB}/nupic/data/generators/__init__.py
+${PYSITELIB}/nupic/data/generators/__init__.pyc
+${PYSITELIB}/nupic/data/generators/__init__.pyo
+${PYSITELIB}/nupic/data/generators/anomalyzer.py
+${PYSITELIB}/nupic/data/generators/anomalyzer.pyc
+${PYSITELIB}/nupic/data/generators/anomalyzer.pyo
+${PYSITELIB}/nupic/data/generators/data_generator.py
+${PYSITELIB}/nupic/data/generators/data_generator.pyc
+${PYSITELIB}/nupic/data/generators/data_generator.pyo
+${PYSITELIB}/nupic/data/generators/distributions.py
+${PYSITELIB}/nupic/data/generators/distributions.pyc
+${PYSITELIB}/nupic/data/generators/distributions.pyo
+${PYSITELIB}/nupic/data/generators/pattern_machine.py
+${PYSITELIB}/nupic/data/generators/pattern_machine.pyc
+${PYSITELIB}/nupic/data/generators/pattern_machine.pyo
+${PYSITELIB}/nupic/data/generators/sequence_machine.py
+${PYSITELIB}/nupic/data/generators/sequence_machine.pyc
+${PYSITELIB}/nupic/data/generators/sequence_machine.pyo
 ${PYSITELIB}/nupic/data/inference_shifter.py
 ${PYSITELIB}/nupic/data/inference_shifter.pyc
 ${PYSITELIB}/nupic/data/inference_shifter.pyo
@@ -93,6 +100,7 @@ ${PYSITELIB}/nupic/data/stats_v2.pyo
 ${PYSITELIB}/nupic/data/stream_reader.py
 ${PYSITELIB}/nupic/data/stream_reader.pyc
 ${PYSITELIB}/nupic/data/stream_reader.pyo
+${PYSITELIB}/nupic/data/testSchema.json
 ${PYSITELIB}/nupic/data/utils.py
 ${PYSITELIB}/nupic/data/utils.pyc
 ${PYSITELIB}/nupic/data/utils.pyo
@@ -105,78 +113,184 @@ ${PYSITELIB}/nupic/database/Connection.pyo
 ${PYSITELIB}/nupic/database/__init__.py
 ${PYSITELIB}/nupic/database/__init__.pyc
 ${PYSITELIB}/nupic/database/__init__.pyo
+${PYSITELIB}/nupic/datafiles/__init__.py
+${PYSITELIB}/nupic/datafiles/__init__.pyc
+${PYSITELIB}/nupic/datafiles/__init__.pyo
+${PYSITELIB}/nupic/datafiles/extra/firstOrder/categories.txt
+${PYSITELIB}/nupic/datafiles/extra/firstOrder/fo_100000_10_train_resets.csv
+${PYSITELIB}/nupic/datafiles/extra/firstOrder/fo_10000_10_test_resets.csv
+${PYSITELIB}/nupic/datafiles/extra/firstOrder/fo_10000_10_train_resets.csv
+${PYSITELIB}/nupic/datafiles/extra/firstOrder/fo_1000_10_train_resets.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/categories/sample3.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/categories/sample4.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/categories/sample5.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/linear_two_fields/sample1.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/linear_two_fields/sample2.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/linear_two_fields/sample3.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/linear_two_plus_one_fields/sample1.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/spatial/sum_two_fields_plus_extra_field/sample1.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/temporal/categories/sample1.csv
+${PYSITELIB}/nupic/datafiles/extra/generated/temporal/categories/sample2.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/agg_gym_hours_5f8N_pp.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_clean_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_clean_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_fri_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_fri_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_mon_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_mon_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_sat_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_sat_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_sun_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_sun_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_test_ext.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_thu_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_thu_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_tue_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_tue_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_wed_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_melbourne_wed_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_test.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/gym_train.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/raw/Attendance_Clubs_Oct.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/raw/Attendance_Clubs_Sept.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/raw/README.txt
+${PYSITELIB}/nupic/datafiles/extra/gym/raw/all_group1_clubs_detail.csv
+${PYSITELIB}/nupic/datafiles/extra/gym/raw/all_group1_clubs_summaries.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/hotgym.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/joined_mosman_2011.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/joined_mosman_crossvalidation.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/1/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/1/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/1/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/1/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/2/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/2/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/2/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/2/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/3/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/3/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/3/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/3/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/4/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/4/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/4/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/4/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/5/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/5/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/5/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/5/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/6/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/6/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/6/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/6/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/7/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/7/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/7/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/7/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/8/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/8/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/8/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/8/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/9/agg_joined_mosman_test_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/9/agg_joined_mosman_train_hours_24.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/9/joined_mosman_test.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/missingdata/9/joined_mosman_train.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/raw/README.txt
+${PYSITELIB}/nupic/datafiles/extra/hotgym/raw/club_hours.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/raw/gym_input.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/raw/max_temps.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/raw/min_temps.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/rec-center-hourly.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/rec-center.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/test_hotgym.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/train_hotgym.csv
+${PYSITELIB}/nupic/datafiles/extra/hotgym/train_hotgym_2011.csv
+${PYSITELIB}/nupic/datafiles/extra/qa/delta.csv
+${PYSITELIB}/nupic/datafiles/extra/sawtooth/sawtooth.csv
+${PYSITELIB}/nupic/datafiles/extra/sine/sine.csv
+${PYSITELIB}/nupic/datafiles/extra/waveforms/raw/sine.csv
+${PYSITELIB}/nupic/datafiles/extra/waveforms/raw/squareABLong.csv
+${PYSITELIB}/nupic/datafiles/extra/waveforms/raw/squareABSuperExtraLong.csv
+${PYSITELIB}/nupic/datafiles/swarming/test_data.csv
+${PYSITELIB}/nupic/datafiles/waveforms/higherOrder.csv
+${PYSITELIB}/nupic/datafiles/waveforms/multiStepBranch.csv
+${PYSITELIB}/nupic/datafiles/waveforms/rising.csv
 ${PYSITELIB}/nupic/encoders/__init__.py
 ${PYSITELIB}/nupic/encoders/__init__.pyc
 ${PYSITELIB}/nupic/encoders/__init__.pyo
+${PYSITELIB}/nupic/encoders/adaptivescalar.capnp
 ${PYSITELIB}/nupic/encoders/adaptivescalar.py
 ${PYSITELIB}/nupic/encoders/adaptivescalar.pyc
 ${PYSITELIB}/nupic/encoders/adaptivescalar.pyo
-${PYSITELIB}/nupic/encoders/arithmetic_encoder.py
-${PYSITELIB}/nupic/encoders/arithmetic_encoder.pyc
-${PYSITELIB}/nupic/encoders/arithmetic_encoder.pyo
 ${PYSITELIB}/nupic/encoders/base.py
 ${PYSITELIB}/nupic/encoders/base.pyc
 ${PYSITELIB}/nupic/encoders/base.pyo
-${PYSITELIB}/nupic/encoders/bitmaparray.py
-${PYSITELIB}/nupic/encoders/bitmaparray.pyc
-${PYSITELIB}/nupic/encoders/bitmaparray.pyo
+${PYSITELIB}/nupic/encoders/category.capnp
 ${PYSITELIB}/nupic/encoders/category.py
 ${PYSITELIB}/nupic/encoders/category.pyc
 ${PYSITELIB}/nupic/encoders/category.pyo
+${PYSITELIB}/nupic/encoders/coordinate.capnp
 ${PYSITELIB}/nupic/encoders/coordinate.py
 ${PYSITELIB}/nupic/encoders/coordinate.pyc
 ${PYSITELIB}/nupic/encoders/coordinate.pyo
+${PYSITELIB}/nupic/encoders/date.capnp
 ${PYSITELIB}/nupic/encoders/date.py
 ${PYSITELIB}/nupic/encoders/date.pyc
 ${PYSITELIB}/nupic/encoders/date.pyo
+${PYSITELIB}/nupic/encoders/delta.capnp
 ${PYSITELIB}/nupic/encoders/delta.py
 ${PYSITELIB}/nupic/encoders/delta.pyc
 ${PYSITELIB}/nupic/encoders/delta.pyo
-${PYSITELIB}/nupic/encoders/extras/__init__.py
-${PYSITELIB}/nupic/encoders/extras/__init__.pyc
-${PYSITELIB}/nupic/encoders/extras/__init__.pyo
-${PYSITELIB}/nupic/encoders/extras/utility.py
-${PYSITELIB}/nupic/encoders/extras/utility.pyc
-${PYSITELIB}/nupic/encoders/extras/utility.pyo
+${PYSITELIB}/nupic/encoders/geospatial_coordinate.capnp
 ${PYSITELIB}/nupic/encoders/geospatial_coordinate.py
 ${PYSITELIB}/nupic/encoders/geospatial_coordinate.pyc
 ${PYSITELIB}/nupic/encoders/geospatial_coordinate.pyo
+${PYSITELIB}/nupic/encoders/log.capnp
 ${PYSITELIB}/nupic/encoders/logenc.py
 ${PYSITELIB}/nupic/encoders/logenc.pyc
 ${PYSITELIB}/nupic/encoders/logenc.pyo
+${PYSITELIB}/nupic/encoders/multi.capnp
 ${PYSITELIB}/nupic/encoders/multi.py
 ${PYSITELIB}/nupic/encoders/multi.pyc
 ${PYSITELIB}/nupic/encoders/multi.pyo
-${PYSITELIB}/nupic/encoders/nonuniformscalar.py
-${PYSITELIB}/nupic/encoders/nonuniformscalar.pyc
-${PYSITELIB}/nupic/encoders/nonuniformscalar.pyo
-${PYSITELIB}/nupic/encoders/passthru.py
-${PYSITELIB}/nupic/encoders/passthru.pyc
-${PYSITELIB}/nupic/encoders/passthru.pyo
+${PYSITELIB}/nupic/encoders/pass_through.capnp
+${PYSITELIB}/nupic/encoders/pass_through_encoder.py
+${PYSITELIB}/nupic/encoders/pass_through_encoder.pyc
+${PYSITELIB}/nupic/encoders/pass_through_encoder.pyo
+${PYSITELIB}/nupic/encoders/random_distributed_scalar.capnp
 ${PYSITELIB}/nupic/encoders/random_distributed_scalar.py
 ${PYSITELIB}/nupic/encoders/random_distributed_scalar.pyc
 ${PYSITELIB}/nupic/encoders/random_distributed_scalar.pyo
+${PYSITELIB}/nupic/encoders/scalar.capnp
 ${PYSITELIB}/nupic/encoders/scalar.py
 ${PYSITELIB}/nupic/encoders/scalar.pyc
 ${PYSITELIB}/nupic/encoders/scalar.pyo
 ${PYSITELIB}/nupic/encoders/scalarspace.py
 ${PYSITELIB}/nupic/encoders/scalarspace.pyc
 ${PYSITELIB}/nupic/encoders/scalarspace.pyo
+${PYSITELIB}/nupic/encoders/sdrcategory.capnp
 ${PYSITELIB}/nupic/encoders/sdrcategory.py
 ${PYSITELIB}/nupic/encoders/sdrcategory.pyc
 ${PYSITELIB}/nupic/encoders/sdrcategory.pyo
-${PYSITELIB}/nupic/encoders/sdrrandom.py
-${PYSITELIB}/nupic/encoders/sdrrandom.pyc
-${PYSITELIB}/nupic/encoders/sdrrandom.pyo
+${PYSITELIB}/nupic/encoders/sparse_pass_through_encoder.capnp
+${PYSITELIB}/nupic/encoders/sparse_pass_through_encoder.py
+${PYSITELIB}/nupic/encoders/sparse_pass_through_encoder.pyc
+${PYSITELIB}/nupic/encoders/sparse_pass_through_encoder.pyo
 ${PYSITELIB}/nupic/encoders/utils.py
 ${PYSITELIB}/nupic/encoders/utils.pyc
 ${PYSITELIB}/nupic/encoders/utils.pyo
-${PYSITELIB}/nupic/encoders/vector.py
-${PYSITELIB}/nupic/encoders/vector.pyc
-${PYSITELIB}/nupic/encoders/vector.pyo
 ${PYSITELIB}/nupic/engine/__init__.py
 ${PYSITELIB}/nupic/engine/__init__.pyc
 ${PYSITELIB}/nupic/engine/__init__.pyo
+${PYSITELIB}/nupic/engine/common_networks/__init__.py
+${PYSITELIB}/nupic/engine/common_networks/__init__.pyc
+${PYSITELIB}/nupic/engine/common_networks/__init__.pyo
 ${PYSITELIB}/nupic/frameworks/__init__.py
 ${PYSITELIB}/nupic/frameworks/__init__.pyc
 ${PYSITELIB}/nupic/frameworks/__init__.pyo
@@ -195,16 +309,16 @@ ${PYSITELIB}/nupic/frameworks/opf/clamodelcallbacks.pyo
 ${PYSITELIB}/nupic/frameworks/opf/client.py
 ${PYSITELIB}/nupic/frameworks/opf/client.pyc
 ${PYSITELIB}/nupic/frameworks/opf/client.pyo
+${PYSITELIB}/nupic/frameworks/opf/common_models/__init__.py
+${PYSITELIB}/nupic/frameworks/opf/common_models/__init__.pyc
+${PYSITELIB}/nupic/frameworks/opf/common_models/__init__.pyo
+${PYSITELIB}/nupic/frameworks/opf/common_models/anomaly_params_random_encoder/best_single_metric_anomaly_params.json
+${PYSITELIB}/nupic/frameworks/opf/common_models/cluster_params.py
+${PYSITELIB}/nupic/frameworks/opf/common_models/cluster_params.pyc
+${PYSITELIB}/nupic/frameworks/opf/common_models/cluster_params.pyo
 ${PYSITELIB}/nupic/frameworks/opf/exceptions.py
 ${PYSITELIB}/nupic/frameworks/opf/exceptions.pyc
 ${PYSITELIB}/nupic/frameworks/opf/exceptions.pyo
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/ExpGenerator.py
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/ExpGenerator.pyc
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/ExpGenerator.pyo
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/__init__.py
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/__init__.pyc
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/__init__.pyo
-${PYSITELIB}/nupic/frameworks/opf/exp_generator/opfExperimentControlTemplate.py
 ${PYSITELIB}/nupic/frameworks/opf/expdescriptionapi.py
 ${PYSITELIB}/nupic/frameworks/opf/expdescriptionapi.pyc
 ${PYSITELIB}/nupic/frameworks/opf/expdescriptionapi.pyo
@@ -217,6 +331,11 @@ ${PYSITELIB}/nupic/frameworks/opf/experiment_runner.pyo
 ${PYSITELIB}/nupic/frameworks/opf/jsonschema/__init__.py
 ${PYSITELIB}/nupic/frameworks/opf/jsonschema/__init__.pyc
 ${PYSITELIB}/nupic/frameworks/opf/jsonschema/__init__.pyo
+${PYSITELIB}/nupic/frameworks/opf/jsonschema/nupicControlSchema.json
+${PYSITELIB}/nupic/frameworks/opf/jsonschema/opfLoggingPreferencesSchema.json
+${PYSITELIB}/nupic/frameworks/opf/jsonschema/opfTaskControlSchema.json
+${PYSITELIB}/nupic/frameworks/opf/jsonschema/opfTaskSchema.json
+${PYSITELIB}/nupic/frameworks/opf/jsonschema/stream_def.json
 ${PYSITELIB}/nupic/frameworks/opf/metrics.py
 ${PYSITELIB}/nupic/frameworks/opf/metrics.pyc
 ${PYSITELIB}/nupic/frameworks/opf/metrics.pyo
@@ -259,12 +378,6 @@ ${PYSITELIB}/nupic/frameworks/opf/safe_interpreter.pyo
 ${PYSITELIB}/nupic/frameworks/opf/two_gram_model.py
 ${PYSITELIB}/nupic/frameworks/opf/two_gram_model.pyc
 ${PYSITELIB}/nupic/frameworks/opf/two_gram_model.pyo
-${PYSITELIB}/nupic/image/__init__.py
-${PYSITELIB}/nupic/image/__init__.pyc
-${PYSITELIB}/nupic/image/__init__.pyo
-${PYSITELIB}/nupic/math/MCMC.py
-${PYSITELIB}/nupic/math/MCMC.pyc
-${PYSITELIB}/nupic/math/MCMC.pyo
 ${PYSITELIB}/nupic/math/__init__.py
 ${PYSITELIB}/nupic/math/__init__.pyc
 ${PYSITELIB}/nupic/math/__init__.pyo
@@ -289,222 +402,20 @@ ${PYSITELIB}/nupic/math/roc_utils.pyo
 ${PYSITELIB}/nupic/math/stats.py
 ${PYSITELIB}/nupic/math/stats.pyc
 ${PYSITELIB}/nupic/math/stats.pyo
+${PYSITELIB}/nupic/movingaverage.capnp
+${PYSITELIB}/nupic/regions/AnomalyRegion.capnp
+${PYSITELIB}/nupic/regions/AnomalyRegion.py
+${PYSITELIB}/nupic/regions/AnomalyRegion.pyc
+${PYSITELIB}/nupic/regions/AnomalyRegion.pyo
 ${PYSITELIB}/nupic/regions/CLAClassifierRegion.py
 ${PYSITELIB}/nupic/regions/CLAClassifierRegion.pyc
 ${PYSITELIB}/nupic/regions/CLAClassifierRegion.pyo
-${PYSITELIB}/nupic/regions/ImageSensor.py
-${PYSITELIB}/nupic/regions/ImageSensor.pyc
-${PYSITELIB}/nupic/regions/ImageSensor.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BaseExplorer.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BaseExplorer.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BaseExplorer.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BlockSpread.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BlockSpread.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/BlockSpread.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/CrossSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/CrossSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/CrossSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ExhaustiveSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ExhaustiveSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ExhaustiveSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/EyeMovements.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/EyeMovements.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/EyeMovements.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Flash.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Flash.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Flash.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ImageSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ImageSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ImageSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/InwardSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/InwardSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/InwardSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Jiggle.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Jiggle.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/Jiggle.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ManualSaliency.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ManualSaliency.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ManualSaliency.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/MultiSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/MultiSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/MultiSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionBlock.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionBlock.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionBlock.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/OnionSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/PatrolSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/PatrolSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/PatrolSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomEyeMovements.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomEyeMovements.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomEyeMovements.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomFlash.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomFlash.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomFlash.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomJump.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomJump.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomJump.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RandomSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RepetitiveSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RepetitiveSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/RepetitiveSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/SpiralSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/SpiralSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/SpiralSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ToCenterSweep.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ToCenterSweep.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/ToCenterSweep.pyo
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/__init__.py
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/__init__.pyc
-${PYSITELIB}/nupic/regions/ImageSensorExplorers/__init__.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddBackgroundImage.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddBackgroundImage.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddBackgroundImage.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddNoise.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddNoise.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AddNoise.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AffineTransform.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AffineTransform.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/AffineTransform.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BaseFilter.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BaseFilter.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BaseFilter.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BoxFixer.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BoxFixer.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/BoxFixer.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Brightness.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Brightness.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Brightness.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenterSurroundConvolution.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenterSurroundConvolution.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenterSurroundConvolution.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenteredMultipleScales.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenteredMultipleScales.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/CenteredMultipleScales.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Contrast.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Contrast.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Contrast.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Convolution.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Convolution.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Convolution.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Crop.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Crop.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Crop.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/EqualizeHistogram.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/EqualizeHistogram.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/EqualizeHistogram.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/FillBackground.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/FillBackground.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/FillBackground.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Flip.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Flip.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Flip.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborConvolution.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborConvolution.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborConvolution.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborFilter.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborFilter.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaborFilter.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaussianBlur.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaussianBlur.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/GaussianBlur.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Gradient.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Gradient.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Gradient.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/HistogramShift.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/HistogramShift.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/HistogramShift.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Lines.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Lines.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Lines.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/LogPolar.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/LogPolar.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/LogPolar.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Mirror.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Mirror.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Mirror.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/MultipleScales.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/MultipleScales.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/MultipleScales.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/NormalizeContrast.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/NormalizeContrast.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/NormalizeContrast.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Occlusion.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Occlusion.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Occlusion.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/PadToFit.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/PadToFit.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/PadToFit.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Resize.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Resize.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Resize.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Rotation2D.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Rotation2D.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Rotation2D.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/ScaleToFit.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/ScaleToFit.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/ScaleToFit.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Thicken.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Thicken.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Thicken.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Tracking.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Tracking.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/Tracking.pyo
-${PYSITELIB}/nupic/regions/ImageSensorFilters/__init__.py
-${PYSITELIB}/nupic/regions/ImageSensorFilters/__init__.pyc
-${PYSITELIB}/nupic/regions/ImageSensorFilters/__init__.pyo
 ${PYSITELIB}/nupic/regions/KNNAnomalyClassifierRegion.py
 ${PYSITELIB}/nupic/regions/KNNAnomalyClassifierRegion.pyc
 ${PYSITELIB}/nupic/regions/KNNAnomalyClassifierRegion.pyo
 ${PYSITELIB}/nupic/regions/KNNClassifierRegion.py
 ${PYSITELIB}/nupic/regions/KNNClassifierRegion.pyc
 ${PYSITELIB}/nupic/regions/KNNClassifierRegion.pyo
-${PYSITELIB}/nupic/regions/PCANode.py
-${PYSITELIB}/nupic/regions/PCANode.pyc
-${PYSITELIB}/nupic/regions/PCANode.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/HorizontalBlock.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/HorizontalBlock.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/HorizontalBlock.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/__init__.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/__init__.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/__init__.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block1DOF.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block1DOF.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/block1DOF.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/blockSpread.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/blockSpread.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/blockSpread.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/center.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/center.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/center.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/horizontal.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/horizontal.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/horizontal.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/inward.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/inward.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/inward.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random1DOF.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random1DOF.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/random1DOF.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate_block.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate_block.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/rotate_block.pyo
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/vertical.py
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/vertical.pyc
-${PYSITELIB}/nupic/regions/PictureSensorExplorers/vertical.pyo
 ${PYSITELIB}/nupic/regions/PyRegion.py
 ${PYSITELIB}/nupic/regions/PyRegion.pyc
 ${PYSITELIB}/nupic/regions/PyRegion.pyo
@@ -539,63 +450,68 @@ ${PYSITELIB}/nupic/regions/TestRegion.py
 ${PYSITELIB}/nupic/regions/TestRegion.pyc
 ${PYSITELIB}/nupic/regions/TestRegion.pyo
 ${PYSITELIB}/nupic/regions/UnimportableNode.py
+${PYSITELIB}/nupic/regions/UnimportableNode.pyc
+${PYSITELIB}/nupic/regions/UnimportableNode.pyo
 ${PYSITELIB}/nupic/regions/__init__.py
 ${PYSITELIB}/nupic/regions/__init__.pyc
 ${PYSITELIB}/nupic/regions/__init__.pyo
-${PYSITELIB}/nupic/regions/extra/GaborNode2.py
-${PYSITELIB}/nupic/regions/extra/GaborNode2.pyc
-${PYSITELIB}/nupic/regions/extra/GaborNode2.pyo
 ${PYSITELIB}/nupic/regions/extra/__init__.py
 ${PYSITELIB}/nupic/regions/extra/__init__.pyc
 ${PYSITELIB}/nupic/regions/extra/__init__.pyo
-${PYSITELIB}/nupic/research/DataGenerator.py
-${PYSITELIB}/nupic/research/DataGenerator.pyc
-${PYSITELIB}/nupic/research/DataGenerator.pyo
-${PYSITELIB}/nupic/research/FDRCSpatial2.py
-${PYSITELIB}/nupic/research/FDRCSpatial2.pyc
-${PYSITELIB}/nupic/research/FDRCSpatial2.pyo
-${PYSITELIB}/nupic/research/ObjDiff.py
-${PYSITELIB}/nupic/research/ObjDiff.pyc
-${PYSITELIB}/nupic/research/ObjDiff.pyo
 ${PYSITELIB}/nupic/research/TP.py
 ${PYSITELIB}/nupic/research/TP.pyc
 ${PYSITELIB}/nupic/research/TP.pyo
 ${PYSITELIB}/nupic/research/TP10X2.py
 ${PYSITELIB}/nupic/research/TP10X2.pyc
 ${PYSITELIB}/nupic/research/TP10X2.pyo
-${PYSITELIB}/nupic/research/TPTrivial.py
-${PYSITELIB}/nupic/research/TPTrivial.pyc
-${PYSITELIB}/nupic/research/TPTrivial.pyo
-${PYSITELIB}/nupic/research/TrainingHooks.py
-${PYSITELIB}/nupic/research/TrainingHooks.pyc
-${PYSITELIB}/nupic/research/TrainingHooks.pyo
-${PYSITELIB}/nupic/research/TrivialPredictor.py
-${PYSITELIB}/nupic/research/TrivialPredictor.pyc
-${PYSITELIB}/nupic/research/TrivialPredictor.pyo
+${PYSITELIB}/nupic/research/TP_shim.py
+${PYSITELIB}/nupic/research/TP_shim.pyc
+${PYSITELIB}/nupic/research/TP_shim.pyo
 ${PYSITELIB}/nupic/research/__init__.py
 ${PYSITELIB}/nupic/research/__init__.pyc
 ${PYSITELIB}/nupic/research/__init__.pyo
-${PYSITELIB}/nupic/research/anomalyzer.py
-${PYSITELIB}/nupic/research/anomalyzer.pyc
-${PYSITELIB}/nupic/research/anomalyzer.pyo
-${PYSITELIB}/nupic/research/distributions.py
-${PYSITELIB}/nupic/research/distributions.pyc
-${PYSITELIB}/nupic/research/distributions.pyo
+${PYSITELIB}/nupic/research/connections.py
+${PYSITELIB}/nupic/research/connections.pyc
+${PYSITELIB}/nupic/research/connections.pyo
+${PYSITELIB}/nupic/research/fast_temporal_memory.py
+${PYSITELIB}/nupic/research/fast_temporal_memory.pyc
+${PYSITELIB}/nupic/research/fast_temporal_memory.pyo
 ${PYSITELIB}/nupic/research/fdrutilities.py
 ${PYSITELIB}/nupic/research/fdrutilities.pyc
 ${PYSITELIB}/nupic/research/fdrutilities.pyo
-${PYSITELIB}/nupic/research/flat_spatial_pooler.py
-${PYSITELIB}/nupic/research/flat_spatial_pooler.pyc
-${PYSITELIB}/nupic/research/flat_spatial_pooler.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/__init__.py
+${PYSITELIB}/nupic/research/monitor_mixin/__init__.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/__init__.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/metric.py
+${PYSITELIB}/nupic/research/monitor_mixin/metric.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/metric.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/monitor_mixin_base.py
+${PYSITELIB}/nupic/research/monitor_mixin/monitor_mixin_base.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/monitor_mixin_base.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/plot.py
+${PYSITELIB}/nupic/research/monitor_mixin/plot.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/plot.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/temporal_memory_monitor_mixin.py
+${PYSITELIB}/nupic/research/monitor_mixin/temporal_memory_monitor_mixin.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/temporal_memory_monitor_mixin.pyo
+${PYSITELIB}/nupic/research/monitor_mixin/trace.py
+${PYSITELIB}/nupic/research/monitor_mixin/trace.pyc
+${PYSITELIB}/nupic/research/monitor_mixin/trace.pyo
 ${PYSITELIB}/nupic/research/spatial_pooler.py
 ${PYSITELIB}/nupic/research/spatial_pooler.pyc
 ${PYSITELIB}/nupic/research/spatial_pooler.pyo
+${PYSITELIB}/nupic/research/temporal_memory.py
+${PYSITELIB}/nupic/research/temporal_memory.pyc
+${PYSITELIB}/nupic/research/temporal_memory.pyo
+${PYSITELIB}/nupic/research/temporal_memory_shim.py
+${PYSITELIB}/nupic/research/temporal_memory_shim.pyc
+${PYSITELIB}/nupic/research/temporal_memory_shim.pyo
 ${PYSITELIB}/nupic/research/utils.py
 ${PYSITELIB}/nupic/research/utils.pyc
 ${PYSITELIB}/nupic/research/utils.pyo
-${PYSITELIB}/nupic/support/ExtendedLogger.py
-${PYSITELIB}/nupic/support/ExtendedLogger.pyc
-${PYSITELIB}/nupic/support/ExtendedLogger.pyo
+${PYSITELIB}/nupic/simple_server.py
+${PYSITELIB}/nupic/simple_server.pyc
+${PYSITELIB}/nupic/simple_server.pyo
 ${PYSITELIB}/nupic/support/__init__.py
 ${PYSITELIB}/nupic/support/__init__.pyc
 ${PYSITELIB}/nupic/support/__init__.pyo
@@ -620,9 +536,6 @@ ${PYSITELIB}/nupic/support/decorators.pyo
 ${PYSITELIB}/nupic/support/enum.py
 ${PYSITELIB}/nupic/support/enum.pyc
 ${PYSITELIB}/nupic/support/enum.pyo
-${PYSITELIB}/nupic/support/errorcodes.py
-${PYSITELIB}/nupic/support/errorcodes.pyc
-${PYSITELIB}/nupic/support/errorcodes.pyo
 ${PYSITELIB}/nupic/support/exceptions.py
 ${PYSITELIB}/nupic/support/exceptions.pyc
 ${PYSITELIB}/nupic/support/exceptions.pyo
@@ -638,12 +551,6 @@ ${PYSITELIB}/nupic/support/features_list.pyo
 ${PYSITELIB}/nupic/support/fshelpers.py
 ${PYSITELIB}/nupic/support/fshelpers.pyc
 ${PYSITELIB}/nupic/support/fshelpers.pyo
-${PYSITELIB}/nupic/support/lint/__init__.py
-${PYSITELIB}/nupic/support/lint/__init__.pyc
-${PYSITELIB}/nupic/support/lint/__init__.pyo
-${PYSITELIB}/nupic/support/lint/executable.py
-${PYSITELIB}/nupic/support/lint/executable.pyc
-${PYSITELIB}/nupic/support/lint/executable.pyo
 ${PYSITELIB}/nupic/support/lockattributes.py
 ${PYSITELIB}/nupic/support/lockattributes.pyc
 ${PYSITELIB}/nupic/support/lockattributes.pyo
@@ -653,15 +560,10 @@ ${PYSITELIB}/nupic/support/log_utils.pyo
 ${PYSITELIB}/nupic/support/loophelpers.py
 ${PYSITELIB}/nupic/support/loophelpers.pyc
 ${PYSITELIB}/nupic/support/loophelpers.pyo
-${PYSITELIB}/nupic/support/object_json.py
-${PYSITELIB}/nupic/support/object_json.pyc
-${PYSITELIB}/nupic/support/object_json.pyo
+${PYSITELIB}/nupic/support/nupic-default.xml
 ${PYSITELIB}/nupic/support/pymysqlhelpers.py
 ${PYSITELIB}/nupic/support/pymysqlhelpers.pyc
 ${PYSITELIB}/nupic/support/pymysqlhelpers.pyo
-${PYSITELIB}/nupic/support/resources/__init__.py
-${PYSITELIB}/nupic/support/resources/__init__.pyc
-${PYSITELIB}/nupic/support/resources/__init__.pyo
 ${PYSITELIB}/nupic/support/serializationutils.py
 ${PYSITELIB}/nupic/support/serializationutils.pyc
 ${PYSITELIB}/nupic/support/serializationutils.pyo
@@ -677,12 +579,12 @@ ${PYSITELIB}/nupic/support/unittesthelpers/testcasebase.pyo
 ${PYSITELIB}/nupic/swarming/DummyModelRunner.py
 ${PYSITELIB}/nupic/swarming/DummyModelRunner.pyc
 ${PYSITELIB}/nupic/swarming/DummyModelRunner.pyo
+${PYSITELIB}/nupic/swarming/ExtendedLogger.py
+${PYSITELIB}/nupic/swarming/ExtendedLogger.pyc
+${PYSITELIB}/nupic/swarming/ExtendedLogger.pyo
 ${PYSITELIB}/nupic/swarming/HypersearchV2.py
 ${PYSITELIB}/nupic/swarming/HypersearchV2.pyc
 ${PYSITELIB}/nupic/swarming/HypersearchV2.pyo
-${PYSITELIB}/nupic/swarming/HypersearchV2Dump.py
-${PYSITELIB}/nupic/swarming/HypersearchV2Dump.pyc
-${PYSITELIB}/nupic/swarming/HypersearchV2Dump.pyo
 ${PYSITELIB}/nupic/swarming/HypersearchWorker.py
 ${PYSITELIB}/nupic/swarming/HypersearchWorker.pyc
 ${PYSITELIB}/nupic/swarming/HypersearchWorker.pyo
@@ -698,9 +600,42 @@ ${PYSITELIB}/nupic/swarming/__init__.pyo
 ${PYSITELIB}/nupic/swarming/api.py
 ${PYSITELIB}/nupic/swarming/api.pyc
 ${PYSITELIB}/nupic/swarming/api.pyo
+${PYSITELIB}/nupic/swarming/exp_generator/ExpGenerator.py
+${PYSITELIB}/nupic/swarming/exp_generator/ExpGenerator.pyc
+${PYSITELIB}/nupic/swarming/exp_generator/ExpGenerator.pyo
+${PYSITELIB}/nupic/swarming/exp_generator/__init__.py
+${PYSITELIB}/nupic/swarming/exp_generator/__init__.pyc
+${PYSITELIB}/nupic/swarming/exp_generator/__init__.pyo
+${PYSITELIB}/nupic/swarming/exp_generator/claDescriptionTemplate.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/descriptionTemplate.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/experimentDescriptionSchema.json
+${PYSITELIB}/nupic/swarming/exp_generator/nupicEnvironmentTemplate.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/opfExperimentTemplate.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/permutationsTemplateEnsemble.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/permutationsTemplateV1.tpl
+${PYSITELIB}/nupic/swarming/exp_generator/permutationsTemplateV2.tpl
+${PYSITELIB}/nupic/swarming/hypersearch/__init__.py
+${PYSITELIB}/nupic/swarming/hypersearch/__init__.pyc
+${PYSITELIB}/nupic/swarming/hypersearch/__init__.pyo
+${PYSITELIB}/nupic/swarming/hypersearch/errorcodes.py
+${PYSITELIB}/nupic/swarming/hypersearch/errorcodes.pyc
+${PYSITELIB}/nupic/swarming/hypersearch/errorcodes.pyo
+${PYSITELIB}/nupic/swarming/hypersearch/experimentutils.py
+${PYSITELIB}/nupic/swarming/hypersearch/experimentutils.pyc
+${PYSITELIB}/nupic/swarming/hypersearch/experimentutils.pyo
+${PYSITELIB}/nupic/swarming/hypersearch/utils.py
+${PYSITELIB}/nupic/swarming/hypersearch/utils.pyc
+${PYSITELIB}/nupic/swarming/hypersearch/utils.pyo
+${PYSITELIB}/nupic/swarming/jsonschema/__init__.py
+${PYSITELIB}/nupic/swarming/jsonschema/__init__.pyc
+${PYSITELIB}/nupic/swarming/jsonschema/__init__.pyo
+${PYSITELIB}/nupic/swarming/jsonschema/jobParamsSchema.json
 ${PYSITELIB}/nupic/swarming/modelchooser.py
 ${PYSITELIB}/nupic/swarming/modelchooser.pyc
 ${PYSITELIB}/nupic/swarming/modelchooser.pyo
+${PYSITELIB}/nupic/swarming/object_json.py
+${PYSITELIB}/nupic/swarming/object_json.pyc
+${PYSITELIB}/nupic/swarming/object_json.pyo
 ${PYSITELIB}/nupic/swarming/permutationhelpers.py
 ${PYSITELIB}/nupic/swarming/permutationhelpers.pyc
 ${PYSITELIB}/nupic/swarming/permutationhelpers.pyo
@@ -710,12 +645,15 @@ ${PYSITELIB}/nupic/swarming/permutations_runner.pyo
 ${PYSITELIB}/nupic/swarming/regression.py
 ${PYSITELIB}/nupic/swarming/regression.pyc
 ${PYSITELIB}/nupic/swarming/regression.pyo
-${PYSITELIB}/nupic/swarming/utils.py
-${PYSITELIB}/nupic/swarming/utils.pyc
-${PYSITELIB}/nupic/swarming/utils.pyo
 ${PYSITELIB}/nupic/test/__init__.py
 ${PYSITELIB}/nupic/test/__init__.pyc
 ${PYSITELIB}/nupic/test/__init__.pyo
+${PYSITELIB}/nupic/test/abstract_temporal_memory_test.py
+${PYSITELIB}/nupic/test/abstract_temporal_memory_test.pyc
+${PYSITELIB}/nupic/test/abstract_temporal_memory_test.pyo
 ${PYSITELIB}/nupic/test/test_framework_helpers.py
 ${PYSITELIB}/nupic/test/test_framework_helpers.pyc
 ${PYSITELIB}/nupic/test/test_framework_helpers.pyo
+${PYSITELIB}/nupic/utils.py
+${PYSITELIB}/nupic/utils.pyc
+${PYSITELIB}/nupic/utils.pyo
diff --git a/py-nupic/distinfo b/py-nupic/distinfo
index d3da8a3..782b974 100644
--- a/py-nupic/distinfo
+++ b/py-nupic/distinfo
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.1 2014/07/26 09:50:17 jihbed Exp $
 
-SHA1 (nupic-0.1.0.tar.gz) = d2453973909be193624ce474d726e367e74aff43
-RMD160 (nupic-0.1.0.tar.gz) = 6ca6c0cc8297e02cc5f34732fb2be9da57b2aee8
-Size (nupic-0.1.0.tar.gz) = 761911 bytes
-SHA1 (patch-setup.py) = 50fd4e8dbfd03e9d704e7b8e299d375bc06df4cc
+SHA1 (nupic-0.3.4.tar.gz) = bed383c8422eaffa9ed921d0147c3cc39d45b7f2
+RMD160 (nupic-0.3.4.tar.gz) = 23dab4681bc4cad5b04afebaec132f475332647f
+Size (nupic-0.3.4.tar.gz) = 671744 bytes
diff --git a/py-nupic/patches/patch-setup.py b/py-nupic/patches/patch-setup.py
deleted file mode 100644
index 6eb0604..0000000
--- a/py-nupic/patches/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2014/07/26 09:50:17 jihbed Exp $
-
---- setup.py.orig	2014-07-26 10:42:53.000000000 +0100
-+++ setup.py	2014-07-26 10:46:30.000000000 +0100
-@@ -115,6 +115,4 @@
- 
- 
- # Build and setup NuPIC
--if mustBuildExtensions:
--  build_extensions_nupic()
- setup_nupic()