hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r727990 - in /incubator/hama: site/author/src/documentation/content/xdocs/ site/author/src/documentation/resources/images/ site/publish/ site/publish/images/ trunk/src/docs/src/documentation/content/xdocs/ trunk/src/docs/src/documentation/r...
Date Fri, 19 Dec 2008 09:59:06 GMT
Author: edwardyoon
Date: Fri Dec 19 01:59:05 2008
New Revision: 727990

URL: http://svn.apache.org/viewvc?rev=727990&view=rev
Log:
Add building block to web site.

Added:
    incubator/hama/site/author/src/documentation/resources/images/block.png   (with props)
    incubator/hama/site/publish/images/block.png   (with props)
    incubator/hama/trunk/src/docs/src/documentation/resources/images/block.png   (with props)
Modified:
    incubator/hama/site/author/src/documentation/content/xdocs/index.xml
    incubator/hama/site/publish/index.html
    incubator/hama/site/publish/index.pdf
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml
    incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java
    incubator/hama/trunk/src/java/org/apache/hama/algebra/BlockCyclicMultiplyMap.java
    incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java

Modified: incubator/hama/site/author/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/hama/site/author/src/documentation/content/xdocs/index.xml?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/site/author/src/documentation/content/xdocs/index.xml (original)
+++ incubator/hama/site/author/src/documentation/content/xdocs/index.xml Fri Dec 19 01:59:05
2008
@@ -34,7 +34,9 @@
       mining, that need the intensive computation power of matrix inversion, e.g., linear

       regression, PCA, SVM and etc. It will be useful for many scientific applications, 
       e.g., physics computations, linear algebra, computational fluid dynamics, 
-      statistics, graphic rendering and many more.</p>
+      statistics, graphic rendering and many more.<br/>
+      <img src="./images/block.png" alt="Building Block"></img>
+      </p>
       
       <ul>
         <li>Scientific simulation and modeling
@@ -61,7 +63,8 @@
           </ul>
         </li>
       </ul>
-      
+      <p>For more information about Hama, please see the 
+      <a href="http://wiki.apache.org/hama">Hama wiki</a>.</p>
     </section>
     <section>
     <title>Getting Started</title>

Added: incubator/hama/site/author/src/documentation/resources/images/block.png
URL: http://svn.apache.org/viewvc/incubator/hama/site/author/src/documentation/resources/images/block.png?rev=727990&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hama/site/author/src/documentation/resources/images/block.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hama/site/publish/images/block.png
URL: http://svn.apache.org/viewvc/incubator/hama/site/publish/images/block.png?rev=727990&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hama/site/publish/images/block.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/hama/site/publish/index.html
URL: http://svn.apache.org/viewvc/incubator/hama/site/publish/index.html?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/site/publish/index.html (original)
+++ incubator/hama/site/publish/index.html Fri Dec 19 01:59:05 2008
@@ -188,7 +188,10 @@
       mining, that need the intensive computation power of matrix inversion, e.g., linear

       regression, PCA, SVM and etc. It will be useful for many scientific applications, 
       e.g., physics computations, linear algebra, computational fluid dynamics, 
-      statistics, graphic rendering and many more.</p>
+      statistics, graphic rendering and many more.<br>
+      
+<img alt="Building Block" src="./images/block.png">
+      </p>
 <ul>
         
 <li>Scientific simulation and modeling
@@ -235,9 +238,11 @@
 </li>
       
 </ul>
+<p>For more information about Hama, please see the 
+      <a href="http://wiki.apache.org/hama">Hama wiki</a>.</p>
 </div>
     
-<a name="N1004B"></a><a name="Getting+Started"></a>
+<a name="N10058"></a><a name="Getting+Started"></a>
 <h2 class="h3">Getting Started</h2>
 <div class="section">
 <ul>
@@ -248,7 +253,7 @@
 </ul>
 </div>    
     
-<a name="N1005B"></a><a name="Recent+News"></a>
+<a name="N10068"></a><a name="Recent+News"></a>
 <h2 class="h3">Recent News</h2>
 <div class="section">
 <ul>

Modified: incubator/hama/site/publish/index.pdf
URL: http://svn.apache.org/viewvc/incubator/hama/site/publish/index.pdf?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/site/publish/index.pdf (original)
+++ incubator/hama/site/publish/index.pdf Fri Dec 19 01:59:05 2008
@@ -58,10 +58,10 @@
 >>
 endobj
 14 0 obj
-<< /Length 1952 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2078 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat%$968iG&AII3n<hF%0EHd/UZ8?&,Yc==4R&R(!N$ur%:991WVZ?p5-^bO>97,[#lFC?^KiDciG!H3i*2EZgNqSUChpe[Q48>n$>nGe\3m4T=\l$if/lU]>AN@ZqsQ^[Q--RY<5j.VhYPuQqRl[dC%X,M2]=l_3baA5_"0,6b,h!I&8iq24g4ieIHW8hcE_/L;8W:WkcZ0F]n+oCpYn;HS2_!77"2dAV8u9rXO-tgihFMP]Fnq<%`Fe7s%BL[qT!sTlb'5a.$5c1d6">+<;`@p7sS:fQ0;\Q`M/u60@?b&.@F2X\VFmR_@?k;EFCN\/?5<iRSRpGd&T5^FHAIneZ4dppfRoGef4F&)-pQ>eTuafm;dof$+6,c1(jm[>GsZIAJo--j?^5F_sW73Z$YhAH'Cm,U_"q+-aR<anuUN_GgQI<R3_C=+OjaeEViH3R?<t#,uT$2e^"D8iY@h`SOsX7hCPm]P+W%,16J)",9KW:L;d1maAa'j&@`[m;&ods7jd=5s!BI-.[cRl&bBn+SbYjWlgc-18#]+B7fGra-TAAnU%Z/@EY<"_+<sMH<C7'[e)UBI>&D!'>mQOnU'6RL@\!=.KY/r!Y"f`fRu.Uh5T.PVY':aQaF6u3OP6#s=(-=/Yr<C&89RtXAcXEO`^hA%$+5%7.k!*;UlI0ZcC%5>+;-4ETs?F4pIZ-T#3:a?S;f*+)V#UJI8RZK_+UJeP-K;]q.B(^#P[#fF#2smeEikH2?LHAChD*o`bCu;BPfeuDe7@+0YmD9WNOLkSMd62T4eR>I?[ToX4scsf$gW!gJqK`2"OI&%s8U\P]-,f&_8B3b&^_-[%(2:BS)oh[MNt.cMI7^>#FFiLO#*/e=o,Q@H\.>M.MmdorXFcl)s2U;XH&XgNjNS3!&V?9e23+rhA(="l*(mCla68Yc(rOFqiHo[PTXM.![QCE&Rp-DkJENm'05JA^F?'#mZ^uVT@f:Q-bG1Iq83U2,pt
 O=7/%@FFAtOX[+BRn);8#8M-9HS*i\fn$sR/!GWsF2[.:RjM,W&(VXV[#.3IE6FY^m4GC#b=.9jub@4Al=&uF:kQX#oe)<!T4Db@.#rpo'(6ok,UaL%)U^g)QT$9;h$sdWjARue5<'jT*]/Y'tNn]T5rT$[?_Ml<X+f>gW<gS-9GEOR2d(+RL*'d5>Nn,!]M)d<B<I/L7$&>Fu#^G4=@BM?R^L[=Agc*1S]587?$:[O460+u4#i%j^i:L4#EH=N,hDPb3@%fsGiRE]GL_JZVA.6Ajb>Ysm#8T/00GsTC"sg^5&'T5(%G2VW]TLPT[dfH="p8JlJR5IV&K*Yq'Zm()B%hY/^qigpp.9pM\OVqb"5So0bF1>7A0)tCE:rHQ9jdA:,?!G[qNrqIfE#*+LJQq"'LuP_0u!:]0JP3COpApT>:qqCNA6c[2Yjo/j;#eL>:O!Q[-)b;7lKRd/)=V:]%+$)eL31&5u+:TU:,WROYmT1RA\;="Kq+L'nSf"J&l,QRbZ-L.$a&goZ]4NS&8q(3>a^L@?g<WRt,9+#g+J,^YM'0h1(iDcMat+JcmPPdaooM6$(pQ)96NDFPhuf/ahnP>uk$gAs:gr11$qab^VGkAGHPnj!`nT4=<V#9]!Xm8T?j7_?nG"^/];IZ!jdD`f4bSU6Qkr6[tQfJn_$clG%$*;Lq&0i6W8TN-#m>OfOu?^G#CsC2M2-*1]_+;kPg=L&;9B#=7FKP!r]sd/M=34<G7^!DRQG2'3nP@6"a#:>f5<FU2PeGQ(C+^nfYHaS/9iHYdBEj)XABj$qpVblI1DH^@('ICHt7m:K[Z>Bcu`h2+o[m<f6a2Lb,CA,ifQ[)W_)CA1XA$(0%E4FXdoG/1^./q1t,0Qe1E(%2ZM*VrLD6<1WsYD0(D<rJTA/bEo7XZ-'Y3XLL`*qDAH[M(\f@biu1DUI/jd9;i6*T`UNf_l>*>qL*~>
+Gat%$968iG&AII3n<hF%0EHd/UZ8?&,Yc==4R&R(!MU]n%:991WW)Wt5-^bO>9;+8":4o(p&e>;SlW<2^-t&eXf)-?[LOg&g$hM6d"X]E4+oYdoorX0]qaZ%[:X<_s6`fdWI.c;<Ld^jXhV!9c`:EE<r[bnUZ(75PBJnl4O<#hbaJ\YnLPugmHTb_LYafP/=TZX-/@sJr[Lgn)n:<80@!M9M;p9WjN"l3MQG=Q$N9K3(I_ZkPt5\4+O9WB0=_/K+7IUdo;W.k7$>VZn"c[UnUGj*j_7RnU<AZ7MggP97&OdrA6(#&I@+Urm!u<(0'm/>7J1huq&EI+]t+;57u9l>]c'c]Dj=/FH6_<#8!b#i[2pGrqck:]665-uN'r8l/Q<e5ZAc*lnfZ]3`U8I5Z2<0tng'F380Li6:1gD+j]SpHj$B<`1.gWC5uE+H`U,Sj?q,&%Pt:!s=$IL1'<d(WeYuM&m*,_M:_NDOM+f2@V,<:#)oH,4.V(#g1J$;\hPcG9jWft0LVK#i09sc(pk3WGMpD5OeTLPGZ]e?780`U03KT``OM-0hIE5!M8V)gKGu+qq$r)fWGA+D[rcKAMZAKDOIZAF8[j^gYPl!LEW,*q=e,X%o"1mK?*$P2JO[*Vbk[,(:l]0b"*22"^3ElZgCmlT2*$k1=c)dSRYp=INnai9-'FZ2%Z4SQ:F7Z%mEGU5sEM'S"Jq0eCJEr-USPNQ!<(]XNVXn?e!eYi;ceOJi09JDZ@3_FZ@5CiR1/@.G!c-9,Hmb+9"s_c,44V$t\[//Ti/+<3egD>8\[q1^@6NubY[,5e"dsSWH)S>_U3r/sN3l=\:d1529Zq^hJHcr`@='/AkH&SDXVGDRH^HbR9J,O.&r,8IO]XLJ>i.SHS*kUj-.Tgu\#hSDLC5eSe?mYkjY*(9<5;33bk=RE"H*UVB1G8TD@?&V#*KcU+7=lVp'n7eSisO(V[Ot"SR>8c5`.[0>RA)'pIA1i5XSO
 EE93+d"P8DggDQ*9nH!N$OjnF9[cpPopmt-AR@r\RntlQC)Z9=]H/Y6i-_Md3(>/$to+]V6hec+JD2Ut9?eMh^TF#S3Vi/I6nrs]/'&nS&>?#X'>ohN7li(;I6U77<ZCO:Gf]G'&n=$71U@]XlU-pJ'M&,L=@('Ja#B1+=jgZlSVXP`O+m6b_2*@RTkhsfTrkbIF!DIh37?\Mpbk%JME57#nq9dMc:A]<sJ&]0oQkW#LqP:jZoE8aVQ8-6net$F:RIX3U->5<&:mKff:/VScV_I9*P8"H41Bsh4*d):dNi;^Kc-YG)G)-OD*cNt!BRQ",guEIb7'DR`Ii'3HJEP/rjr3jj9BInHI8`84>N0!h0KRnq,"KmE?iX"'5c5>;2b,K1<aEKDo-&*[d"sgi'Am>2$obrEF1I)3juL?jK)lM05J]4%@"@)f?uI0)k&LT5)\5[,TuUt2d&Zgr,9pPaOXqtl7`hP1/,kC!*H<e]5-"N&\=L^*VJ/t!`[P>KX&#p5qKe3O'G,LA3ou8PFoa.JLJQoL"(u!S@smND@E,f^9BHo^D7*pDJ#oKA9n'6$GssIVQJ+9>i!&S#IZFW)+.d-U,J[?t``5gX;$h7uPnMIKmRH?KSHX,hCdu4_*i;Q"gA>A$USu;ZClM>\DPo;[Ctp"""jb#)F!%!N*e.,H=pk[K'8bW7*q/O3b_4:?YW%.:.Oift+Tm\a]F?V=&I^QGK#M#DW6=H5ctr8V7E2M@4,e[]hTPIGWlI]LM:a.EY?^aJnU*kT+G0`e\tT15_p(>\>kNO`Q([UOI[\</Br&$!^M*:<JNm#ickdFUE#8_?X./Rm0DT<sD9TY_SP'.85iHi*ngjVX"Hf<K(3pc"rB8KcHr,b)1rPds&<6e7\HCc5/0>k*/F:[^.2/'g=qLKn$%7jD1d*Gr%NdWU!]C^:kjD^`anFQig9mFG#B&A2^3(ee\[:rWKFn(<V8rSUhpEK40i>Q4<KVh-gr7
 SMf7gAO/Jrd_UVddG4KJ6rD#;RtqA$TqV0Y"@A[gsn`,;8egMX^HpXNCp[.BC2frgl*#SQHP;sP4$m1QO4.Fh#XLsFiVm[K;k~>
 endstream
 endobj
 15 0 obj
@@ -80,6 +80,7 @@
 19 0 R
 20 0 R
 21 0 R
+22 0 R
 ]
 endobj
 17 0 obj
@@ -96,10 +97,10 @@
 18 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 334.132 180.996 322.132 ]
+/Rect [ 330.288 361.266 383.28 349.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://wiki.apache.org/hama/GettingStarted)
+/A << /URI (http://wiki.apache.org/hama)
 /S /URI >>
 /H /I
 >>
@@ -107,10 +108,10 @@
 19 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 193.656 257.398 232.32 245.398 ]
+/Rect [ 108.0 312.932 180.996 300.932 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://wiki.apache.org/hama/ScaLAPACK)
+/A << /URI (http://wiki.apache.org/hama/GettingStarted)
 /S /URI >>
 /H /I
 >>
@@ -118,10 +119,10 @@
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 411.636 257.398 476.964 245.398 ]
+/Rect [ 193.656 236.198 232.32 224.198 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://www.netlib.org/scalapack/)
+/A << /URI (http://wiki.apache.org/hama/ScaLAPACK)
 /S /URI >>
 /H /I
 >>
@@ -129,7 +130,18 @@
 21 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 367.632 244.198 482.94 232.198 ]
+/Rect [ 411.636 236.198 476.964 224.198 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://www.netlib.org/scalapack/)
+/S /URI >>
+/H /I
+>>
+endobj
+22 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 367.632 222.998 482.94 210.998 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (./developers.html)
@@ -137,57 +149,57 @@
 /H /I
 >>
 endobj
-23 0 obj
+24 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
- /Parent 22 0 R
- /Next 24 0 R
+ /Parent 23 0 R
+ /Next 25 0 R
  /A 9 0 R
 >> endobj
-24 0 obj
+25 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\107\0\145\0\164\0\164\0\151\0\156\0\147\0\40\0\123\0\164\0\141\0\162\0\164\0\145\0\144)
- /Parent 22 0 R
- /Prev 23 0 R
- /Next 25 0 R
+ /Parent 23 0 R
+ /Prev 24 0 R
+ /Next 26 0 R
  /A 11 0 R
 >> endobj
-25 0 obj
+26 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\122\0\145\0\143\0\145\0\156\0\164\0\40\0\116\0\145\0\167\0\163)
- /Parent 22 0 R
- /Prev 24 0 R
+ /Parent 23 0 R
+ /Prev 25 0 R
  /A 13 0 R
 >> endobj
-26 0 obj
+27 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-27 0 obj
+28 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-28 0 obj
+29 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-29 0 obj
+30 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-30 0 obj
+31 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -202,13 +214,13 @@
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 22 0 R
+ /Outlines 23 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 26 0 R /F5 27 0 R /F1 28 0 R /F2 29 0 R /F7 30 0 R >> 
+/Font << /F3 27 0 R /F5 28 0 R /F1 29 0 R /F2 30 0 R /F7 31 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -220,59 +232,60 @@
 11 0 obj
 <<
 /S /GoTo
-/D [15 0 R /XYZ 85.0 359.466 null]
+/D [15 0 R /XYZ 85.0 338.266 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [15 0 R /XYZ 85.0 309.132 null]
+/D [15 0 R /XYZ 85.0 287.932 null]
 >>
 endobj
-22 0 obj
+23 0 obj
 <<
- /First 23 0 R
- /Last 25 0 R
+ /First 24 0 R
+ /Last 26 0 R
 >> endobj
 xref
-0 31
+0 32
 0000000000 65535 f 
-0000005416 00000 n 
-0000005481 00000 n 
-0000005573 00000 n 
+0000005729 00000 n 
+0000005794 00000 n 
+0000005886 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000618 00000 n 
 0000000738 00000 n 
 0000000777 00000 n 
-0000005696 00000 n 
+0000006009 00000 n 
 0000000912 00000 n 
-0000005759 00000 n 
+0000006072 00000 n 
 0000001049 00000 n 
-0000005825 00000 n 
+0000006138 00000 n 
 0000001186 00000 n 
-0000003231 00000 n 
-0000003354 00000 n 
-0000003409 00000 n 
-0000003605 00000 n 
-0000003799 00000 n 
-0000003989 00000 n 
-0000004175 00000 n 
-0000005891 00000 n 
-0000004345 00000 n 
-0000004508 00000 n 
-0000004703 00000 n 
-0000004860 00000 n 
-0000004973 00000 n 
-0000005083 00000 n 
-0000005191 00000 n 
-0000005307 00000 n 
+0000003357 00000 n 
+0000003480 00000 n 
+0000003542 00000 n 
+0000003738 00000 n 
+0000003918 00000 n 
+0000004112 00000 n 
+0000004302 00000 n 
+0000004488 00000 n 
+0000006204 00000 n 
+0000004658 00000 n 
+0000004821 00000 n 
+0000005016 00000 n 
+0000005173 00000 n 
+0000005286 00000 n 
+0000005396 00000 n 
+0000005504 00000 n 
+0000005620 00000 n 
 trailer
 <<
-/Size 31
+/Size 32
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-5942
+6255
 %%EOF

Modified: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml (original)
+++ incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml Fri Dec 19 01:59:05
2008
@@ -34,7 +34,9 @@
       mining, that need the intensive computation power of matrix inversion, e.g., linear

       regression, PCA, SVM and etc. It will be useful for many scientific applications, 
       e.g., physics computations, linear algebra, computational fluid dynamics, 
-      statistics, graphic rendering and many more.</p>
+      statistics, graphic rendering and many more.<br/>
+      <img src="./images/block.png" alt="Building Block"></img>
+      </p>
       
       <ul>
         <li>Scientific simulation and modeling
@@ -61,7 +63,8 @@
           </ul>
         </li>
       </ul>
-      
+      <p>For more information about Hama, please see the 
+      <a href="http://wiki.apache.org/hama">Hama wiki</a>.</p>
     </section>
     <section>
     <title>Getting Started</title>

Added: incubator/hama/trunk/src/docs/src/documentation/resources/images/block.png
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/resources/images/block.png?rev=727990&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hama/trunk/src/docs/src/documentation/resources/images/block.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/AbstractMatrix.java Fri Dec 19 01:59:05
2008
@@ -93,6 +93,10 @@
     }
   }
 
+  public HTable getHTable() {
+    return this.table;
+  }
+  
   /** {@inheritDoc} */
   public int getRows() throws IOException {
     Cell rows = null;

Modified: incubator/hama/trunk/src/java/org/apache/hama/algebra/BlockCyclicMultiplyMap.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/algebra/BlockCyclicMultiplyMap.java?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/algebra/BlockCyclicMultiplyMap.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/algebra/BlockCyclicMultiplyMap.java Fri
Dec 19 01:59:05 2008
@@ -21,6 +21,9 @@
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.client.Scanner;
+import org.apache.hadoop.hbase.io.RowResult;
 import org.apache.hadoop.mapred.FileInputFormat;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.MapReduceBase;
@@ -71,6 +74,15 @@
       throws IOException {
     int blockSize = matrix_b.getBlockSize();
     SubMatrix a = value.get();
+    
+    HTable table = matrix_b.getHTable();
+    Scanner scan = table.getScanner(new String[] {Constants.BLOCK});
+
+    for(RowResult row : scan) {
+      BlockID segment = new BlockID(row.getRow());
+      LOG.info(segment.getRow() + ", " + segment.getColumn());
+    }
+    
     for (int j = 0; j < blockSize; j++) {
       SubMatrix b = matrix_b.getBlock(key.getColumn(), j);
       SubMatrix c = a.mult(b);

Modified: incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java?rev=727990&r1=727989&r2=727990&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java Fri Dec 19 01:59:05 2008
@@ -72,14 +72,13 @@
   }
 
   public void readFields(DataInput in) throws IOException {
-    row = in.readInt();
     column = in.readInt();
+    row = in.readInt();
   }
 
   public void write(DataOutput out) throws IOException {
-    out.writeInt(row);
-    // out.write(column);
     out.writeInt(column);
+    out.writeInt(row);
   }
 
   /**



Mime
View raw message