added data revision in related tests for change in CLinearTimeMMD

shogun-toolbox · Jun 4, 2014 · 50cd7d9 · 50cd7d9
1 parent 19230ef
commit 50cd7d9
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 62 deletions.
diff --git a/testsuite/python2-tests/statistics_linear_time_mmd0.txt b/testsuite/python2-tests/statistics_linear_time_mmd0.txt
@@ -1,6 +1,6 @@
-(F0.016183096039543966
-F0.19999999999999996
-F0.21932715134510583
+(F0.7228435300778242
+F0.040000000000000036
+F0.013320360772932527
 cnumpy.core.multiarray
 _reconstruct
 p0
@@ -33,20 +33,20 @@ I-1
 I0
 tp12
 bI00
-S'\x06\xd0@\xd9\xff\xf4\x8e\xbf\r\xf7\xb7#Ddm?\xf4x\xed\x8b\x8e\xa7v?4\xee\x89\xde\xbc\x1d\x99?\x94\xd9z=\x14G\x82?\xad\x82\x0b-\x06\xa9\x99\xbf\xc0\x04\x02U"n\x99?\xb6sr0G\xca\x86\xbf/\xf6\x17j\x15\x12D\xbfP\xd9\xaf\x19\xdb\xd3\x88\xbf'
+S'\xd4R$\xc8\xfb\xcb\xca?d\xd8\x0f\xf9\xdf\xf1\xdc\xbf8?:\xdf\xe0\xb6\xd0?\xe5k!\x8f\xed\xfb\xc8?u\xcbW6A]\xdc?\x98T\xf8\xbe\xfb\xc0\xe2?\xa3<\xe8\xfe0\xa1\xc3?\xfdM\xab\\%\xd3\xd4?\xdcsOzH\xf5\xe0\xbfd\xaa\x16#"\xc0\xef\xbf'
 p13
 tp14
 b(lp15
-I00
+I01
 aI01
 aI01
 aI01
 aI01
 a(lp16
-I01
-aI00
-aI01
-aI01
+I00
 aI01
+aI00
+aI00
+aI00
 atp17
 .
diff --git a/testsuite/python2-tests/statistics_mmd_kernel_selection_combined0.txt b/testsuite/python2-tests/statistics_mmd_kernel_selection_combined0.txt
diff --git a/testsuite/python2-tests/statistics_mmd_kernel_selection_combined1.txt b/testsuite/python2-tests/statistics_mmd_kernel_selection_combined1.txt
diff --git a/testsuite/python2-tests/statistics_mmd_kernel_selection_single0.txt b/testsuite/python2-tests/statistics_mmd_kernel_selection_single0.txt
@@ -1,29 +1,28 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(S'modshogun.GaussianKernel'
 p1
 c__builtin__
 object
 p2
 Ntp3
 Rp4
 (I01
-S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\ncache_size int32 10\nlhs SGSerializable* null []\nrhs SGSerializable* null []\nlhs_equals_rhs bool f\nnum_lhs int32 0\nnum_rhs int32 0\ncombined_kernel_weight float64 1\noptimization_initialized bool f\nopt_type int32 0\nproperties uint64 0\nnormalizer SGSerializable* IdentityKernelNormalizer [\nversion_parameter int32 1\nm_type int32 0\n]\nwidth float64 8192\ncompact bool f\n'
+S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\ncache_size int32 10\nlhs SGSerializable* null []\nrhs SGSerializable* null []\nlhs_equals_rhs bool f\nnum_lhs int32 0\nnum_rhs int32 0\ncombined_kernel_weight float64 1\noptimization_initialized bool f\nopt_type int32 0\nproperties uint64 0\nnormalizer SGSerializable* IdentityKernelNormalizer [\nversion_parameter int32 1\nm_type int32 0\n]\nwidth float64 2\ncompact bool f\n'
 p5
 tp6
 b(lp7
 I01
-aI00
+aI01
 aI01
 aI01
 aI01
 a(lp8
 I01
 aI01
-aI01
-aI01
+aI00
+aI00
 aI01
 atp9
 .
diff --git a/testsuite/python2-tests/statistics_mmd_kernel_selection_single1.txt b/testsuite/python2-tests/statistics_mmd_kernel_selection_single1.txt
@@ -1,29 +1,28 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(S'modshogun.GaussianKernel'
 p1
 c__builtin__
 object
 p2
 Ntp3
 Rp4
 (I01
-S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\ncache_size int32 10\nlhs SGSerializable* null []\nrhs SGSerializable* null []\nlhs_equals_rhs bool f\nnum_lhs int32 0\nnum_rhs int32 0\ncombined_kernel_weight float64 1\noptimization_initialized bool f\nopt_type int32 0\nproperties uint64 0\nnormalizer SGSerializable* IdentityKernelNormalizer [\nversion_parameter int32 1\nm_type int32 0\n]\nwidth float64 512\ncompact bool f\n'
+S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\ncache_size int32 10\nlhs SGSerializable* null []\nrhs SGSerializable* null []\nlhs_equals_rhs bool f\nnum_lhs int32 0\nnum_rhs int32 0\ncombined_kernel_weight float64 1\noptimization_initialized bool f\nopt_type int32 0\nproperties uint64 0\nnormalizer SGSerializable* IdentityKernelNormalizer [\nversion_parameter int32 1\nm_type int32 0\n]\nwidth float64 2\ncompact bool f\n'
 p5
 tp6
 b(lp7
 I01
-aI00
+aI01
 aI01
 aI01
 aI01
 a(lp8
 I01
 aI01
-aI01
-aI01
+aI00
+aI00
 aI01
 atp9
 .
diff --git a/testsuite/python2-tests/statistics_mmd_kernel_selection_single2.txt b/testsuite/python2-tests/statistics_mmd_kernel_selection_single2.txt
@@ -1,8 +1,7 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(S'modshogun.GaussianKernel'
 p1
 c__builtin__
 object
@@ -20,10 +19,10 @@ aI01
 aI01
 aI01
 a(lp8
-I01
+I00
+aI01
 aI01
 aI01
 aI01
-aI00
 atp9
 .
diff --git a/testsuite/python3-tests/statistics_linear_time_mmd0.txt b/testsuite/python3-tests/statistics_linear_time_mmd0.txt
@@ -1,6 +1,6 @@
-(F0.016183096039543966
-F0.19999999999999996
-F0.21932715134510583
+(F0.72284353007782443
+F0.040000000000000036
+F0.013320360772932527
 cnumpy.core.multiarray
 _reconstruct
 p0
@@ -41,23 +41,23 @@ L0L
 tp16
 bI00
 g3
-(V�@�����#Ddm?�x틎�v?4�޼�?��z=G�?��-����U"n�?�sr0Gʆ�/�jD�Pٯ�ӈ�
+(V�R$����?d����ܿ:?:���?�k!����?v�W6A]�?�T�����?�<��0��?N�\u005c%��?�sOzH��g�#"��
 p17
 g5
 tp18
 Rp19
 tp20
 b(lp21
-I00
+I01
 aI01
 aI01
 aI01
 aI01
 a(lp22
-I01
-aI00
-aI01
-aI01
+I00
 aI01
+aI00
+aI00
+aI00
 atp23
 .
diff --git a/testsuite/python3-tests/statistics_mmd_kernel_selection_combined0.txt b/testsuite/python3-tests/statistics_mmd_kernel_selection_combined0.txt
diff --git a/testsuite/python3-tests/statistics_mmd_kernel_selection_combined1.txt b/testsuite/python3-tests/statistics_mmd_kernel_selection_combined1.txt
diff --git a/testsuite/python3-tests/statistics_mmd_kernel_selection_single0.txt b/testsuite/python3-tests/statistics_mmd_kernel_selection_single0.txt
@@ -1,8 +1,7 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(Vmodshogun.GaussianKernel
 p1
 c__builtin__
 object
@@ -13,7 +12,7 @@ Rp4
 c_codecs
 encode
 p5
-(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000acache_size int32 10\u000alhs SGSerializable* null []\u000arhs SGSerializable* null []\u000alhs_equals_rhs bool f\u000anum_lhs int32 0\u000anum_rhs int32 0\u000acombined_kernel_weight float64 1\u000aoptimization_initialized bool f\u000aopt_type int32 0\u000aproperties uint64 0\u000anormalizer SGSerializable* IdentityKernelNormalizer [\u000aversion_parameter int32 1\u000am_type int32 0\u000a]\u000awidth float64 8192\u000acompact bool f\u000a
+(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000acache_size int32 10\u000alhs SGSerializable* null []\u000arhs SGSerializable* null []\u000alhs_equals_rhs bool f\u000anum_lhs int32 0\u000anum_rhs int32 0\u000acombined_kernel_weight float64 1\u000aoptimization_initialized bool f\u000aopt_type int32 0\u000aproperties uint64 0\u000anormalizer SGSerializable* IdentityKernelNormalizer [\u000aversion_parameter int32 1\u000am_type int32 0\u000a]\u000awidth float64 2\u000acompact bool f\u000a
 p6
 Vlatin1
 p7
@@ -22,15 +21,15 @@ Rp9
 tp10
 b(lp11
 I01
-aI00
+aI01
 aI01
 aI01
 aI01
 a(lp12
 I01
 aI01
-aI01
-aI01
+aI00
+aI00
 aI01
 atp13
 .
diff --git a/testsuite/python3-tests/statistics_mmd_kernel_selection_single1.txt b/testsuite/python3-tests/statistics_mmd_kernel_selection_single1.txt
@@ -1,8 +1,7 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(Vmodshogun.GaussianKernel
 p1
 c__builtin__
 object
@@ -13,7 +12,7 @@ Rp4
 c_codecs
 encode
 p5
-(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000acache_size int32 10\u000alhs SGSerializable* null []\u000arhs SGSerializable* null []\u000alhs_equals_rhs bool f\u000anum_lhs int32 0\u000anum_rhs int32 0\u000acombined_kernel_weight float64 1\u000aoptimization_initialized bool f\u000aopt_type int32 0\u000aproperties uint64 0\u000anormalizer SGSerializable* IdentityKernelNormalizer [\u000aversion_parameter int32 1\u000am_type int32 0\u000a]\u000awidth float64 512\u000acompact bool f\u000a
+(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000acache_size int32 10\u000alhs SGSerializable* null []\u000arhs SGSerializable* null []\u000alhs_equals_rhs bool f\u000anum_lhs int32 0\u000anum_rhs int32 0\u000acombined_kernel_weight float64 1\u000aoptimization_initialized bool f\u000aopt_type int32 0\u000aproperties uint64 0\u000anormalizer SGSerializable* IdentityKernelNormalizer [\u000aversion_parameter int32 1\u000am_type int32 0\u000a]\u000awidth float64 2\u000acompact bool f\u000a
 p6
 Vlatin1
 p7
@@ -22,15 +21,15 @@ Rp9
 tp10
 b(lp11
 I01
-aI00
+aI01
 aI01
 aI01
 aI01
 a(lp12
 I01
 aI01
-aI01
-aI01
+aI00
+aI00
 aI01
 atp13
 .
diff --git a/testsuite/python3-tests/statistics_mmd_kernel_selection_single2.txt b/testsuite/python3-tests/statistics_mmd_kernel_selection_single2.txt
@@ -1,8 +1,7 @@
 (cmodshogun
 _sg_reconstructor
 p0
-(cmodshogun
-GaussianKernel
+(Vmodshogun.GaussianKernel
 p1
 c__builtin__
 object
@@ -27,10 +26,10 @@ aI01
 aI01
 aI01
 a(lp12
-I01
+I00
+aI01
 aI01
 aI01
 aI01
-aI00
 atp13
 .