Skip to content

TM Connections integration #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breznak merged 44 commits into from
Jul 18, 2019
Merged

TM Connections integration #537

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
103e8fc
destroySynapse: const arg
breznak Jul 1, 2019
b6a103a
TM: fix when custom minPermanence
breznak Jul 1, 2019
cc476a9
COnnections: adaptSegment: deduplicate code for timeseries
breznak Jul 2, 2019
21c315c
Connections: adaptSegment fix hardcoded minPermanence
breznak Jul 2, 2019
cdcf5df
TM:adaptSegment make similar to connections'
breznak Jul 2, 2019
dd45567
TM:adaptSegment uses connections', WIP
breznak Jul 2, 2019
34401b4
Connections:adaptSegment allow to prune zero synapses
breznak Jul 2, 2019
8607710
TM: adaptSegment use SDR for prevActiveCells to match Connections
breznak Jul 2, 2019
f6f029e
Connections:adaptSegment remove empty segments
breznak Jul 2, 2019
14871c9
SegmentData has simple default constructor
breznak Jul 2, 2019
a25040c
Connections:createSegment can check for maxSegmentsPerCell
breznak Jul 2, 2019
9648ae0
TM: move lastUsedIterationForSegment to SegmentData.lastUsed
breznak Jul 2, 2019
e20c267
TM uses Connections' createSegment
breznak Jul 2, 2019
24b2c36
Connections: add const + fix tests
breznak Jul 2, 2019
abb8f96
comment
breznak Jul 2, 2019
cbf0d38
Hotgym: print connections stats for SP, TM
breznak Jul 3, 2019
dac487a
Connections: print stats on usage of pruned Segs, Syns
breznak Jul 3, 2019
47eb418
Hotgym: add Metrics for SDRs from SP, TM, Input
breznak Jul 3, 2019
cccc3e5
Connection:createSegment fix check for maxSegmentsPerCell
breznak Jul 5, 2019
8a1e871
COnnections:createSegment make sort deterministic
breznak Jul 5, 2019
e8fb520
Connections: make sort statements deterministic
breznak Jul 5, 2019
37e7a13
COnnections: make createSegment maxSegments default to disabled
breznak Jul 5, 2019
023ed97
Merge branch 'master_community' into tm_conn
breznak Jul 6, 2019
629db2f
Merge branch 'master_community' into tm_conn
breznak Jul 6, 2019
d7ba1a9
Merge branch 'master_community' into tm_conn
breznak Jul 9, 2019
60a384e
TM: optimize growSynapses
breznak Jul 9, 2019
0188242
Merge branch 'master_community' into tm_conn
breznak Jul 10, 2019
c95c177
Connections: guard adaptSegment remove segment with pruneZeroSynapses
breznak Jul 10, 2019
4672daf
Connections: move iteration from TM
breznak Jul 10, 2019
95b8b6d
Conn: segment ordinals are never same for a != b
breznak Jul 10, 2019
b5498f3
COnnections: prune segment if it never can connect again
breznak Jul 10, 2019
6e07f06
TM code comments
breznak Jul 10, 2019
184ad2c
TM:getLeastUsedCells improve doc
breznak Jul 11, 2019
36ed0ca
TM: add explanation for synapses only on new, unsynapsed segments
breznak Jul 12, 2019
be38786
Merge branch 'master_community' into tm_conn
breznak Jul 12, 2019
d20c9e8
Merge branch 'master' into tm_conn
breznak Jul 13, 2019
2f16fb3
Merge branch 'master_community' into tm_conn
breznak Jul 13, 2019
5fe3697
Connections: some more const
breznak Jul 13, 2019
425f12c
Merge branch 'tm_conn' of https://github.com/htm-community/nupic.core…
breznak Jul 13, 2019
d3186ed
update determ output results
breznak Jul 14, 2019
fc38d89
Conn: synapseOrdinals_ moved to SynapseData
breznak Jul 14, 2019
5b368d8
Conn: move segment ordinals (id) to SegmentData
breznak Jul 13, 2019
065b467
Merge branch 'master_community' into tm_conn
breznak Jul 18, 2019
24983cf
fixup Connections:destroySegment use find
breznak Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/htm/algorithms/Connections.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,11 @@ void Connections::destroySegment(const Segment segment) {

CellData &cellData = cells_[segmentData.cell];

const auto segmentOnCell =
std::lower_bound(cellData.segments.cbegin(), cellData.segments.cend(),
segment,
[&](const Segment a, const Segment b) {
return dataForSegment(a).id < dataForSegment(b).id;
});

NTA_ASSERT(segmentOnCell != cellData.segments.end());
const auto segmentOnCell = std::find(cellData.segments.cbegin(), cellData.segments.cend(), segment);
Copy link
Copy Markdown
Member Author

@breznak breznak Jul 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the error was dumb, comparing const iterator above with .segments.end() here.
Replaced with a simpler find that does not require extra sorting.

NTA_ASSERT(segmentOnCell != cellData.segments.cend()) << "Segment to be destroyed not found on the cell!";
NTA_ASSERT(*segmentOnCell == segment);

cellData.segments.erase(segmentOnCell);

destroyedSegments_.push_back(segment);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/unit/algorithms/TemporalMemoryTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ TEST(TemporalMemoryTest, CreateSegmentDestroyOld) {
* Hit the maxSegmentsPerCell threshold multiple times. Make sure it works
* more than once.
*/
TEST(ConnectionsTest, ReachSegmentLimitMultipleTimes) {
TEST(TemporalMemoryTest, ReachSegmentLimitMultipleTimes) {
TemporalMemory tm(
/*columnDimensions*/ {32},
/*cellsPerColumn*/ 1,
Expand Down