From 528b7a49cdb746cfe1448c2201bfc720b9f266f7 Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Sun, 1 Aug 2010 18:07:42 +0000 Subject: [PATCH] change: ensure the feature vectors always have the same length, i.e. missing features for individual vectors are not left out but retained as NaN; thus the index of a feature is always the same over a set of feature vectors obtained in one API call SVN: 17314 --- .../dss/screening/server/DssServiceRpcScreeningTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java index 6ef04417ef3..cfee975dad3 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java @@ -132,9 +132,9 @@ public class DssServiceRpcScreeningTest extends AssertJUnit assertFeatureVector(1, 2, dataSets.get(0).getFeatureVectors().get(1), 242.25, 243.25); assertEquals(2, dataSets.get(0).getFeatureVectors().size()); assertSame(r2, dataSets.get(1).getDataset()); - assertEquals("[f2]", dataSets.get(1).getFeatureNames().toString()); - assertFeatureVector(1, 1, dataSets.get(1).getFeatureVectors().get(0), 249.0); - assertFeatureVector(1, 2, dataSets.get(1).getFeatureVectors().get(1), 244.5); + assertEquals("[f1, f2]", dataSets.get(1).getFeatureNames().toString()); + assertFeatureVector(1, 1, dataSets.get(1).getFeatureVectors().get(0), Float.NaN, 249.0); + assertFeatureVector(1, 2, dataSets.get(1).getFeatureVectors().get(1), Float.NaN, 244.5); assertEquals(2, dataSets.get(1).getFeatureVectors().size()); assertEquals(2, dataSets.size()); context.assertIsSatisfied(); @@ -224,6 +224,6 @@ public class DssServiceRpcScreeningTest extends AssertJUnit private FeatureVectorDatasetReference createFeatureVectorDatasetReference(String dataSetCode) { - return new FeatureVectorDatasetReference(dataSetCode, "", null, null, null, null); + return new FeatureVectorDatasetReference(dataSetCode, "", null, null, null, null, null); } } -- GitLab