Comment out the readObject hacks

Author: AngledLuffa

src/edu/stanford/nlp/coref/neural/NeuralCorefModel.java

@@ -41,7 +41,8 @@ public NeuralCorefModel(SimpleMatrix antecedentMatrix, SimpleMatrix anaphorMatri
     this.wordEmbeddings = wordEmbeddings;
   }
 
-  // TODO: remove when ejml is upgraded
+  /*
+  // TODO: remove when ejml 0.38 is upgraded
   private void readObject(ObjectInputStream in)
     throws IOException, ClassNotFoundException
   {
@@ -58,6 +59,7 @@ private void readObject(ObjectInputStream in)
       .map(x->new SimpleMatrix(x))
       .collect(Collectors.toList());
   }
+  */
 
   /*
   private void readObject(ObjectInputStream in)

src/edu/stanford/nlp/neural/Embedding.java

@@ -85,13 +85,16 @@ public Embedding(String wordFile, String vectorFile, int embeddingSize) {
     loadWordVectors(wordFile, vectorFile);
   }
 
+  /*
+  // This hack was for ejml 0.38
   private void readObject(ObjectInputStream in)
     throws IOException, ClassNotFoundException
   {
     in.defaultReadObject();
 
     ConvertModels.transformMap(wordVectors, x -> new SimpleMatrix(x));
   }
+  */
 
   /*
   private void readObject(ObjectInputStream in)

src/edu/stanford/nlp/parser/dvparser/DVModel.java

@@ -78,10 +78,12 @@ public class DVModel implements Serializable  {
 
   private static final Function<DMatrixRMaj, SimpleMatrix> convertDenseMatrix = matrix -> SimpleMatrix.wrap(matrix);
 
+  /*
   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
     in.defaultReadObject();
 
     // TODO: get rid of this when ejml is upgraded to a version which can deserialize SimpleMatrix
+    // ejml 0.38 had a bug when reading matrices
     binaryTransform.replaceAll(x -> new SimpleMatrix(x));
     unaryTransform.replaceAll((x, y) -> new SimpleMatrix(y));
     binaryScore.replaceAll(x -> new SimpleMatrix(x));
@@ -90,6 +92,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 
     identity = SimpleMatrix.identity(numRows);
   }
+  */
 
 
   /**

src/edu/stanford/nlp/sentiment/SentimentModel.java

@@ -182,6 +182,7 @@ private void readObject(ObjectInputStream in)
   }
   */
 
+  /*
   private void readObject(ObjectInputStream in)
     throws IOException, ClassNotFoundException
   {
@@ -201,6 +202,7 @@ private void readObject(ObjectInputStream in)
     unaryClassification.replaceAll((x, y) -> new SimpleMatrix(y));
     wordVectors.replaceAll((x, y) -> new SimpleMatrix(y));
   }
+  */
 
 
   /**