Merge pull request #459 from wifiBlack/week-4-king-minimum-ordering-try2

Week 4 king and minimumdegree ordering try2

Author: wifiBlack

pgtap/ordering/kingOrdering/types_check.pg

@@ -0,0 +1,57 @@
+
+/*PGR-GNU*****************************************************************
+
+Copyright (c) 2018  pgRouting developers
+Mail: [email protected]
+
+------
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ ********************************************************************PGR-GNU*/
+BEGIN;
+
+SELECT CASE WHEN min_version('4.0.0') THEN plan(5) ELSE plan(1) END;
+
+CREATE OR REPLACE FUNCTION types_check()
+RETURNS SETOF TEXT AS
+$BODY$
+BEGIN
+
+  IF NOT min_version('4.0.0') THEN
+    RETURN QUERY
+    SELECT skip(1, 'pgr_kingOrdering: Function is new on 4.0.0');
+    RETURN;
+  END IF;
+
+  RETURN QUERY SELECT has_function('pgr_kingordering');
+  RETURN QUERY SELECT has_function('pgr_kingordering', ARRAY['text']);
+  RETURN QUERY SELECT function_returns('pgr_kingordering', ARRAY['text'],  'setof record');
+
+  RETURN QUERY
+  SELECT function_args_eq('pgr_kingordering',
+    $$SELECT  '{"","seq","node"}'::TEXT[] $$
+  );
+
+  RETURN QUERY
+  SELECT function_types_eq('pgr_kingordering',
+    $$VALUES
+    ('{text,int8,int8}'::TEXT[])
+    $$
+  );
+END;
+$BODY$
+LANGUAGE plpgsql;
+
+SELECT types_check();
+
+SELECT * FROM finish();
+ROLLBACK;

pgtap/ordering/minDegreeOrdering/types_check.pg

@@ -0,0 +1,57 @@
+
+/*PGR-GNU*****************************************************************
+
+Copyright (c) 2018  pgRouting developers
+Mail: [email protected]
+
+------
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ ********************************************************************PGR-GNU*/
+BEGIN;
+
+SELECT CASE WHEN min_version('4.0.0') THEN plan(5) ELSE plan(1) END;
+
+CREATE OR REPLACE FUNCTION types_check()
+RETURNS SETOF TEXT AS
+$BODY$
+BEGIN
+
+  IF NOT min_version('4.0.0') THEN
+    RETURN QUERY
+    SELECT skip(1, 'pgr_minDegreeOrdering: Function is new on 4.0.0');
+    RETURN;
+  END IF;
+
+  RETURN QUERY SELECT has_function('pgr_mindegreeordering');
+  RETURN QUERY SELECT has_function('pgr_mindegreeordering', ARRAY['text']);
+  RETURN QUERY SELECT function_returns('pgr_mindegreeordering', ARRAY['text'],  'setof record');
+
+  RETURN QUERY
+  SELECT function_args_eq('pgr_mindegreeordering',
+    $$SELECT  '{"","seq","node"}'::TEXT[] $$
+  );
+
+  RETURN QUERY
+  SELECT function_types_eq('pgr_mindegreeordering',
+    $$VALUES
+    ('{text,int8,int8}'::TEXT[])
+    $$
+  );
+END;
+$BODY$
+LANGUAGE plpgsql;
+
+SELECT types_check();
+
+SELECT * FROM finish();
+ROLLBACK;

sql/ordering/_kingOrdering.sql

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -- _pgr_kingOrdering
 ----------------------------
 
---v3.4.0
+--v4.0
 CREATE FUNCTION _pgr_kingOrdering(
     TEXT,
     OUT seq BIGINT,

sql/ordering/_minDegreeOrdering.sql

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -- _pgr_minDegreeOrdering
 ----------------------------
 
---v3.4.0
+--v4.0.0
 CREATE FUNCTION _pgr_minDegreeOrdering(
     TEXT,
     OUT seq BIGINT,

sql/ordering/kingOrdering.sql

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -- pgr_kingOrdering
 ----------------------------
 
---v3.4.0
+--v4.0.0
 CREATE FUNCTION pgr_kingOrdering(
     TEXT, -- edges_sql (required)
     OUT seq BIGINT,

sql/ordering/minDegreeOrdering.sql

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -- pgr_minDegreeOrdering
 ----------------------------
 
---v3.4.0
+--v4.0.0
 CREATE FUNCTION pgr_minDegreeOrdering(
     TEXT, -- edges_sql (required)
     OUT seq BIGINT,