svn commit: r1023431 - /mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java

[td...@apache.org]

Author: tdunning
Date: Sun Oct 17 07:55:07 2010
New Revision: 1023431

URL: http://svn.apache.org/viewvc?rev=1023431&view=rev
Log:
MAHOUT-528 - Set gson builder up for reuse

Modified:
    mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java?rev=1023431&r1=1023430&r2=1023431&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java Sun Oct 17 07:55:07 2010
@@ -183,19 +183,20 @@ public abstract class AbstractMatrix imp
   }
 
   public static Matrix decodeMatrix(String formatString) {
-    GsonBuilder builder = new GsonBuilder();
-    builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
-    builder.registerTypeAdapter(Matrix.class, new JsonMatrixAdapter());
-    Gson gson = builder.create();
-    return gson.fromJson(formatString, Matrix.class);
+    return gson().fromJson(formatString, Matrix.class);
   }
 
   public String asFormatString() {
+    return gson().toJson(this, Matrix.class);
+  }
+
+  static Gson gson() {
     GsonBuilder builder = new GsonBuilder();
+    builder.registerTypeAdapter(VectorList.class, new VectorList.JsonVectorListAdapter());
     builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
     builder.registerTypeAdapter(Matrix.class, new JsonMatrixAdapter());
     Gson gson = builder.create();
-    return gson.toJson(this, Matrix.class);
+    return gson;
   }
 
   public Matrix assign(double value) {