From 867ec000524c9e9406d06d000773337885f7191a Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Tue, 11 Sep 2018 16:09:02 +0200
Subject: Add model-evaluation tag

Add model-evaluation tag under container and only
include the ModelsEvaluation component if present.
---
 .../src/test/cfg/application/ml_serving/services.xml  |  1 +
 .../ml_serving_name_collision/services.xml            |  1 +
 .../ml_serving_not_activated/models/xgboost.2.2.json  | 19 +++++++++++++++++++
 .../application/ml_serving_not_activated/services.xml | 13 +++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 config-model/src/test/cfg/application/ml_serving_not_activated/models/xgboost.2.2.json
 create mode 100644 config-model/src/test/cfg/application/ml_serving_not_activated/services.xml

(limited to 'config-model/src/test/cfg')

diff --git a/config-model/src/test/cfg/application/ml_serving/services.xml b/config-model/src/test/cfg/application/ml_serving/services.xml
index 42528336bc5..41f44e04c99 100644
--- a/config-model/src/test/cfg/application/ml_serving/services.xml
+++ b/config-model/src/test/cfg/application/ml_serving/services.xml
@@ -3,6 +3,7 @@
 <services version="1.0">
 
   <container version="1.0">
+    <model-evaluation/>
     <nodes>
       <node hostalias="node1" />
     </nodes>
diff --git a/config-model/src/test/cfg/application/ml_serving_name_collision/services.xml b/config-model/src/test/cfg/application/ml_serving_name_collision/services.xml
index 42528336bc5..41f44e04c99 100644
--- a/config-model/src/test/cfg/application/ml_serving_name_collision/services.xml
+++ b/config-model/src/test/cfg/application/ml_serving_name_collision/services.xml
@@ -3,6 +3,7 @@
 <services version="1.0">
 
   <container version="1.0">
+    <model-evaluation/>
     <nodes>
       <node hostalias="node1" />
     </nodes>
diff --git a/config-model/src/test/cfg/application/ml_serving_not_activated/models/xgboost.2.2.json b/config-model/src/test/cfg/application/ml_serving_not_activated/models/xgboost.2.2.json
new file mode 100644
index 00000000000..f8949b47e52
--- /dev/null
+++ b/config-model/src/test/cfg/application/ml_serving_not_activated/models/xgboost.2.2.json
@@ -0,0 +1,19 @@
+[
+  { "nodeid": 0, "depth": 0, "split": "f29", "split_condition": -0.1234567, "yes": 1, "no": 2, "missing": 1, "children": [
+    { "nodeid": 1, "depth": 1, "split": "f56", "split_condition": -0.242398, "yes": 3, "no": 4, "missing": 3, "children": [
+      { "nodeid": 3, "leaf": 1.71218 },
+      { "nodeid": 4, "leaf": -1.70044 }
+    ]},
+    { "nodeid": 2, "depth": 1, "split": "f109", "split_condition": 0.8723473, "yes": 5, "no": 6, "missing": 5, "children": [
+      { "nodeid": 5, "leaf": -1.94071 },
+      { "nodeid": 6, "leaf": 1.85965 }
+    ]}
+  ]},
+  { "nodeid": 0, "depth": 0, "split": "f60", "split_condition": -0.482947, "yes": 1, "no": 2, "missing": 1, "children": [
+    { "nodeid": 1, "depth": 1, "split": "f29", "split_condition": -4.2387498, "yes": 3, "no": 4, "missing": 3, "children": [
+      { "nodeid": 3, "leaf": 0.784718 },
+      { "nodeid": 4, "leaf": -0.96853 }
+    ]},
+    { "nodeid": 2, "leaf": -6.23624 }
+  ]}
+]
\ No newline at end of file
diff --git a/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml b/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml
new file mode 100644
index 00000000000..9d8b7a81201
--- /dev/null
+++ b/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<services version="1.0">
+
+  <container version="1.0">
+    <!-- No <model-evaluation/> tag -->
+    <nodes>
+      <node hostalias="node1" />
+    </nodes>
+
+  </container>
+
+</services>
-- 
cgit v1.2.3