Skip to content

Commit

Permalink
Merge pull request #32 from mazumdarparijat/master
Browse files Browse the repository at this point in the history
PCA test data change
  • Loading branch information
karlnapf committed Feb 19, 2014
2 parents 738aa88 + 865f0d2 commit 70491d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions testsuite/python2-tests/preprocessor_pca_modular0.txt
@@ -1,16 +1,15 @@
cmodshogun
_sg_reconstructor
p0
(cmodshogun
RealFeatures
(S'modshogun.DenseFeatures'
p1
c__builtin__
object
p2
Ntp3
Rp4
(I01
S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\nproperties uint64 1\ncache_size int32 0\npreproc SGSerializable* DynamicObjectArray [\nversion_parameter int32 1\narray Vector<SGSerializable*> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\npreprocessed SGSerializable* DynamicArray bool [\nversion_parameter int32 1\narray Vector<bool> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\nsubset_stack SGSerializable* SubsetStack [\nversion_parameter int32 1\nactive_subset SGSerializable* null []\nactive_subsets_stack SGSerializable* DynamicObjectArray [\nversion_parameter int32 1\narray Vector<SGSerializable*> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\n]\ncombined_weight float64 1\nnum_vectors int32 92\nnum_features int32 1\nfeature_matrix SGMatrix<float64> 2 92 ({4.971298723324989}{4.705170486606431}{3.342180433294563}{5.272318172603899}{4.996203263933428}{4.112465373109931}{4.415963888874558}{4.007751244881905}{4.901115174310273}{2.67290264400485}{5.848105972446394}{4.758204312458043}{4.141875086338802}{3.789611719378585}{4.474885446850384}{4.040946607441784}{5.237658215371363}{3.649457618630332}{2.613042491607777}{3.678376575792688}{3.484710693397826}{3.315353631353902}{2.964271009555024}{-1.578283574967857}{-3.034112598747869}{-2.204989751800595}{-2.037710618368254}{-4.466221308156312}{-4.090909592121741}{-3.177461208979167}{-2.140135873591303}{-0.8179360611654263}{-3.30027556630337}{-3.147873757133925}{-1.723221489163289}{-1.815892606325372}{-2.038127926857165}{-2.572735041881089}{-0.9542877885526574}{-3.464360264422361}{-1.619531922443762}{-2.930281253913323}{-2.507754830934717}{-2.606361584408866}{-1.397750020602006}{-3.891273879866387}{-1.18875712762711}{-1.420852962400887}{-1.034101478712767}{0.6235415035149896}{-1.184624376719577}{-0.2611839943064476}{-3.346286228718798}{-0.4429374895551811}{-1.644771560251344}{-0.9980008799012323}{-1.924444739557604}{0.2115254361364846}{-1.161063972046428}{-2.193516414489929}{-1.920483373529712}{-0.5092448642643579}{-0.3510204216373358}{0.4982290175872026}{-1.10481696468824}{-0.9531242440380729}{-0.5741953466526919}{-1.696293099157191}{-0.3828549717121742}{-1.036770822254943}{-0.5233905531143139}{1.254272560236276}{-0.4392207569613246}{-0.5855811656763715}{-1.676904182958379}{0.7383764791042771}{0.2168599433544699}{-0.6850454964182894}{-1.34004783621169}{-0.6543898227930879}{-1.740097149130617}{-0.2025040422644787}{-0.2780644100430386}{0.7994460478936321}{0.09795306385035618}{-2.784295557100446}{-0.4900039499080109}{-0.9677526094059867}{-0.6239661692493126}{-1.330643033847897}{-0.04761013535172592}{-2.617722113881605}{1.608998003925945}{1.102151536192251}{3.292033434287775}{-0.4201768992784338}{1.509803044630651}{0.9811895629009918}{1.973592292032476}{-2.011197925841634}{2.022123672806628}{0.6371554524235705}{0.4394620421852635}{1.014813338651362}{4.490331161075409}{1.126491974951524}{2.30652133685476}{-0.7871282843904022}{1.693331144469978}{1.689991286706955}{0.8065599761511213}{1.708264142123324}{2.502553991826487}{1.209227252079641}{1.716247593351136}{-1.109643060386522}{2.564280573416055}{-0.0001775558730639692}{3.860593503028447}{0.1031005457155936}{3.757608573244354}{-0.190563918412734}{1.10717314489051}{0.6439693827923361}{3.860093302359807}{-2.649901923967373}{1.755190894696522}{-1.581364090174573}{3.569688616157052}{-1.20084921570525}{2.470807531581498}{-0.2071258691522912}{3.50719125763723}{-1.924438236764932}{3.049885877007853}{0.2603910772077623}{2.120613634756388}{-0.6704497123870455}{0.1999201323094695}{2.439942510157144}{-0.6602389751870904}{2.628008039532965}{-2.174006816189205}{1.652540436853439}{-0.1008817740150073}{1.880993259703105}{-0.6269989500566402}{2.684033577871289}{0.9756029145780021}{2.535125785635225}{0.03687758204099296}{-0.03188875830274851}{-0.007149158968374193}{0.7963992688561647}{-0.4017261069744713}{2.582490850326609}{0.08959756368636058}{3.015706299974027}{1.099844197890676}{0.8690239777765068}{-0.8230311924303001}{4.627139529871777}{-0.5773660055062353}{2.056413042638156}{-0.004669049367696575}{1.533295251207934}{-0.6426050369997306}{0.6314819082760368}{-0.7439930467703051}{1.792445395487317}{1.117160853953299}{4.032875698596231}{-0.3884505760852646}{2.276262908868681}{-0.07030445805553931}{2.636909772922137}{-1.00673858370737}{3.163139953958457}{0.2857966200152383}{2.783751260344358}{0.2752951721954403}{0.8779579590475479}{2.215270752283194}{2.564369082345539})\n'
S'<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\nversion_parameter int32 1\nproperties uint64 1\ncache_size int32 0\npreproc SGSerializable* DynamicObjectArray [\nversion_parameter int32 1\narray Vector<SGSerializable*> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\npreprocessed SGSerializable* DynamicArray bool [\nversion_parameter int32 1\narray Vector<bool> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\nsubset_stack SGSerializable* SubsetStack [\nversion_parameter int32 1\nactive_subset SGSerializable* null []\nactive_subsets_stack SGSerializable* DynamicObjectArray [\nversion_parameter int32 1\narray Vector<SGSerializable*> 0 ()\nnum_elements int32 0\nresize_granularity int32 128\nuse_sg_malloc bool t\nfree_array bool t\n]\n]\ncombined_weight float64 1\nnum_vectors int32 92\nnum_features int32 1\nfeature_matrix SGMatrix<float64> 1 92 ({4.971298723324989}{4.705170486606431}{3.342180433294563}{5.272318172603899}{4.996203263933428}{4.112465373109931}{4.415963888874558}{4.007751244881905}{4.901115174310273}{2.67290264400485}{5.848105972446394}{4.758204312458043}{4.141875086338802}{3.789611719378585}{4.474885446850384}{4.040946607441784}{5.237658215371363}{3.649457618630332}{2.613042491607777}{3.678376575792688}{3.484710693397826}{3.315353631353902}{2.964271009555024}{-1.578283574967857}{-3.034112598747869}{-2.204989751800595}{-2.037710618368254}{-4.466221308156312}{-4.090909592121741}{-3.177461208979167}{-2.140135873591303}{-0.8179360611654263}{-3.30027556630337}{-3.147873757133925}{-1.723221489163289}{-1.815892606325372}{-2.038127926857165}{-2.572735041881089}{-0.9542877885526574}{-3.464360264422361}{-1.619531922443762}{-2.930281253913323}{-2.507754830934717}{-2.606361584408866}{-1.397750020602006}{-3.891273879866387}{-1.18875712762711}{-1.420852962400887}{-1.034101478712767}{0.6235415035149896}{-1.184624376719577}{-0.2611839943064476}{-3.346286228718798}{-0.4429374895551811}{-1.644771560251344}{-0.9980008799012323}{-1.924444739557604}{0.2115254361364846}{-1.161063972046428}{-2.193516414489929}{-1.920483373529712}{-0.5092448642643579}{-0.3510204216373358}{0.4982290175872026}{-1.10481696468824}{-0.9531242440380729}{-0.5741953466526919}{-1.696293099157191}{-0.3828549717121742}{-1.036770822254943}{-0.5233905531143139}{1.254272560236276}{-0.4392207569613246}{-0.5855811656763715}{-1.676904182958379}{0.7383764791042771}{0.2168599433544699}{-0.6850454964182894}{-1.34004783621169}{-0.6543898227930879}{-1.740097149130617}{-0.2025040422644787}{-0.2780644100430386}{0.7994460478936321}{0.09795306385035618}{-2.784295557100446}{-0.4900039499080109}{-0.9677526094059867}{-0.6239661692493126}{-1.330643033847897}{-0.04761013535172592}{-2.617722113881605})\n'
p5
tp6
b.
7 changes: 3 additions & 4 deletions testsuite/python3-tests/preprocessor_pca_modular0.txt
@@ -1,8 +1,7 @@
cmodshogun
_sg_reconstructor
p0
(cmodshogun
RealFeatures
(Vmodshogun.DenseFeatures
p1
c__builtin__
object
Expand All @@ -13,11 +12,11 @@ Rp4
c_codecs
encode
p5
(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000aproperties uint64 1\u000acache_size int32 0\u000apreproc SGSerializable* DynamicObjectArray [\u000aversion_parameter int32 1\u000aarray Vector<SGSerializable*> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000apreprocessed SGSerializable* DynamicArray bool [\u000aversion_parameter int32 1\u000aarray Vector<bool> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000asubset_stack SGSerializable* SubsetStack [\u000aversion_parameter int32 1\u000aactive_subset SGSerializable* null []\u000aactive_subsets_stack SGSerializable* DynamicObjectArray [\u000aversion_parameter int32 1\u000aarray Vector<SGSerializable*> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000a]\u000acombined_weight float64 1\u000anum_vectors int32 92\u000anum_features int32 1\u000afeature_matrix SGMatrix<float64> 2 92 ({4.971298723324989}{4.705170486606431}{3.342180433294563}{5.272318172603899}{4.996203263933428}{4.112465373109931}{4.415963888874558}{4.007751244881905}{4.901115174310273}{2.67290264400485}{5.848105972446394}{4.758204312458043}{4.141875086338802}{3.789611719378585}{4.474885446850384}{4.040946607441784}{5.237658215371363}{3.649457618630332}{2.613042491607777}{3.678376575792688}{3.484710693397826}{3.315353631353902}{2.964271009555024}{-1.578283574967857}{-3.034112598747869}{-2.204989751800595}{-2.037710618368254}{-4.466221308156312}{-4.090909592121741}{-3.177461208979167}{-2.140135873591303}{-0.8179360611654263}{-3.30027556630337}{-3.147873757133925}{-1.723221489163289}{-1.815892606325372}{-2.038127926857165}{-2.572735041881089}{-0.9542877885526574}{-3.464360264422361}{-1.619531922443762}{-2.930281253913323}{-2.507754830934717}{-2.606361584408866}{-1.397750020602006}{-3.891273879866387}{-1.18875712762711}{-1.420852962400887}{-1.034101478712767}{0.6235415035149896}{-1.184624376719577}{-0.2611839943064476}{-3.346286228718798}{-0.4429374895551811}{-1.644771560251344}{-0.9980008799012323}{-1.924444739557604}{0.2115254361364846}{-1.161063972046428}{-2.193516414489929}{-1.920483373529712}{-0.5092448642643579}{-0.3510204216373358}{0.4982290175872026}{-1.10481696468824}{-0.9531242440380729}{-0.5741953466526919}{-1.696293099157191}{-0.3828549717121742}{-1.036770822254943}{-0.5233905531143139}{1.254272560236276}{-0.4392207569613246}{-0.5855811656763715}{-1.676904182958379}{0.7383764791042771}{0.2168599433544699}{-0.6850454964182894}{-1.34004783621169}{-0.6543898227930879}{-1.740097149130617}{-0.2025040422644787}{-0.2780644100430386}{0.7994460478936321}{0.09795306385035618}{-2.784295557100446}{-0.4900039499080109}{-0.9677526094059867}{-0.6239661692493126}{-1.330643033847897}{-0.04761013535172592}{-2.617722113881605}{1.608998003925945}{1.102151536192251}{3.292033434287775}{-0.4201768992784338}{1.509803044630651}{0.9811895629009918}{1.973592292032476}{-2.011197925841634}{2.022123672806628}{0.6371554524235705}{0.4394620421852635}{1.014813338651362}{4.490331161075409}{1.126491974951524}{2.30652133685476}{-0.7871282843904022}{1.693331144469978}{1.689991286706955}{0.8065599761511213}{1.708264142123324}{2.502553991826487}{1.209227252079641}{1.716247593351136}{-1.109643060386522}{2.564280573416055}{-0.0001775558730639692}{3.860593503028447}{0.1031005457155936}{3.757608573244354}{-0.190563918412734}{1.10717314489051}{0.6439693827923361}{3.860093302359807}{-2.649901923967373}{1.755190894696522}{-1.581364090174573}{3.569688616157052}{-1.20084921570525}{2.470807531581498}{-0.2071258691522912}{3.50719125763723}{-1.924438236764932}{3.049885877007853}{0.2603910772077623}{2.120613634756388}{-0.6704497123870455}{0.1999201323094695}{2.439942510157144}{-0.6602389751870904}{2.628008039532965}{-2.174006816189205}{1.652540436853439}{-0.1008817740150073}{1.880993259703105}{-0.6269989500566402}{2.684033577871289}{0.9756029145780021}{2.535125785635225}{0.03687758204099296}{-0.03188875830274851}{-0.007149158968374193}{0.7963992688561647}{-0.4017261069744713}{2.582490850326609}{0.08959756368636058}{3.015706299974027}{1.099844197890676}{0.8690239777765068}{-0.8230311924303001}{4.627139529871777}{-0.5773660055062353}{2.056413042638156}{-0.004669049367696575}{1.533295251207934}{-0.6426050369997306}{0.6314819082760368}{-0.7439930467703051}{1.792445395487317}{1.117160853953299}{4.032875698596231}{-0.3884505760852646}{2.276262908868681}{-0.07030445805553931}{2.636909772922137}{-1.00673858370737}{3.163139953958457}{0.2857966200152383}{2.783751260344358}{0.2752951721954403}{0.8779579590475479}{2.215270752283194}{2.564369082345539})\u000a
(V<<_SHOGUN_SERIALIZABLE_ASCII_FILE_V_00_>>\u000aversion_parameter int32 1\u000aproperties uint64 1\u000acache_size int32 0\u000apreproc SGSerializable* DynamicObjectArray [\u000aversion_parameter int32 1\u000aarray Vector<SGSerializable*> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000apreprocessed SGSerializable* DynamicArray bool [\u000aversion_parameter int32 1\u000aarray Vector<bool> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000asubset_stack SGSerializable* SubsetStack [\u000aversion_parameter int32 1\u000aactive_subset SGSerializable* null []\u000aactive_subsets_stack SGSerializable* DynamicObjectArray [\u000aversion_parameter int32 1\u000aarray Vector<SGSerializable*> 0 ()\u000anum_elements int32 0\u000aresize_granularity int32 128\u000ause_sg_malloc bool t\u000afree_array bool t\u000a]\u000a]\u000acombined_weight float64 1\u000anum_vectors int32 92\u000anum_features int32 1\u000afeature_matrix SGMatrix<float64> 1 92 ({4.971298723324989}{4.705170486606431}{3.342180433294563}{5.272318172603899}{4.996203263933428}{4.112465373109931}{4.415963888874558}{4.007751244881905}{4.901115174310273}{2.67290264400485}{5.848105972446394}{4.758204312458043}{4.141875086338802}{3.789611719378585}{4.474885446850384}{4.040946607441784}{5.237658215371363}{3.649457618630332}{2.613042491607777}{3.678376575792688}{3.484710693397826}{3.315353631353902}{2.964271009555024}{-1.578283574967857}{-3.034112598747869}{-2.204989751800595}{-2.037710618368254}{-4.466221308156312}{-4.090909592121741}{-3.177461208979167}{-2.140135873591303}{-0.8179360611654263}{-3.30027556630337}{-3.147873757133925}{-1.723221489163289}{-1.815892606325372}{-2.038127926857165}{-2.572735041881089}{-0.9542877885526574}{-3.464360264422361}{-1.619531922443762}{-2.930281253913323}{-2.507754830934717}{-2.606361584408866}{-1.397750020602006}{-3.891273879866387}{-1.18875712762711}{-1.420852962400887}{-1.034101478712767}{0.6235415035149896}{-1.184624376719577}{-0.2611839943064476}{-3.346286228718798}{-0.4429374895551811}{-1.644771560251344}{-0.9980008799012323}{-1.924444739557604}{0.2115254361364846}{-1.161063972046428}{-2.193516414489929}{-1.920483373529712}{-0.5092448642643579}{-0.3510204216373358}{0.4982290175872026}{-1.10481696468824}{-0.9531242440380729}{-0.5741953466526919}{-1.696293099157191}{-0.3828549717121742}{-1.036770822254943}{-0.5233905531143139}{1.254272560236276}{-0.4392207569613246}{-0.5855811656763715}{-1.676904182958379}{0.7383764791042771}{0.2168599433544699}{-0.6850454964182894}{-1.34004783621169}{-0.6543898227930879}{-1.740097149130617}{-0.2025040422644787}{-0.2780644100430386}{0.7994460478936321}{0.09795306385035618}{-2.784295557100446}{-0.4900039499080109}{-0.9677526094059867}{-0.6239661692493126}{-1.330643033847897}{-0.04761013535172592}{-2.617722113881605})\u000a
p6
Vlatin1
p7
tp8
Rp9
tp10
b.
b.

0 comments on commit 70491d2

Please sign in to comment.