Merge pull request #1 from yaolubrain/master

update
wangg12 · Nov 28, 2015 · a344b67 · a344b67
2 parents 203cd84 + c0177ea
commit a344b67
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/imagenet_zero_shot_unseen_wnids.py b/imagenet_zero_shot_unseen_wnids.py
@@ -1,5 +1,4 @@
 imagenet_21k = open('imagenet.synset.obtain_synset_list', 'r').read().splitlines()
-
 imagenet_1k = open('distance_mat_wordnet_nodes_1K.txt', 'r').read().splitlines()
 idx_list = open('imagenet_zero_shot_unseen_wnids.txt', 'w')
 

diff --git a/zero_shot_ica.py b/zero_shot_ica.py
@@ -71,7 +71,7 @@
         print 0, 0,
 
 
-    #mixed
+    # mixed
     class_idx = wnid2idx_mixed[wnid]
     D = cdist(P1g, PW23, 'cosine')
     pred_20 = np.argsort(D, axis=1)[:,:20]

diff --git a/zero_shot_pca.py b/zero_shot_pca.py
@@ -45,7 +45,7 @@
     im_num = output.shape[0]
     wnid = f[0:9]
 
-    # unseen 
+    # unseen
     if wnid2idx_unseen.has_key(wnid):
         class_idx = wnid2idx_unseen[wnid]
         D = cdist(P1g, PW3, 'cosine')
@@ -72,7 +72,7 @@
         print 0, 0,
 
 
-    # all
+    # mixed
     class_idx = wnid2idx_mixed[wnid]
     D = cdist(P1g, PW23, 'cosine')
     pred_20 = np.argsort(D, axis=1)[:,:20]

diff --git a/zero_shot_random.py b/zero_shot_random.py
@@ -45,7 +45,7 @@
     im_num = output.shape[0]
     wnid = f[0:9]
 
-    # unseen 
+    # unseen
     if wnid2idx_unseen.has_key(wnid):
         class_idx = wnid2idx_unseen[wnid]
         D = cdist(P1g, PW3, 'cosine')
@@ -71,7 +71,7 @@
         print 0, 0,
 
 
-    # all
+    # mixed
     class_idx = wnid2idx_mixed[wnid]
     D = cdist(P1g, PW23, 'cosine')
     pred_20 = np.argsort(D, axis=1)[:,:20]