Thread: [Openlcb-svn-commits] SF.net SVN: openlcb:[124] trunk/prototypes/java

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 124
          http://openlcb.svn.sourceforge.net/openlcb/?rev=124&view=rev
Author:   jacobsen
Date:     2009-11-09 06:05:33 +0000 (Mon, 09 Nov 2009)

Log Message:
-----------
tests run with 21bit

Modified Paths:
--------------
    trunk/prototypes/java/src/org/nmra/net/can/NIDa.java
    trunk/prototypes/java/src/org/nmra/net/can/NIDaAlgorithm.java
    trunk/prototypes/java/src/org/nmra/net/can/NmraNetCanFrame.java
    trunk/prototypes/java/test/org/nmra/net/can/NIDaAlgorithmTest.java
    trunk/prototypes/java/test/org/nmra/net/can/NIDaTest.java

Modified: trunk/prototypes/java/src/org/nmra/net/can/NIDa.java
===================================================================

--- trunk/prototypes/java/src/org/nmra/net/can/NIDa.java	2009-11-09 06:02:43 UTC (rev 123)
+++ trunk/prototypes/java/src/org/nmra/net/can/NIDa.java	2009-11-09 06:05:33 UTC (rev 124)
@@ -67,21 +67,12 @@
         this.nid = nid;
         byte[] id = this.nid.getContents();
 
-        // simplest starting point
-        //reg = id[0]+id[1]+id[2]+id[3]+id[4]+id[5];
-
-        // prototype v1
-        reg = id[0] ^ id[1] <<5 ^ id[2] <<10 ^ id[3] <<15 ^ id[4] << 20 ^ id[5] << 24;
-        if (reg == 0)
-            reg = ( id[0] << 23)+(id[1] << 19)+(id[2] << 15)+(id[3] << 11)+(id[4] << 7)+id[5];
-        if (reg == 0)
-            reg = 0xAC01;
-
-        // prototype v2
-        reg = id[0] ^ (id[1] <<5) ^ (id[2] <<10) ^ (id[3] <<15) 
-                    ^ (id[4] << 20) ^ (id[5] << 24) 
-                    ^ ((id[3]^id[4]^id[5])<<8);
-
+        reg =   ((id[0] & 0xff) << 40)
+              | ((id[1] & 0xff) << 32)
+              | ((id[2] & 0xff) << 24)
+              | ((id[3] & 0xff) << 16)
+              | ((id[4] & 0xff) <<  8)
+              | ((id[5] & 0xff) <<  0);
     }
     
     /**
@@ -89,34 +80,22 @@
      */
     protected void stepGenerator() {
         
-        // 16-bit shift register PRNG algorithm from e.g.
-        // <a href="http://en.wikipedia.org/wiki/Linear_feedback_shift_register">Wikipedia Linear Feedback Shift Register</a> page.
-        //long bit = (reg & 0x0001) ^
-        //    ((reg & 0x0004) >> 2) ^
-        //    ((reg & 0x0008) >> 3) ^
-        //    ((reg & 0x0020) >> 5);
-        //reg = (reg >> 1) | (bit << 15);
-
-        // prototype V1
-        // see <http://en.wikipedia.org/wiki/Linear_feedback_shift_register> example 2
-        reg = (reg >> 1) ^ (-(reg & 1) & 0xd0000001); 
+        // See H G Kuehn, CACM 8/1961
+        reg = ( (512+1)*reg + 0x1B0CA37A4BA9L)
+                & 0xFFFFFFFFFFFFL;
  }
 
     /**
      * Reduce the current generator value to an alias value.
      */
     protected int computeAliasFromGenerator() {
-        int retval;
         
-        // just return low bits, but force non-zero
-        //retval = (int) (reg & 0xFFFF);
-        //if (retval == 0) retval = 1;
+        int s1 = (int)reg&0xFFFFFF;
+        int s2 = (int)(reg>>12)&0xFFFFFF;
+        int s3 = (int)(reg>>24)&0xFFFFFF;
+        int s4 = (int)(reg>>36)&0xFFFFFF;
         
-        // merge 32 bits to just 16
-        retval = (int) ( (reg ^ (reg >>16) ) & 0xFFFF);
-        if (retval == 0) retval = 1;
-        
-        return retval;
+        return s1^s2^s3^s4;
     }
 
     // Generator state register

Modified: trunk/prototypes/java/src/org/nmra/net/can/NIDaAlgorithm.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/can/NIDaAlgorithm.java	2009-11-09 06:02:43 UTC (rev 123)
+++ trunk/prototypes/java/src/org/nmra/net/can/NIDaAlgorithm.java	2009-11-09 06:05:33 UTC (rev 124)
@@ -37,7 +37,10 @@
     
     public void processFrame(NmraNetCanFrame f) {
         if (f == null) return; // as a convenience, ignore
-        
+
+        // System.out.println("process "+Integer.toHexString(f.getNodeIDa())
+        //                    +" vs our "+Integer.toHexString(nida.getNIDa()));
+
         if (f.getNodeIDa() != nida.getNIDa()) return;  // not us
         if (f.isCIM() || f.isRIM()) {
             // CIM or RIM with our alias

Modified: trunk/prototypes/java/src/org/nmra/net/can/NmraNetCanFrame.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/can/NmraNetCanFrame.java	2009-11-09 06:02:43 UTC (rev 123)
+++ trunk/prototypes/java/src/org/nmra/net/can/NmraNetCanFrame.java	2009-11-09 06:05:33 UTC (rev 124)
@@ -15,17 +15,17 @@
 public class NmraNetCanFrame implements org.nmra.net.can.CanFrame {
 
     public static NmraNetCanFrame makeCimFrame(int alias, int num, int val) {
-        return new NmraNetCanFrame( (0<<26) | (alias&0xffff));
+        return new NmraNetCanFrame( (0<<26) | (alias&0xffffff));
     }
     
     public static NmraNetCanFrame makeRimFrame(int alias, NodeID n) {
-        return new NmraNetCanFrame( (1<<26) | (alias&0xffff),
+        return new NmraNetCanFrame( (1<<26) | (alias&0xffffff),
                                     n.getContents());
     }
     
     static int makeHeader(int alias) {
         return 
-            (alias&0xFFFF);
+            (alias&0xFFFFFF);
     }
     
     // data is stored in completed form as
@@ -78,7 +78,7 @@
     
     public long getHeader() { return header; }
     
-    public int getNodeIDa() { return (int)getHeader()&0xFFFF; }
+    public int getNodeIDa() { return (int)getHeader()&0xFFFFFF; }
     
     public boolean isCIM() { return (getTypeField() == TypeField.CHECKIDMESSAGE); }
     public boolean isRIM() { return (getTypeField() == TypeField.RESERVEDIDMESSAGE); }
@@ -100,5 +100,12 @@
             return false;
         }
     }
-
+    
+    public String toString() {
+        return "Type: "+getTypeField()
+            + " NIDa: "+getNodeIDa()
+            + " isCIM: "+isCIM()
+            + " isRIM: "+isRIM();
+            
+    }
 }

Modified: trunk/prototypes/java/test/org/nmra/net/can/NIDaAlgorithmTest.java
===================================================================
--- trunk/prototypes/java/test/org/nmra/net/can/NIDaAlgorithmTest.java	2009-11-09 06:02:43 UTC (rev 123)
+++ trunk/prototypes/java/test/org/nmra/net/can/NIDaAlgorithmTest.java	2009-11-09 06:05:33 UTC (rev 124)
@@ -77,7 +77,7 @@
         // start
         Assert.assertTrue((f = alg.nextFrame()).isCIM());
 
-        // conflict 
+        // inject conflict 
         alg.processFrame(NmraNetCanFrame.makeCimFrame(f.getNodeIDa(), 0, 0));
         
         // seventh frame after now is RIM
@@ -111,7 +111,7 @@
 
         Assert.assertEquals((f = alg.nextFrame()), null);
 
-        // conflict 
+        // inject conflict 
         alg.processFrame(NmraNetCanFrame.makeCimFrame(nida, 0, 0));
 
         // still active

Modified: trunk/prototypes/java/test/org/nmra/net/can/NIDaTest.java
===================================================================
--- trunk/prototypes/java/test/org/nmra/net/can/NIDaTest.java	2009-11-09 06:02:43 UTC (rev 123)
+++ trunk/prototypes/java/test/org/nmra/net/can/NIDaTest.java	2009-11-09 06:05:33 UTC (rev 124)
@@ -40,7 +40,15 @@
         last = na.getNIDa();
         Assert.assertTrue("5", first!=last);
     }
-            
+    
+    // print the first few from a zero seed, not normally done
+    public void XtestListValues() {
+        for (int i = 0; i< 200; i++) {
+            System.out.println("0x"+Integer.toHexString(na.getNIDa()));
+            na.nextAlias();
+        }
+    }
+    
     // test takes a couple minutes, not normally done
     public void XtestAltPRNG() {
       // http://en.wikipedia.org/wiki/Linear_feedback_shift_register


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Openlcb-svn-commits] SF.net SVN: openlcb:[124] trunk/prototypes/java

openlcb-svn-commits