From 2ecfe844323ce5f28b85607beea45296b133b001 Mon Sep 17 00:00:00 2001
From: Daniele Rapetti <5535617+Iximiel@users.noreply.github.com>
Date: Thu, 3 Jul 2025 08:28:14 +0200
Subject: [PATCH] adding a new test to verify that the accelerable switching
 function returns the correct values

---
 regtest/basic/rt-make-switch/Makefile         |  1 +
 regtest/basic/rt-make-switch/config           |  1 +
 regtest/basic/rt-make-switch/main.cpp         | 95 +++++++++++++++++++
 .../rt-make-switch/out_cosinus.reference      | 11 +++
 .../out_cosinus_nostretch.reference           | 11 +++
 .../basic/rt-make-switch/out_exp.reference    | 11 +++
 .../out_exp_nostretch.reference               | 11 +++
 .../rt-make-switch/out_fastgaussian.reference | 11 +++
 .../out_fastgaussian_nostretch.reference      | 11 +++
 .../rt-make-switch/out_fastrational.reference | 11 +++
 .../out_fastrational_MMeq2MM.reference        | 11 +++
 ...t_fastrational_MMeq2MM_nostretch.reference | 11 +++
 .../out_fastrational_nostretch.reference      | 11 +++
 .../rt-make-switch/out_gaussian.reference     | 11 +++
 .../out_gaussian_nostretch.reference          | 11 +++
 regtest/basic/rt-make-switch/out_q.reference  | 11 +++
 .../rt-make-switch/out_q_nostretch.reference  | 11 +++
 .../rt-make-switch/out_rational.reference     | 11 +++
 .../out_rational_MMeq2MM.reference            | 11 +++
 .../out_rational_MMeq2MM_nostretch.reference  | 11 +++
 .../out_rational_nostretch.reference          | 11 +++
 .../basic/rt-make-switch/out_smap.reference   | 11 +++
 .../out_smap_nostretch.reference              | 11 +++
 .../rt-make-switch/out_sqr_cosinus.reference  | 11 +++
 .../out_sqr_cosinus_nostretch.reference       | 11 +++
 .../rt-make-switch/out_sqr_exp.reference      | 11 +++
 .../out_sqr_exp_nostretch.reference           | 11 +++
 .../out_sqr_fastgaussian.reference            | 11 +++
 .../out_sqr_fastgaussian_nostretch.reference  | 11 +++
 .../out_sqr_fastrational.reference            | 11 +++
 .../out_sqr_fastrational_MMeq2MM.reference    | 11 +++
 ...r_fastrational_MMeq2MM_nostretch.reference | 11 +++
 .../out_sqr_fastrational_nostretch.reference  | 11 +++
 .../rt-make-switch/out_sqr_gaussian.reference | 11 +++
 .../out_sqr_gaussian_nostretch.reference      | 11 +++
 .../basic/rt-make-switch/out_sqr_q.reference  | 11 +++
 .../out_sqr_q_nostretch.reference             | 11 +++
 .../rt-make-switch/out_sqr_rational.reference | 11 +++
 .../out_sqr_rational_MMeq2MM.reference        | 11 +++
 ...t_sqr_rational_MMeq2MM_nostretch.reference | 11 +++
 .../out_sqr_rational_nostretch.reference      | 11 +++
 .../rt-make-switch/out_sqr_smap.reference     | 11 +++
 .../out_sqr_smap_nostretch.reference          | 11 +++
 .../rt-make-switch/out_sqr_tanh.reference     | 11 +++
 .../out_sqr_tanh_nostretch.reference          | 11 +++
 .../basic/rt-make-switch/out_tanh.reference   | 11 +++
 .../out_tanh_nostretch.reference              | 11 +++
 47 files changed, 581 insertions(+)
 create mode 100644 regtest/basic/rt-make-switch/Makefile
 create mode 100644 regtest/basic/rt-make-switch/config
 create mode 100644 regtest/basic/rt-make-switch/main.cpp
 create mode 100644 regtest/basic/rt-make-switch/out_cosinus.reference
 create mode 100644 regtest/basic/rt-make-switch/out_cosinus_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_exp.reference
 create mode 100644 regtest/basic/rt-make-switch/out_exp_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastgaussian.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastgaussian_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastrational.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastrational_MMeq2MM.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastrational_MMeq2MM_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_fastrational_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_gaussian.reference
 create mode 100644 regtest/basic/rt-make-switch/out_gaussian_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_q.reference
 create mode 100644 regtest/basic/rt-make-switch/out_q_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_rational.reference
 create mode 100644 regtest/basic/rt-make-switch/out_rational_MMeq2MM.reference
 create mode 100644 regtest/basic/rt-make-switch/out_rational_MMeq2MM_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_rational_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_smap.reference
 create mode 100644 regtest/basic/rt-make-switch/out_smap_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_cosinus.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_cosinus_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_exp.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_exp_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastgaussian.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastgaussian_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastrational.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_fastrational_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_gaussian.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_gaussian_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_q.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_q_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_rational.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_rational_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_smap.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_smap_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_tanh.reference
 create mode 100644 regtest/basic/rt-make-switch/out_sqr_tanh_nostretch.reference
 create mode 100644 regtest/basic/rt-make-switch/out_tanh.reference
 create mode 100644 regtest/basic/rt-make-switch/out_tanh_nostretch.reference

diff --git a/regtest/basic/rt-make-switch/Makefile b/regtest/basic/rt-make-switch/Makefile
new file mode 100644
index 0000000000..3703b27cea
--- /dev/null
+++ b/regtest/basic/rt-make-switch/Makefile
@@ -0,0 +1 @@
+include ../../scripts/test.make
diff --git a/regtest/basic/rt-make-switch/config b/regtest/basic/rt-make-switch/config
new file mode 100644
index 0000000000..df1f95bf3e
--- /dev/null
+++ b/regtest/basic/rt-make-switch/config
@@ -0,0 +1 @@
+type=make
diff --git a/regtest/basic/rt-make-switch/main.cpp b/regtest/basic/rt-make-switch/main.cpp
new file mode 100644
index 0000000000..596beb06d9
--- /dev/null
+++ b/regtest/basic/rt-make-switch/main.cpp
@@ -0,0 +1,95 @@
+
+#include "plumed/tools/SwitchingFunction.h"
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <utility>
+
+
+using PLMD::SwitchingFunction;
+using PLMD::SwitchingFunctionAccelerable;
+
+
+struct callSQR {
+  constexpr static auto kind="sqr_";
+  template<typename T>
+  static std::pair <double,double> call(const T& sw, double point) {
+    double deriv;
+    point *= point;
+    double value = sw.calculateSqr(point,deriv);
+    return std::make_pair(value,deriv);
+  }
+};
+
+struct callplain {
+  constexpr static auto kind="";
+  template<typename T>
+  static std::pair <double,double> call(const T& sw, double point) {
+    double deriv;
+    double value = sw.calculate(point,deriv);
+    return std::make_pair(value,deriv);
+  }
+};
+
+template<typename caller>
+void test(const std::string& name, std::string definition,bool stretch=true) {
+  if (!stretch) {
+    definition += " NOSTRETCH ";
+  }
+
+  std::ofstream os("out_"+std::string(caller::kind)+name+(stretch ? "" : "_nostretch"));
+  os <<std::fixed<<std::setprecision(6);
+  SwitchingFunction sw;
+  std::string error;
+  sw.set(definition,error);
+  if (!error.empty()) {
+    std::cerr<<error<<"\n";
+  }
+
+  error.clear();
+  SwitchingFunctionAccelerable swa;
+  swa.set(definition,error);
+  if (!error.empty()) {
+    std::cerr<<error<<"\n";
+  }
+  os << "point :\tvalue deriv\tvalue_acc deriv_acc\tvalue_delta deriv_delta\n";
+  for (int i=0; i<10; i++) {
+    double point=i/2.50;
+    double deriv;
+    double value;
+    os<< point <<" :\t";
+    std::tie(value,deriv) = caller::call(sw, point);
+    os << value << " " << deriv <<"\t";
+    double deriv_acc;
+    double value_acc;
+    std::tie(value_acc,deriv_acc) = caller::call(swa, point);
+    os << value_acc << " " << deriv_acc <<"\t";
+    os << value-value_acc << " " << deriv-deriv_acc <<"\n";
+  }
+}
+
+
+int main() {
+  for(const auto &x: {
+  std::pair<std::string,std::string> {"COSINUS R_0=2.6","cosinus"},
+{"EXP R_0=0.8 D_0=0.5 D_MAX=2.6","exp"},
+{"GAUSSIAN R_0=1.0 D_0=0.0 D_MAX=2.6","fastgaussian"},
+{"GAUSSIAN R_0=1.0 D_0=0.3 D_MAX=2.6","gaussian"},
+{"RATIONAL R_0=1.3 NN=6 MM=10 D_MAX=2.6","fastrational"},
+{"RATIONAL R_0=1.3 D_MAX=2.6","fastrational_MMeq2MM"},
+{"RATIONAL R_0=1.3 NN=5 MM=11 D_MAX=2.6","rational"},
+{"RATIONAL R_0=1.3 NN=5 D_MAX=2.6","rational_MMeq2MM"},
+{"Q R_0=1.0 D_0=0.3 BETA=1.0 LAMBDA=1.0 REF=1.3 D_MAX=2.6","q"},
+{"SMAP R_0=1.3 A=3 B=2 D_MAX=2.6","smap"},
+{"TANH R_0=1.3 D_MAX=2.6","tanh"}
+    }) {
+    auto [definition, name] = x;
+    test<callplain> (name,definition);
+    test<callplain> (name,definition,false);
+    test<callSQR> (name,definition);
+    test<callSQR> (name,definition,false);
+
+  }
+
+  return 0;
+}
diff --git a/regtest/basic/rt-make-switch/out_cosinus.reference b/regtest/basic/rt-make-switch/out_cosinus.reference
new file mode 100644
index 0000000000..33d24cff28
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_cosinus.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.942728 -0.269965	0.942728 -0.269965	0.000000 0.000000
+0.800000 :	0.784032 -0.239042	0.784032 -0.239042	0.000000 0.000000
+1.200000 :	0.560268 -0.192227	0.560268 -0.192227	0.000000 0.000000
+1.600000 :	0.322698 -0.135791	0.322698 -0.135791	0.000000 0.000000
+2.000000 :	0.125745 -0.077044	0.125745 -0.077044	0.000000 0.000000
+2.400000 :	0.014529 -0.023170	0.014529 -0.023170	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_cosinus_nostretch.reference b/regtest/basic/rt-make-switch/out_cosinus_nostretch.reference
new file mode 100644
index 0000000000..33d24cff28
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_cosinus_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.942728 -0.269965	0.942728 -0.269965	0.000000 0.000000
+0.800000 :	0.784032 -0.239042	0.784032 -0.239042	0.000000 0.000000
+1.200000 :	0.560268 -0.192227	0.560268 -0.192227	0.000000 0.000000
+1.600000 :	0.322698 -0.135791	0.322698 -0.135791	0.000000 0.000000
+2.000000 :	0.125745 -0.077044	0.125745 -0.077044	0.000000 0.000000
+2.400000 :	0.014529 -0.023170	0.014529 -0.023170	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_exp.reference b/regtest/basic/rt-make-switch/out_exp.reference
new file mode 100644
index 0000000000..5ca66df0eb
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_exp.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.800000 :	0.662867 -1.157757	0.662867 -1.157757	0.000000 0.000000
+1.200000 :	0.371321 -0.468143	0.371321 -0.468143	0.000000 0.000000
+1.600000 :	0.194489 -0.212958	0.194489 -0.212958	0.000000 0.000000
+2.000000 :	0.087234 -0.103332	0.087234 -0.103332	0.000000 0.000000
+2.400000 :	0.022182 -0.052228	0.022182 -0.052228	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_exp_nostretch.reference b/regtest/basic/rt-make-switch/out_exp_nostretch.reference
new file mode 100644
index 0000000000..ce14bf2f3a
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_exp_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.800000 :	0.687289 -1.073889	0.687289 -1.073889	0.000000 0.000000
+1.200000 :	0.416862 -0.434231	0.416862 -0.434231	0.000000 0.000000
+1.600000 :	0.252840 -0.197531	0.252840 -0.197531	0.000000 0.000000
+2.000000 :	0.153355 -0.095847	0.153355 -0.095847	0.000000 0.000000
+2.400000 :	0.093014 -0.048445	0.093014 -0.048445	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastgaussian.reference b/regtest/basic/rt-make-switch/out_fastgaussian.reference
new file mode 100644
index 0000000000..cc1cf962db
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastgaussian.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.920406 -0.955654	0.920406 -0.955654	0.000000 0.000000
+0.800000 :	0.716496 -0.751744	0.716496 -0.751744	0.000000 0.000000
+1.200000 :	0.468662 -0.503909	0.468662 -0.503909	0.000000 0.000000
+1.600000 :	0.252590 -0.287837	0.252590 -0.287837	0.000000 0.000000
+2.000000 :	0.104858 -0.140106	0.104858 -0.140106	0.000000 0.000000
+2.400000 :	0.022866 -0.058113	0.022866 -0.058113	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastgaussian_nostretch.reference b/regtest/basic/rt-make-switch/out_fastgaussian_nostretch.reference
new file mode 100644
index 0000000000..0f82634a11
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastgaussian_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.923116 -0.923116	0.923116 -0.923116	0.000000 0.000000
+0.800000 :	0.726149 -0.726149	0.726149 -0.726149	0.000000 0.000000
+1.200000 :	0.486752 -0.486752	0.486752 -0.486752	0.000000 0.000000
+1.600000 :	0.278037 -0.278037	0.278037 -0.278037	0.000000 0.000000
+2.000000 :	0.135335 -0.135335	0.135335 -0.135335	0.000000 0.000000
+2.400000 :	0.056135 -0.056135	0.056135 -0.056135	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastrational.reference b/regtest/basic/rt-make-switch/out_fastrational.reference
new file mode 100644
index 0000000000..5252ca6572
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastrational.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999104 -0.033405	0.999104 -0.033405	0.000000 0.000000
+0.800000 :	0.950037 -0.422254	0.950037 -0.422254	0.000000 0.000000
+1.200000 :	0.672132 -0.809075	0.672132 -0.809075	0.000000 0.000000
+1.600000 :	0.312593 -0.444722	0.312593 -0.444722	0.000000 0.000000
+2.000000 :	0.112650 -0.162544	0.112650 -0.162544	0.000000 0.000000
+2.400000 :	0.023987 -0.060151	0.023987 -0.060151	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM.reference b/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM.reference
new file mode 100644
index 0000000000..48d9b65085
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999139 -0.032265	0.999139 -0.032265	0.000000 0.000000
+0.800000 :	0.947683 -0.465209	0.947683 -0.465209	0.000000 0.000000
+1.200000 :	0.611837 -0.999211	0.611837 -0.999211	0.000000 0.000000
+1.600000 :	0.211288 -0.413005	0.211288 -0.413005	0.000000 0.000000
+2.000000 :	0.055601 -0.099346	0.055601 -0.099346	0.000000 0.000000
+2.400000 :	0.009395 -0.025421	0.009395 -0.025421	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM_nostretch.reference b/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM_nostretch.reference
new file mode 100644
index 0000000000..307da341e2
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastrational_MMeq2MM_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999152 -0.031768	0.999152 -0.031768	0.000000 0.000000
+0.800000 :	0.948488 -0.458052	0.948488 -0.458052	0.000000 0.000000
+1.200000 :	0.617808 -0.983838	0.617808 -0.983838	0.000000 0.000000
+1.600000 :	0.223422 -0.406651	0.223422 -0.406651	0.000000 0.000000
+2.000000 :	0.070130 -0.097817	0.070130 -0.097817	0.000000 0.000000
+2.400000 :	0.024635 -0.025030	0.024635 -0.025030	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_fastrational_nostretch.reference b/regtest/basic/rt-make-switch/out_fastrational_nostretch.reference
new file mode 100644
index 0000000000..d3e2d28131
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_fastrational_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999159 -0.031348	0.999159 -0.031348	0.000000 0.000000
+0.800000 :	0.953114 -0.396250	0.953114 -0.396250	0.000000 0.000000
+1.200000 :	0.692323 -0.759249	0.692323 -0.759249	0.000000 0.000000
+1.600000 :	0.354926 -0.417334	0.354926 -0.417334	0.000000 0.000000
+2.000000 :	0.167296 -0.152534	0.167296 -0.152534	0.000000 0.000000
+2.400000 :	0.084094 -0.056447	0.084094 -0.056447	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_gaussian.reference b/regtest/basic/rt-make-switch/out_gaussian.reference
new file mode 100644
index 0000000000..6714af568e
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_gaussian.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.994631 -0.267766	0.994631 -0.267766	0.000000 0.000000
+0.800000 :	0.873516 -0.593718	0.873516 -0.593718	0.000000 0.000000
+1.200000 :	0.641523 -0.538467	0.641523 -0.538467	0.000000 0.000000
+1.600000 :	0.385957 -0.375691	0.385957 -0.375691	0.000000 0.000000
+2.000000 :	0.177332 -0.215700	0.177332 -0.215700	0.000000 0.000000
+2.400000 :	0.042245 -0.103843	0.042245 -0.103843	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_gaussian_nostretch.reference b/regtest/basic/rt-make-switch/out_gaussian_nostretch.reference
new file mode 100644
index 0000000000..59d95d7220
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_gaussian_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.995012 -0.248753	0.995012 -0.248753	0.000000 0.000000
+0.800000 :	0.882497 -0.551561	0.882497 -0.551561	0.000000 0.000000
+1.200000 :	0.666977 -0.500233	0.666977 -0.500233	0.000000 0.000000
+1.600000 :	0.429557 -0.349015	0.429557 -0.349015	0.000000 0.000000
+2.000000 :	0.235746 -0.200384	0.235746 -0.200384	0.000000 0.000000
+2.400000 :	0.110251 -0.096469	0.110251 -0.096469	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_q.reference b/regtest/basic/rt-make-switch/out_q.reference
new file mode 100644
index 0000000000..4d5bb289ad
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_q.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.632174 -0.653764	0.632174 -0.653764	0.000000 0.000000
+0.800000 :	0.519567 -0.373812	0.519567 -0.373812	0.000000 0.000000
+1.200000 :	0.395521 -0.264449	0.395521 -0.264449	0.000000 0.000000
+1.600000 :	0.269004 -0.194426	0.269004 -0.194426	0.000000 0.000000
+2.000000 :	0.149710 -0.141068	0.149710 -0.141068	0.000000 0.000000
+2.400000 :	0.045270 -0.099348	0.045270 -0.099348	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_q_nostretch.reference b/regtest/basic/rt-make-switch/out_q_nostretch.reference
new file mode 100644
index 0000000000..5a74de3d97
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_q_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.710950 -0.513751	0.710950 -0.513751	0.000000 0.000000
+0.800000 :	0.622459 -0.293755	0.622459 -0.293755	0.000000 0.000000
+1.200000 :	0.524979 -0.207813	0.524979 -0.207813	0.000000 0.000000
+1.600000 :	0.425557 -0.152786	0.425557 -0.152786	0.000000 0.000000
+2.000000 :	0.331812 -0.110856	0.331812 -0.110856	0.000000 0.000000
+2.400000 :	0.249740 -0.078071	0.249740 -0.078071	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_rational.reference b/regtest/basic/rt-make-switch/out_rational.reference
new file mode 100644
index 0000000000..dbee50a03d
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_rational.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997202 -0.087348	0.997202 -0.087348	0.000000 0.000000
+0.800000 :	0.914848 -0.626455	0.914848 -0.626455	0.000000 0.000000
+1.200000 :	0.556690 -0.941310	0.556690 -0.941310	0.000000 0.000000
+1.600000 :	0.194710 -0.369840	0.194710 -0.369840	0.000000 0.000000
+2.000000 :	0.052914 -0.092889	0.052914 -0.092889	0.000000 0.000000
+2.400000 :	0.009102 -0.024515	0.009102 -0.024515	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_rational_MMeq2MM.reference b/regtest/basic/rt-make-switch/out_rational_MMeq2MM.reference
new file mode 100644
index 0000000000..c28041165c
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_rational_MMeq2MM.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997164 -0.088390	0.997164 -0.088390	0.000000 0.000000
+0.800000 :	0.916369 -0.600381	0.916369 -0.600381	0.000000 0.000000
+1.200000 :	0.586200 -0.860272	0.586200 -0.860272	0.000000 0.000000
+1.600000 :	0.238420 -0.388968	0.238420 -0.388968	0.000000 0.000000
+2.000000 :	0.075965 -0.120085	0.075965 -0.120085	0.000000 0.000000
+2.400000 :	0.014694 -0.038105	0.014694 -0.038105	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_rational_MMeq2MM_nostretch.reference b/regtest/basic/rt-make-switch/out_rational_MMeq2MM_nostretch.reference
new file mode 100644
index 0000000000..c434b2eb18
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_rational_MMeq2MM_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997250 -0.085712	0.997250 -0.085712	0.000000 0.000000
+0.800000 :	0.918903 -0.582187	0.918903 -0.582187	0.000000 0.000000
+1.200000 :	0.598739 -0.834204	0.598739 -0.834204	0.000000 0.000000
+1.600000 :	0.261498 -0.377181	0.261498 -0.377181	0.000000 0.000000
+2.000000 :	0.103966 -0.116446	0.103966 -0.116446	0.000000 0.000000
+2.400000 :	0.044552 -0.036951	0.044552 -0.036951	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_rational_nostretch.reference b/regtest/basic/rt-make-switch/out_rational_nostretch.reference
new file mode 100644
index 0000000000..5564d56621
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_rational_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997244 -0.086025	0.997244 -0.086025	0.000000 0.000000
+0.800000 :	0.916137 -0.616968	0.916137 -0.616968	0.000000 0.000000
+1.200000 :	0.563403 -0.927055	0.563403 -0.927055	0.000000 0.000000
+1.600000 :	0.206906 -0.364239	0.206906 -0.364239	0.000000 0.000000
+2.000000 :	0.067257 -0.091483	0.067257 -0.091483	0.000000 0.000000
+2.400000 :	0.024108 -0.024144	0.024108 -0.024144	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_smap.reference b/regtest/basic/rt-make-switch/out_smap.reference
new file mode 100644
index 0000000000..cdeca384c1
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_smap.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.959520 -0.726923	0.959520 -0.726923	0.000000 0.000000
+0.800000 :	0.749150 -0.877324	0.749150 -0.877324	0.000000 0.000000
+1.200000 :	0.466716 -0.538373	0.466716 -0.538373	0.000000 0.000000
+1.600000 :	0.252301 -0.267445	0.252301 -0.267445	0.000000 0.000000
+2.000000 :	0.115959 -0.133200	0.115959 -0.133200	0.000000 0.000000
+2.400000 :	0.030514 -0.070589	0.030514 -0.070589	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_smap_nostretch.reference b/regtest/basic/rt-make-switch/out_smap_nostretch.reference
new file mode 100644
index 0000000000..9f4753cc01
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_smap_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.965996 -0.610627	0.965996 -0.610627	0.000000 0.000000
+0.800000 :	0.789282 -0.736967	0.789282 -0.736967	0.000000 0.000000
+1.200000 :	0.552033 -0.452242	0.552033 -0.452242	0.000000 0.000000
+1.600000 :	0.371920 -0.224658	0.371920 -0.224658	0.000000 0.000000
+2.000000 :	0.257391 -0.111890	0.257391 -0.111890	0.000000 0.000000
+2.400000 :	0.185615 -0.059296	0.185615 -0.059296	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_cosinus.reference b/regtest/basic/rt-make-switch/out_sqr_cosinus.reference
new file mode 100644
index 0000000000..33d24cff28
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_cosinus.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.942728 -0.269965	0.942728 -0.269965	0.000000 0.000000
+0.800000 :	0.784032 -0.239042	0.784032 -0.239042	0.000000 0.000000
+1.200000 :	0.560268 -0.192227	0.560268 -0.192227	0.000000 0.000000
+1.600000 :	0.322698 -0.135791	0.322698 -0.135791	0.000000 0.000000
+2.000000 :	0.125745 -0.077044	0.125745 -0.077044	0.000000 0.000000
+2.400000 :	0.014529 -0.023170	0.014529 -0.023170	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_cosinus_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_cosinus_nostretch.reference
new file mode 100644
index 0000000000..33d24cff28
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_cosinus_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.942728 -0.269965	0.942728 -0.269965	0.000000 0.000000
+0.800000 :	0.784032 -0.239042	0.784032 -0.239042	0.000000 0.000000
+1.200000 :	0.560268 -0.192227	0.560268 -0.192227	0.000000 0.000000
+1.600000 :	0.322698 -0.135791	0.322698 -0.135791	0.000000 0.000000
+2.000000 :	0.125745 -0.077044	0.125745 -0.077044	0.000000 0.000000
+2.400000 :	0.014529 -0.023170	0.014529 -0.023170	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_exp.reference b/regtest/basic/rt-make-switch/out_sqr_exp.reference
new file mode 100644
index 0000000000..5ca66df0eb
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_exp.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.800000 :	0.662867 -1.157757	0.662867 -1.157757	0.000000 0.000000
+1.200000 :	0.371321 -0.468143	0.371321 -0.468143	0.000000 0.000000
+1.600000 :	0.194489 -0.212958	0.194489 -0.212958	0.000000 0.000000
+2.000000 :	0.087234 -0.103332	0.087234 -0.103332	0.000000 0.000000
+2.400000 :	0.022182 -0.052228	0.022182 -0.052228	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_exp_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_exp_nostretch.reference
new file mode 100644
index 0000000000..ce14bf2f3a
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_exp_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.800000 :	0.687289 -1.073889	0.687289 -1.073889	0.000000 0.000000
+1.200000 :	0.416862 -0.434231	0.416862 -0.434231	0.000000 0.000000
+1.600000 :	0.252840 -0.197531	0.252840 -0.197531	0.000000 0.000000
+2.000000 :	0.153355 -0.095847	0.153355 -0.095847	0.000000 0.000000
+2.400000 :	0.093014 -0.048445	0.093014 -0.048445	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastgaussian.reference b/regtest/basic/rt-make-switch/out_sqr_fastgaussian.reference
new file mode 100644
index 0000000000..b5299b5c78
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastgaussian.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 -1.035248	1.000000 -1.035248	0.000000 0.000000
+0.400000 :	0.920406 -0.955654	0.920406 -0.955654	0.000000 0.000000
+0.800000 :	0.716496 -0.751744	0.716496 -0.751744	0.000000 0.000000
+1.200000 :	0.468662 -0.503909	0.468662 -0.503909	0.000000 0.000000
+1.600000 :	0.252590 -0.287837	0.252590 -0.287837	0.000000 0.000000
+2.000000 :	0.104858 -0.140106	0.104858 -0.140106	0.000000 0.000000
+2.400000 :	0.022866 -0.058113	0.022866 -0.058113	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastgaussian_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_fastgaussian_nostretch.reference
new file mode 100644
index 0000000000..31cee1543f
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastgaussian_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 -1.000000	1.000000 -1.000000	0.000000 0.000000
+0.400000 :	0.923116 -0.923116	0.923116 -0.923116	0.000000 0.000000
+0.800000 :	0.726149 -0.726149	0.726149 -0.726149	0.000000 0.000000
+1.200000 :	0.486752 -0.486752	0.486752 -0.486752	0.000000 0.000000
+1.600000 :	0.278037 -0.278037	0.278037 -0.278037	0.000000 0.000000
+2.000000 :	0.135335 -0.135335	0.135335 -0.135335	0.000000 0.000000
+2.400000 :	0.056135 -0.056135	0.056135 -0.056135	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastrational.reference b/regtest/basic/rt-make-switch/out_sqr_fastrational.reference
new file mode 100644
index 0000000000..5252ca6572
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastrational.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999104 -0.033405	0.999104 -0.033405	0.000000 0.000000
+0.800000 :	0.950037 -0.422254	0.950037 -0.422254	0.000000 0.000000
+1.200000 :	0.672132 -0.809075	0.672132 -0.809075	0.000000 0.000000
+1.600000 :	0.312593 -0.444722	0.312593 -0.444722	0.000000 0.000000
+2.000000 :	0.112650 -0.162544	0.112650 -0.162544	0.000000 0.000000
+2.400000 :	0.023987 -0.060151	0.023987 -0.060151	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM.reference b/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM.reference
new file mode 100644
index 0000000000..86b5b00114
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 -0.000000	1.000000 -0.000000	0.000000 0.000000
+0.400000 :	0.999139 -0.032265	0.999139 -0.032265	0.000000 0.000000
+0.800000 :	0.947683 -0.465209	0.947683 -0.465209	0.000000 0.000000
+1.200000 :	0.611837 -0.999211	0.611837 -0.999211	0.000000 0.000000
+1.600000 :	0.211288 -0.413005	0.211288 -0.413005	0.000000 0.000000
+2.000000 :	0.055601 -0.099346	0.055601 -0.099346	0.000000 0.000000
+2.400000 :	0.009395 -0.025421	0.009395 -0.025421	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM_nostretch.reference
new file mode 100644
index 0000000000..dce38a1209
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastrational_MMeq2MM_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 -0.000000	1.000000 -0.000000	0.000000 0.000000
+0.400000 :	0.999152 -0.031768	0.999152 -0.031768	0.000000 0.000000
+0.800000 :	0.948488 -0.458052	0.948488 -0.458052	0.000000 0.000000
+1.200000 :	0.617808 -0.983838	0.617808 -0.983838	0.000000 0.000000
+1.600000 :	0.223422 -0.406651	0.223422 -0.406651	0.000000 0.000000
+2.000000 :	0.070130 -0.097817	0.070130 -0.097817	0.000000 0.000000
+2.400000 :	0.024635 -0.025030	0.024635 -0.025030	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_fastrational_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_fastrational_nostretch.reference
new file mode 100644
index 0000000000..d3e2d28131
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_fastrational_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.999159 -0.031348	0.999159 -0.031348	0.000000 0.000000
+0.800000 :	0.953114 -0.396250	0.953114 -0.396250	0.000000 0.000000
+1.200000 :	0.692323 -0.759249	0.692323 -0.759249	0.000000 0.000000
+1.600000 :	0.354926 -0.417334	0.354926 -0.417334	0.000000 0.000000
+2.000000 :	0.167296 -0.152534	0.167296 -0.152534	0.000000 0.000000
+2.400000 :	0.084094 -0.056447	0.084094 -0.056447	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_gaussian.reference b/regtest/basic/rt-make-switch/out_sqr_gaussian.reference
new file mode 100644
index 0000000000..6714af568e
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_gaussian.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.994631 -0.267766	0.994631 -0.267766	0.000000 0.000000
+0.800000 :	0.873516 -0.593718	0.873516 -0.593718	0.000000 0.000000
+1.200000 :	0.641523 -0.538467	0.641523 -0.538467	0.000000 0.000000
+1.600000 :	0.385957 -0.375691	0.385957 -0.375691	0.000000 0.000000
+2.000000 :	0.177332 -0.215700	0.177332 -0.215700	0.000000 0.000000
+2.400000 :	0.042245 -0.103843	0.042245 -0.103843	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_gaussian_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_gaussian_nostretch.reference
new file mode 100644
index 0000000000..59d95d7220
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_gaussian_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.995012 -0.248753	0.995012 -0.248753	0.000000 0.000000
+0.800000 :	0.882497 -0.551561	0.882497 -0.551561	0.000000 0.000000
+1.200000 :	0.666977 -0.500233	0.666977 -0.500233	0.000000 0.000000
+1.600000 :	0.429557 -0.349015	0.429557 -0.349015	0.000000 0.000000
+2.000000 :	0.235746 -0.200384	0.235746 -0.200384	0.000000 0.000000
+2.400000 :	0.110251 -0.096469	0.110251 -0.096469	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_q.reference b/regtest/basic/rt-make-switch/out_sqr_q.reference
new file mode 100644
index 0000000000..4d5bb289ad
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_q.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.632174 -0.653764	0.632174 -0.653764	0.000000 0.000000
+0.800000 :	0.519567 -0.373812	0.519567 -0.373812	0.000000 0.000000
+1.200000 :	0.395521 -0.264449	0.395521 -0.264449	0.000000 0.000000
+1.600000 :	0.269004 -0.194426	0.269004 -0.194426	0.000000 0.000000
+2.000000 :	0.149710 -0.141068	0.149710 -0.141068	0.000000 0.000000
+2.400000 :	0.045270 -0.099348	0.045270 -0.099348	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_q_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_q_nostretch.reference
new file mode 100644
index 0000000000..5a74de3d97
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_q_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.710950 -0.513751	0.710950 -0.513751	0.000000 0.000000
+0.800000 :	0.622459 -0.293755	0.622459 -0.293755	0.000000 0.000000
+1.200000 :	0.524979 -0.207813	0.524979 -0.207813	0.000000 0.000000
+1.600000 :	0.425557 -0.152786	0.425557 -0.152786	0.000000 0.000000
+2.000000 :	0.331812 -0.110856	0.331812 -0.110856	0.000000 0.000000
+2.400000 :	0.249740 -0.078071	0.249740 -0.078071	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_rational.reference b/regtest/basic/rt-make-switch/out_sqr_rational.reference
new file mode 100644
index 0000000000..dbee50a03d
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_rational.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997202 -0.087348	0.997202 -0.087348	0.000000 0.000000
+0.800000 :	0.914848 -0.626455	0.914848 -0.626455	0.000000 0.000000
+1.200000 :	0.556690 -0.941310	0.556690 -0.941310	0.000000 0.000000
+1.600000 :	0.194710 -0.369840	0.194710 -0.369840	0.000000 0.000000
+2.000000 :	0.052914 -0.092889	0.052914 -0.092889	0.000000 0.000000
+2.400000 :	0.009102 -0.024515	0.009102 -0.024515	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM.reference b/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM.reference
new file mode 100644
index 0000000000..c28041165c
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997164 -0.088390	0.997164 -0.088390	0.000000 0.000000
+0.800000 :	0.916369 -0.600381	0.916369 -0.600381	0.000000 0.000000
+1.200000 :	0.586200 -0.860272	0.586200 -0.860272	0.000000 0.000000
+1.600000 :	0.238420 -0.388968	0.238420 -0.388968	0.000000 0.000000
+2.000000 :	0.075965 -0.120085	0.075965 -0.120085	0.000000 0.000000
+2.400000 :	0.014694 -0.038105	0.014694 -0.038105	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM_nostretch.reference
new file mode 100644
index 0000000000..c434b2eb18
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_rational_MMeq2MM_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997250 -0.085712	0.997250 -0.085712	0.000000 0.000000
+0.800000 :	0.918903 -0.582187	0.918903 -0.582187	0.000000 0.000000
+1.200000 :	0.598739 -0.834204	0.598739 -0.834204	0.000000 0.000000
+1.600000 :	0.261498 -0.377181	0.261498 -0.377181	0.000000 0.000000
+2.000000 :	0.103966 -0.116446	0.103966 -0.116446	0.000000 0.000000
+2.400000 :	0.044552 -0.036951	0.044552 -0.036951	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_rational_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_rational_nostretch.reference
new file mode 100644
index 0000000000..5564d56621
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_rational_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.997244 -0.086025	0.997244 -0.086025	0.000000 0.000000
+0.800000 :	0.916137 -0.616968	0.916137 -0.616968	0.000000 0.000000
+1.200000 :	0.563403 -0.927055	0.563403 -0.927055	0.000000 0.000000
+1.600000 :	0.206906 -0.364239	0.206906 -0.364239	0.000000 0.000000
+2.000000 :	0.067257 -0.091483	0.067257 -0.091483	0.000000 0.000000
+2.400000 :	0.024108 -0.024144	0.024108 -0.024144	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_smap.reference b/regtest/basic/rt-make-switch/out_sqr_smap.reference
new file mode 100644
index 0000000000..cdeca384c1
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_smap.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.959520 -0.726923	0.959520 -0.726923	0.000000 0.000000
+0.800000 :	0.749150 -0.877324	0.749150 -0.877324	0.000000 0.000000
+1.200000 :	0.466716 -0.538373	0.466716 -0.538373	0.000000 0.000000
+1.600000 :	0.252301 -0.267445	0.252301 -0.267445	0.000000 0.000000
+2.000000 :	0.115959 -0.133200	0.115959 -0.133200	0.000000 0.000000
+2.400000 :	0.030514 -0.070589	0.030514 -0.070589	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_smap_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_smap_nostretch.reference
new file mode 100644
index 0000000000..9f4753cc01
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_smap_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.965996 -0.610627	0.965996 -0.610627	0.000000 0.000000
+0.800000 :	0.789282 -0.736967	0.789282 -0.736967	0.000000 0.000000
+1.200000 :	0.552033 -0.452242	0.552033 -0.452242	0.000000 0.000000
+1.600000 :	0.371920 -0.224658	0.371920 -0.224658	0.000000 0.000000
+2.000000 :	0.257391 -0.111890	0.257391 -0.111890	0.000000 0.000000
+2.400000 :	0.185615 -0.059296	0.185615 -0.059296	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_tanh.reference b/regtest/basic/rt-make-switch/out_sqr_tanh.reference
new file mode 100644
index 0000000000..2071d825c0
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_tanh.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.690531 -1.817287	0.690531 -1.817287	0.000000 0.000000
+0.800000 :	0.431649 -0.697992	0.431649 -0.697992	0.000000 0.000000
+1.200000 :	0.245509 -0.313164	0.245509 -0.313164	0.000000 0.000000
+1.600000 :	0.125749 -0.144468	0.125749 -0.144468	0.000000 0.000000
+2.000000 :	0.054113 -0.067229	0.054113 -0.067229	0.000000 0.000000
+2.400000 :	0.013117 -0.031542	0.013117 -0.031542	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_sqr_tanh_nostretch.reference b/regtest/basic/rt-make-switch/out_sqr_tanh_nostretch.reference
new file mode 100644
index 0000000000..cfe42f1d49
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_sqr_tanh_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.701664 -1.751914	0.701664 -1.751914	0.000000 0.000000
+0.800000 :	0.452094 -0.672883	0.452094 -0.672883	0.000000 0.000000
+1.200000 :	0.272650 -0.301899	0.272650 -0.301899	0.000000 0.000000
+1.600000 :	0.157198 -0.139271	0.157198 -0.139271	0.000000 0.000000
+2.000000 :	0.088139 -0.064811	0.088139 -0.064811	0.000000 0.000000
+2.400000 :	0.048618 -0.030408	0.048618 -0.030408	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_tanh.reference b/regtest/basic/rt-make-switch/out_tanh.reference
new file mode 100644
index 0000000000..2071d825c0
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_tanh.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.690531 -1.817287	0.690531 -1.817287	0.000000 0.000000
+0.800000 :	0.431649 -0.697992	0.431649 -0.697992	0.000000 0.000000
+1.200000 :	0.245509 -0.313164	0.245509 -0.313164	0.000000 0.000000
+1.600000 :	0.125749 -0.144468	0.125749 -0.144468	0.000000 0.000000
+2.000000 :	0.054113 -0.067229	0.054113 -0.067229	0.000000 0.000000
+2.400000 :	0.013117 -0.031542	0.013117 -0.031542	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
diff --git a/regtest/basic/rt-make-switch/out_tanh_nostretch.reference b/regtest/basic/rt-make-switch/out_tanh_nostretch.reference
new file mode 100644
index 0000000000..cfe42f1d49
--- /dev/null
+++ b/regtest/basic/rt-make-switch/out_tanh_nostretch.reference
@@ -0,0 +1,11 @@
+point :	value deriv	value_acc deriv_acc	value_delta deriv_delta
+0.000000 :	1.000000 0.000000	1.000000 0.000000	0.000000 0.000000
+0.400000 :	0.701664 -1.751914	0.701664 -1.751914	0.000000 0.000000
+0.800000 :	0.452094 -0.672883	0.452094 -0.672883	0.000000 0.000000
+1.200000 :	0.272650 -0.301899	0.272650 -0.301899	0.000000 0.000000
+1.600000 :	0.157198 -0.139271	0.157198 -0.139271	0.000000 0.000000
+2.000000 :	0.088139 -0.064811	0.088139 -0.064811	0.000000 0.000000
+2.400000 :	0.048618 -0.030408	0.048618 -0.030408	0.000000 0.000000
+2.800000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.200000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000
+3.600000 :	0.000000 0.000000	0.000000 0.000000	0.000000 0.000000