From dae9241190d658f44af6e3f8d7de107f03771797 Mon Sep 17 00:00:00 2001
From: Joe Zhao <ztuowen@gmail.com>
Date: Thu, 4 Jun 2015 00:39:54 +0800
Subject: rename

---
 cross-train.py    |  67 ----------------------------
 cross.py          |  67 ++++++++++++++++++++++++++++
 ensemble-train.py | 127 ------------------------------------------------------
 ensemble.py       | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 misc.pyc          | Bin 0 -> 1589 bytes
 train.py          |   4 +-
 6 files changed, 196 insertions(+), 196 deletions(-)
 delete mode 100644 cross-train.py
 create mode 100644 cross.py
 delete mode 100644 ensemble-train.py
 create mode 100644 ensemble.py
 create mode 100644 misc.pyc

diff --git a/cross-train.py b/cross-train.py
deleted file mode 100644
index 3881b6e..0000000
--- a/cross-train.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from misc import *
-
-def onefold(inr,inm,tot,clist,folds,resm)
-
-#clist=[0.0001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 10, 100, 1000]
-
-#inr="a.rid"
-
-#folds=4
-
-#tot=316
-
-#inm="%d.m"
-
-#o=ite+1
-
-    step = tot // folds
-
-    ourb=inr
-
-    for i in range(folds-1):
-        inra=ourb
-        oura="a%d.rid"%i
-        ourb="b%d.rid"%i
-        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
-        split(params)
-
-    inra=ourb
-    oura="a%d.rid"% (folds-1)
-    params = "-s -i %s -a %s"%(inra,oura)
-    split(params)
-
-    for a in range(folds):
-        entries=['0','0']
-        for b in range(folds):
-            if b!=a:
-                tmp=take("a%d.rid"%b)
-                entries = merge(tmp,entries)
-        rid="b%d.rid" %a
-        put(rid,entries)
-
-    optc=1
-    bcmc=folds
-
-    for c in clist:
-        print(c)
-        oum="t%g.m" % c
-        
-        acmc = 0;
-        for a in range(folds):
-            rid = "b%d.rid"%a
-            params = "-T -d -m %s -i %s -o %s -c %g --cg_iter 100" % (inm,rid,oum,c)
-            train(params)
-            rid="a%d.rid"%a
-            params = "-V -C -m %s -i %s -s" %(oum,rid)
-            acmc+=cmc(params)
-
-        print(acmc/folds)
-
-        if bcmc>acmc:
-            optc=c
-            bcmc=acmc
-
-    print("train with: %g" % optc)    
-    params = "-T -d -m %s -i %s -o %s -c %g" % (inm,inr,resm,optc)
-    train(params)
-
diff --git a/cross.py b/cross.py
new file mode 100644
index 0000000..3881b6e
--- /dev/null
+++ b/cross.py
@@ -0,0 +1,67 @@
+from misc import *
+
+def onefold(inr,inm,tot,clist,folds,resm)
+
+#clist=[0.0001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 10, 100, 1000]
+
+#inr="a.rid"
+
+#folds=4
+
+#tot=316
+
+#inm="%d.m"
+
+#o=ite+1
+
+    step = tot // folds
+
+    ourb=inr
+
+    for i in range(folds-1):
+        inra=ourb
+        oura="a%d.rid"%i
+        ourb="b%d.rid"%i
+        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
+        split(params)
+
+    inra=ourb
+    oura="a%d.rid"% (folds-1)
+    params = "-s -i %s -a %s"%(inra,oura)
+    split(params)
+
+    for a in range(folds):
+        entries=['0','0']
+        for b in range(folds):
+            if b!=a:
+                tmp=take("a%d.rid"%b)
+                entries = merge(tmp,entries)
+        rid="b%d.rid" %a
+        put(rid,entries)
+
+    optc=1
+    bcmc=folds
+
+    for c in clist:
+        print(c)
+        oum="t%g.m" % c
+        
+        acmc = 0;
+        for a in range(folds):
+            rid = "b%d.rid"%a
+            params = "-T -d -m %s -i %s -o %s -c %g --cg_iter 100" % (inm,rid,oum,c)
+            train(params)
+            rid="a%d.rid"%a
+            params = "-V -C -m %s -i %s -s" %(oum,rid)
+            acmc+=cmc(params)
+
+        print(acmc/folds)
+
+        if bcmc>acmc:
+            optc=c
+            bcmc=acmc
+
+    print("train with: %g" % optc)    
+    params = "-T -d -m %s -i %s -o %s -c %g" % (inm,inr,resm,optc)
+    train(params)
+
diff --git a/ensemble-train.py b/ensemble-train.py
deleted file mode 100644
index 34b4024..0000000
--- a/ensemble-train.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from misc import *
-import math
-
-def onefold(inr,inm,tot,clist,folds,resm)
-
-#inr="a.rid"
-#resm="res.m"
-#consts used
-#clist=[0.0001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 10, 100, 1000]
-
-#folds=4
-#tot=316
-    step = tot // folds
-#inm="0.m"
-
-    ourb=inr
-#splits
-    print("splitting")
-    for i in range(folds-1):
-        inra=ourb
-        oura="a%d.rid"%i
-        ourb="b%d.rid"%i
-        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
-        split(params)
-
-    entries=['0','0']
-
-    tmp=take("b0.rid")
-    put("c0.rid",tmp)
-
-    tmp=take("b%d.rid"%(folds-2))
-    put("a%d.rid"%(folds-1),tmp)
-    print("merging")
-    for a in range(folds-1):
-        tmp=take("a%d.rid"%a)
-        entries = merge(tmp,entries)
-            
-        if a<folds-2:
-            tmp=take("b%d.rid"%(a+1))
-            tmp = merge(tmp,entries)
-        else:
-            tmp = entries;
-            
-        rid="c%d.rid" %(a+1)
-        put(rid,tmp)
-
-    for i in range(folds):
-        entries = take("a%d.rid"%a)
-        inra="c%d.rid"%i
-        oura="a%d.rid"%i
-        ourb="b%d.rid"%i
-        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
-        split(params)
-        entries = merge(take("a%d.rid"%a),entries)
-    print("completed")
-    wlist=[]
-    mai=0
-#train
-    for i in range(folds):
-        for c in clist:
-            print("folds: %d ,c: %g"%(i,c))
-            wlist.append("%d-%g"%(i,c))
-            oum="%d-%g.m" % (i,c)
-            rid = "a%d.rid"%i
-            params = "-T -d -m %s -i %s -o %s -c %g" % (inm,rid,oum,c)
-            #train(params)
-            oup="%d-%g.p"%(i,c)
-            params = "-P -p -m %s -i %s -o %s" %(oum,inr,oup)
-            #bare(params)
-            for p in getpred(oup):
-                mai=max(abs(p),mai);
-
-    mai=mai*2;
-
-#inits
-    D=getpred(oup)
-    for i in range(len(D)):
-        D[i]=1/len(D);
-    mod=getmodel(oum);
-    for i in range(len(mod)):
-        mod[i]=0;
-
-    while len(wlist)>0:
-        low=1e20
-        k=0
-        P=[]
-        #find best weak ranker
-        for w in wlist:
-            t=0
-            pr=getpred(w+".p")
-            for (d,p) in zip(D,pr):
-                if p<=0:
-                    t+=d
-            if t<low:
-                low=t
-                k=w
-                P=pr
-        
-        print(k)
-        wlist.remove(k)
-        # cal alpha
-        r=0;
-        for (d,p) in zip(D,P):
-            r+=d*p;
-        r=r/mai;
-        a=0.5*math.log((1+r)/(1-r))
-        
-        #update model
-        tmod=getmodel(k+".m")
-        for i in range(len(mod)):
-            mod[i]+=a*tmod[i];
-        
-        #update D
-        for i in range(len(D)):
-            D[i]=D[i]*math.exp(-a*P[i]);
-        
-        #normalize D
-        acc=0;
-        for d in D:
-            acc+=d;
-        
-        for i in range(len(D)):
-            D[i]/=acc;
-
-#output model
-    #print(mod)
-    putmodel(resm,mod)
diff --git a/ensemble.py b/ensemble.py
new file mode 100644
index 0000000..34b4024
--- /dev/null
+++ b/ensemble.py
@@ -0,0 +1,127 @@
+from misc import *
+import math
+
+def onefold(inr,inm,tot,clist,folds,resm)
+
+#inr="a.rid"
+#resm="res.m"
+#consts used
+#clist=[0.0001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 10, 100, 1000]
+
+#folds=4
+#tot=316
+    step = tot // folds
+#inm="0.m"
+
+    ourb=inr
+#splits
+    print("splitting")
+    for i in range(folds-1):
+        inra=ourb
+        oura="a%d.rid"%i
+        ourb="b%d.rid"%i
+        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
+        split(params)
+
+    entries=['0','0']
+
+    tmp=take("b0.rid")
+    put("c0.rid",tmp)
+
+    tmp=take("b%d.rid"%(folds-2))
+    put("a%d.rid"%(folds-1),tmp)
+    print("merging")
+    for a in range(folds-1):
+        tmp=take("a%d.rid"%a)
+        entries = merge(tmp,entries)
+            
+        if a<folds-2:
+            tmp=take("b%d.rid"%(a+1))
+            tmp = merge(tmp,entries)
+        else:
+            tmp = entries;
+            
+        rid="c%d.rid" %(a+1)
+        put(rid,tmp)
+
+    for i in range(folds):
+        entries = take("a%d.rid"%a)
+        inra="c%d.rid"%i
+        oura="a%d.rid"%i
+        ourb="b%d.rid"%i
+        params = "-c %d -i %s -a %s -b %s" %(step,inra,oura,ourb)
+        split(params)
+        entries = merge(take("a%d.rid"%a),entries)
+    print("completed")
+    wlist=[]
+    mai=0
+#train
+    for i in range(folds):
+        for c in clist:
+            print("folds: %d ,c: %g"%(i,c))
+            wlist.append("%d-%g"%(i,c))
+            oum="%d-%g.m" % (i,c)
+            rid = "a%d.rid"%i
+            params = "-T -d -m %s -i %s -o %s -c %g" % (inm,rid,oum,c)
+            #train(params)
+            oup="%d-%g.p"%(i,c)
+            params = "-P -p -m %s -i %s -o %s" %(oum,inr,oup)
+            #bare(params)
+            for p in getpred(oup):
+                mai=max(abs(p),mai);
+
+    mai=mai*2;
+
+#inits
+    D=getpred(oup)
+    for i in range(len(D)):
+        D[i]=1/len(D);
+    mod=getmodel(oum);
+    for i in range(len(mod)):
+        mod[i]=0;
+
+    while len(wlist)>0:
+        low=1e20
+        k=0
+        P=[]
+        #find best weak ranker
+        for w in wlist:
+            t=0
+            pr=getpred(w+".p")
+            for (d,p) in zip(D,pr):
+                if p<=0:
+                    t+=d
+            if t<low:
+                low=t
+                k=w
+                P=pr
+        
+        print(k)
+        wlist.remove(k)
+        # cal alpha
+        r=0;
+        for (d,p) in zip(D,P):
+            r+=d*p;
+        r=r/mai;
+        a=0.5*math.log((1+r)/(1-r))
+        
+        #update model
+        tmod=getmodel(k+".m")
+        for i in range(len(mod)):
+            mod[i]+=a*tmod[i];
+        
+        #update D
+        for i in range(len(D)):
+            D[i]=D[i]*math.exp(-a*P[i]);
+        
+        #normalize D
+        acc=0;
+        for d in D:
+            acc+=d;
+        
+        for i in range(len(D)):
+            D[i]/=acc;
+
+#output model
+    #print(mod)
+    putmodel(resm,mod)
diff --git a/misc.pyc b/misc.pyc
new file mode 100644
index 0000000..eab0a21
Binary files /dev/null and b/misc.pyc differ
diff --git a/train.py b/train.py
index 1588751..a990c13 100644
--- a/train.py
+++ b/train.py
@@ -1,5 +1,5 @@
-import ensemble-train
-import cross-train
+import ensemble
+import cross
 
 clist=[0.0001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 10, 100, 1000]
 inr="a.rid"
-- 
cgit v1.2.3-70-g09d2