From 7f84d81dfe5f329666567780dbf6bcc1b682115e Mon Sep 17 00:00:00 2001
From: cogmission <cognitionmission@gmail.com>
Date: Sat, 21 Nov 2015 06:39:00 -0600
Subject: [PATCH] Fix for generic observable execution order

---
 src/main/java/org/numenta/nupic/network/Layer.java     | 2 ++
 src/test/java/org/numenta/nupic/network/LayerTest.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/numenta/nupic/network/Layer.java b/src/main/java/org/numenta/nupic/network/Layer.java
index 804d6811..5b497b7c 100644
--- a/src/main/java/org/numenta/nupic/network/Layer.java
+++ b/src/main/java/org/numenta/nupic/network/Layer.java
@@ -1585,6 +1585,8 @@ private Observable<ManualInput> fillInSequence(Observable<ManualInput> o) {
      */
     @SuppressWarnings("unchecked")
     private Observable<ManualInput> fillInOrderedSequence(Observable<ManualInput> o) {
+        Collections.reverse(addedItems);
+        
         for(Object node : addedItems) {
             if(node instanceof Func1<?, ?>) {
                 o = o.map((Func1<ManualInput, ManualInput>)node);
diff --git a/src/test/java/org/numenta/nupic/network/LayerTest.java b/src/test/java/org/numenta/nupic/network/LayerTest.java
index 11a5c881..3ae753be 100644
--- a/src/test/java/org/numenta/nupic/network/LayerTest.java
+++ b/src/test/java/org/numenta/nupic/network/LayerTest.java
@@ -482,11 +482,11 @@ public void testLayerWithGenericObservable() {
             public void onNext(Inference i) {
                 if(test == 0) {
                     assertTrue(Arrays.equals(expected0, i.getSDR()));
-                    assertEquals("Interposed: [1, 1, 0, 0, 0, 0, 0, 1]", i.getCustomObject());
+                    assertEquals("Interposed: [0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0]", i.getCustomObject());
                 }
                 if(test == 1) {
                     assertTrue(Arrays.equals(expected1, i.getSDR()));
-                    assertEquals("Interposed: [1, 1, 1, 0, 0, 0, 0, 0]", i.getCustomObject());
+                    assertEquals("Interposed: [0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0]", i.getCustomObject());
                 }
                 ++test; 
             }