From cb330ebe6b6fe3148502926d2d85124014cbd530 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 29 Jun 2016 18:12:21 +0200
Subject: [PATCH] Make test more robust

---
 src/pg/test/expected/06_segmentation_test.out | 42 +++++++++----------
 src/pg/test/sql/06_segmentation_test.sql      | 30 ++++++++++++-
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/pg/test/expected/06_segmentation_test.out b/src/pg/test/expected/06_segmentation_test.out
index 069b13b..a4c17a9 100644
--- a/src/pg/test/expected/06_segmentation_test.out
+++ b/src/pg/test/expected/06_segmentation_test.out
@@ -3,25 +3,25 @@
 _cdb_random_seeds
 
 (1 row)
-prediction
-4.5656517130822492
-1.7928053473230694
-1.0283378773916563
-2.6586517814904593
-2.9699056242935944
-3.9550646059951347
-4.1662572444459745
-3.8126334839264162
-1.8809821053623488
-1.6349065129019873
-3.0391288591472954
-3.3035970359672553
-1.5835471589451968
-3.7530378537263638
-1.0833589653009252
-3.8104965452882897
-2.665217959294802
-1.5850334252802472
-3.679401198805563
-3.5332033186588636
+within_tolerance
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
+t
 (20 rows)
diff --git a/src/pg/test/sql/06_segmentation_test.sql b/src/pg/test/sql/06_segmentation_test.sql
index 2e93afa..932cb04 100644
--- a/src/pg/test/sql/06_segmentation_test.sql
+++ b/src/pg/test/sql/06_segmentation_test.sql
@@ -2,4 +2,32 @@
 \set ECHO none
 \i test/fixtures/ml_values.sql
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
-SELECT prediction FROM cdb_crankshaft.CDB_CreateAndPredictSegment('SELECT target, x1, x2, x3 FROM ml_values WHERE class = $$train$$','target','SELECT cartodb_id, target, x1, x2, x3 FROM ml_values WHERE class = $$test$$') LIMIT 20;
+
+WITH expected AS (
+  SELECT generate_series(1000,1020) AS id, unnest(ARRAY[
+    4.5656517130822492,
+    1.7928053473230694,
+    1.0283378773916563,
+    2.6586517814904593,
+    2.9699056242935944,
+    3.9550646059951347,
+    4.1662572444459745,
+    3.8126334839264162,
+    1.8809821053623488,
+    1.6349065129019873,
+    3.0391288591472954,
+    3.3035970359672553,
+    1.5835471589451968,
+    3.7530378537263638,
+    1.0833589653009252,
+    3.8104965452882897,
+    2.665217959294802,
+    1.5850334252802472,
+    3.679401198805563,
+    3.5332033186588636
+    ]) AS expected LIMIT 20
+), prediction AS (
+  SELECT cartodb_id::integer id, prediction
+  FROM cdb_crankshaft.CDB_CreateAndPredictSegment('SELECT target, x1, x2, x3 FROM ml_values WHERE class = $$train$$','target','SELECT cartodb_id, target, x1, x2, x3 FROM ml_values WHERE class = $$test$$')
+  LIMIT 20
+) SELECT abs(e.expected - p.prediction) <= 1e-9 AS within_tolerance FROM expected e, prediction p WHERE e.id = p.id;