Merge pull request apache#3 from cpoerschke/master-solr-11597d

tweaks to fix two test failures. Sorry about that... wrong files in the repository directory :(.
cpoerschke · Feb 9, 2018 · 838f618 · 838f618
2 parents c6a1fa9 + 813a2da
commit 838f618
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.json b/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.json
@@ -18,7 +18,7 @@
             },
             {
                 "matrix": [ [ 16.0, 17.0, 18.0 ],
-                            [ 19.0, 20.0, 21.0 ],
+                            [ 19.0, 20.0, 21.0 ] ],
                 "bias" : [ 19.0 ],
                 "activation": "none"
             }

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
@@ -118,14 +118,14 @@ public void testLinearAlgebra() {
     ArrayList<Map<String,Object>> layers = new ArrayList<Map<String,Object>>();
 
     HashMap layerOne = new HashMap<String,Object>();
-    layerOne.put("matrix", matrixOne);
-    layerOne.put("bias", biasOne);
+    layerOne.put("matrix", matrixOneList);
+    layerOne.put("bias", biasOneList);
     layerOne.put("activation", "relu");
     layers.add(layerOne);
 
     HashMap layerTwo = new HashMap<String,Object>();
-    layerTwo.put("matrix", matrixTwo);
-    layerTwo.put("bias", biasTwo);
+    layerTwo.put("matrix", matrixTwoList);
+    layerTwo.put("bias", biasTwoList);
     layerTwo.put("activation", "relu");
     layers.add(layerTwo);
 
@@ -274,8 +274,8 @@ public void layerDimensionMismatchTest() throws Exception {
   @Test
   public void tooManyRowsTest() throws Exception {
     final ModelException expectedException =
-        new ModelException("The output matrix for model \"neuralnetworkmodel_too_many_rows\" has 2 rows, " +
-                           "but should only have one.");
+        new ModelException("Dimension mismatch in model \"neuralnetworkmodel_too_many_rows\". " +
+                           "Layer 1 has 1 bias weights but 2 weight matrix rows.");
     try {
         createModelFromFiles("neuralnetworkmodel_too_many_rows.json",
                "neuralnetworkmodel_features.json");