Changeset 64 for trunk

Timestamp:

07/12/06 09:39:52 (2 years ago)

Author:

Jan-Klaas Kollhof

Message:

adding zip to iter module and naturla compare algorithm to strings module

Files:

• trunk/jsolait/lib/iter.js (modified) (4 diffs)
• trunk/jsolait/lib/strings.js (modified) (2 diffs)
• trunk/test/test_iter.js (modified) (5 diffs)
• trunk/test/test_strings.js (modified) (2 diffs)

trunk/jsolait/lib/iter.js

@@ -69 +69 @@
-            var item;
-            while(((item=this.next()) !== undefined) && result===undefined){
-
+
+
+
+
+
+
-            }
-            return result;
@@ -77 +82 @@
-            var result=[];
-            thisObj = thisObj==null?this:thisObj;
-
+, doKeep
-            while((item=this.next()) !== undefined){
-
+
+
+
+
+
+
+
-                    result.push(item);
-                }
@@ -89 +100 @@
-            var result=[];
-            thisObj = thisObj==null?this:thisObj;
-
+, mapedItem
-            while((item=this.next()) !== undefined){
-
+
+
+
+
+
+
+
-            }
-            return result;
@@ -340 +357 @@
-        return mod.iter(iterable).__list__();
-    };
+    
+    /**
+        An itereator that iterates over a number of given iterators.
+        use zip() to create a Zipper.
+    **/
+    mod.Zipper = Class(mod.Iterator, function(publ,priv,supr){
+        
+        publ.__init__=function(iterators){
+            this.iterators = iterators;
+        };
+        
+        publ.next=function(){
+            var r =[];
+            r.__tupleResult__ = true;
+            var item;
+            for(var i=0;i<this.iterators.length;i++){
+                item=this.iterators[i].next();
+                if(item === undefined){
+                    return undefined;
+                }else{
+                    r.push(item);
+                }
+            }
+            return r;
+        };
+    });
+    
+    /**
+        Creates an iterator which iterates over the iterable objects given simultanously.
+        @param iterable*  Any number of iterable objects.
+        @return a Zipper iterator.
+    **/
+    mod.zip = function(iterable){
+        var iterators =[];
+        for(var i=0;i<arguments.length;i++){
+            iterators.push(mod.iter(arguments[i]));
+        }
+        return new mod.Zipper(iterators);
+    };
-
-});

trunk/jsolait/lib/strings.js

@@ -1 +1 @@
-/**
-manipulation 
+
-    
-    @creator Jan-Klaas Kollhof
@@ -8 +8 @@
-**/
-Module("strings","$Revision: 43$", function(mod){
+   
+   mod.WordNumberStringSplitter = Class(function(publ,priv,supr){
+        publ.__init__=function(s){
+            this.s=s;
+        };
+        
+        publ.next=function(){
+            if(this.s.length==0){
+                return;
+            }
+            var m = this.s.match(/^(\s*[0-9]+\s*)/);
+            
+            if(m){
+                this.s=this.s.slice(m[1].length);
+                return Number(m[1]);
+            }else{
+                m = this.s.match(/^([^0-9]+)/);
+                if(m){
+                    this.s=this.s.slice(m[1].length);
+                    return m[1].replace(" ","")
+                }else{
+                    return;
+                }
+            }
+        };
+    });
+   
+    mod.naturalCompare=function(a, b){
+        var asplitter=new mod.WordNumberStringSplitter(a);
+        var bsplitter=new mod.WordNumberStringSplitter(b);
+        
+        while(true){
+            var x = asplitter.next();
+            var y = bsplitter.next();
+            if(x<y){
+                return -1;
+            }else if(x>y){
+                return 1;
+            }else if(x == null && y == null){
+                return 0;
+            }
+        }
+    };
+     
+    
-    /**
-        Fast writable String. 

trunk/test/test_iter.js

@@ -9 +9 @@
-        var map = imprt('iter').map;
-        var list = imprt('iter').list;
+        var zip = imprt('iter').zip;
-        
-        
@@ -63 +64 @@
-        });
-        t.assertEquals('map(range(0,20), item + 2)  == 2 .. 22', n.join(","), a.join(","));
+        
+        
+        var a=[1,2,3,4,5];
+        var b=[5,4,3,2];
+        var r = map(zip(a,b), function(a,b){
+            return a + ':' + b;
+        });
+        t.assertEquals('zip([1,2,3,4,5], [5,4,3,2])', r.join(","), "1:5,2:4,3:3,4:2")
-    };
-    
@@ -69 +78 @@
-        var iter = imprt('iter').iter;
-        var filter = imprt('iter').filter;
+        var range = imprt('iter').range;
-        
-        var  testing = imprt('testing');
-        
- mod.__test__(testing);
+
-        
-        var task=function(){
@@ -96 +106 @@
-        print("Range iter \t\t" + testing.profile(function(){
-            var s=[];
-mod.
+
-                s.push(r[item]);
-                task();
@@ -174 +184 @@
-        }));
-    
+        
+        
+    
-    };
-    mod.__main__=function(){

trunk/test/test_strings.js

@@ -2 +2 @@
-
-    mod.test=function(testing, logger){
-
+var strings = 
-        
-        logger.log("testing strings");
@@ -10 +10 @@
-        
-        
-
+;
-        testing.assertEquals("template result", rslt, "Template (test) run at Thu Jan 1 00:00:00 UTC 1970\n\n    loop 0\n\n    loop 1\n\n    loop 2\n\n    loop 3\n\n    loop 4\n\n    loop 5\n\n    loop 6\n\n    loop 7\n\n    loop 8\n\n    loop 9\n\n------------\n\n     b is set ? > <?\n     foo\n\n------------\n0,1,2,3,4,5,6,7,8,9,\n-----------\n")
+               
-        
+        var a = ["jsolait 1","jsolait 11", "jsolait 2"];
+        a.sort(strings.naturalCompare);
+        testing.assertEquals("natural compare", a.join(", "), "jsolait 1, jsolait 2, jsolait 11");
-    };
-