Update versions etc.

Netflix · Jun 2, 2016 · 893e2e7 · 893e2e7
1 parent b9d3541
commit 893e2e7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/OSSMETADATA b/OSSMETADATA
@@ -1 +1 @@
-osslifecycle=private
+osslifecycle=active
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+VMAF Development Kit (VDK) Version 1.0.0
diff --git a/python/core/quality_runner.py b/python/core/quality_runner.py
@@ -234,13 +234,15 @@ class VmafQualityRunner(QualityRunner):
     TYPE = 'VMAF'
 
     # VERSION = '0.1' # using model nflxall_vmafv1.pkl, VmafFeatureExtractor VERSION 0.1
-    # VERSION = '0.2' # using model nflxall_vmafv2.pkl, VmafFeatureExtractor VERSION 0.2.1
-    # VERSION = '0.3' # using model nflxall_vmafv3.pkl, VmafFeatureExtractor VERSION 0.2.1
-    VERSION = '0.3a' # using model nflxall_vmafv3.pkl, VmafFeatureExtractor VERSION 0.2.1, NFLX_dataset with 26 subjects (last 4 outliers removed)
-
     # DEFAULT_MODEL_FILEPATH = config.ROOT + "/resource/model/nflxall_vmafv1.pkl" # trained with resource/param/vmaf_v1.py on private/resource/dataset/NFLX_dataset.py (30 subjects)
+
+    # VERSION = '0.2' # using model nflxall_vmafv2.pkl, VmafFeatureExtractor VERSION 0.2.1
     # DEFAULT_MODEL_FILEPATH = config.ROOT + "/resource/model/nflxall_vmafv2.pkl" # trained with resource/param/vmaf_v2.py on private/resource/dataset/NFLX_dataset.py (30 subjects)
+
+    # VERSION = '0.3' # using model nflxall_vmafv3.pkl, VmafFeatureExtractor VERSION 0.2.1
     # DEFAULT_MODEL_FILEPATH = config.ROOT + "/resource/model/nflxall_vmafv3.pkl" # trained with resource/param/vmaf_v3.py on private/resource/dataset/NFLX_dataset.py (30 subjects)
+
+    VERSION = '0.3.1' # using model nflxall_vmafv3.pkl, VmafFeatureExtractor VERSION 0.2.1, NFLX_dataset with 26 subjects (last 4 outliers removed)
     DEFAULT_MODEL_FILEPATH = config.ROOT + "/resource/model/nflxall_vmafv3a.pkl" # trained with resource/param/vmaf_v3.py on private/resource/dataset/NFLX_dataset.py (26 subjects)
 
     DEFAULT_FEATURE_DICT = {'VMAF_feature': ['vif', 'adm', 'motion', 'ansnr']}

diff --git a/python/core/train_test_model.py b/python/core/train_test_model.py
@@ -282,10 +282,20 @@ def plot_scatter(ax, stats, content_ids=None):
                 curr_idxs = indices(content_ids, lambda cid: cid==curr_content_id)
                 curr_ys_label = np.array(stats['ys_label'])[curr_idxs]
                 curr_ys_label_pred = np.array(stats['ys_label_pred'])[curr_idxs]
+
                 ax.scatter(curr_ys_label, curr_ys_label_pred,
-                # ax.plot(curr_ys_label, curr_ys_label_pred, 'x-',
                            label=curr_content_id, color=colors[idx % len(colors)])
 
+                # lab = curr_content_id
+                # if lab == 11:
+                #     lab = 'CG Animation'
+                # elif lab == 7:
+                #     lab = 'TV Drama'
+                # elif lab == 31:
+                #     lab = 'High Noise'
+                # ax.plot(curr_ys_label, curr_ys_label_pred, 'x-',
+                #            label=lab, color=colors[idx % len(colors)])
+
     @staticmethod
     def get_objective_score(result, type='SRCC'):
         """