Transfer functions #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

kevinrichardgreen merged 73 commits into uofs-simlab:dev from shawn-mcadam:TransferFunctions

May 13, 2022

examples/ZeroFunction.hpp

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    #pragma once
+    #define FUNC(x) 0.0
+    #define FUNCNAME "Zero"
+    template <typename T>
+    T ZeroFunction(T x) { return FUNC(X); }

examples/chaste_log_function.hpp

-Original file line number
+Diff line change
@@ -1,39 +1,8 @@
     #pragma once
-    #include "EvaluationFunctor.hpp"
     #include <cmath>
+    // base e
     #define FUNC(x) (7.7-13.0287*log(x))
     #define FUNCNAME "(7.7-13.0287*log(x))"
-    class MyFunction final : public EvaluationFunctor<double,double>
-    {
-    public:
-      double operator()(double x) override { return FUNC(x); }
-      double deriv(double x) override
-      {
-        return -13.0287/x;
-      }
-      double deriv2(double x) override
-      {
-        return 13.0287/x/x;
-      }
-      double deriv3(double x) override
-      {
-        return -26.0574/x/x/x;
-      }
-      double deriv4(double x) override
-      {
-        return 78.1722/x/x/x/x;
-      }
-      double deriv5(double x) override
-      {
-        return -312.6888/x/x/x/x/x;
-      }
-      double deriv6(double x) override
-      {
-        return 1563.444/x/x/x/x/x/x;
-      }
-      double deriv7(double x) override
-      {
-        return -9380.664/x/x/x/x/x/x/x;
-      }
-    };
+    template <typename T>
+    T MyFunction(T x) { return FUNC(x); }

examples/compute_max_err_of_tables.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,7 +14,7 @@ int main()
  
    {

      using namespace std;

      MyFunction func;

      FunctionContainer<double> func_container{SET_F(MyFunction,double)};

      /* Which implementations to use */

      std::vector<std::string> implNames {"UniformLinearInterpolationTable",

    @@ -24,7 +24,7 @@ int main()
  
          "UniformQuadraticTaylorTable",

          "UniformCubicTaylorTable"};

      UniformLookupTableGenerator gen(&func, MIN_ARG, MAX_ARG);

      UniformLookupTableGenerator<double> gen(&func_container, MIN_ARG, MAX_ARG);

      cout << "# Function: " << FUNCNAME << endl;

      cout << "# h ";

examples/experiment.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -44,48 +44,76 @@ int main(int argc, char* argv[])
  
      int    nEvals       = std::stoi(argv[5]);

      unsigned int seed   = std::stoi(argv[6]);

      MyFunction func;

      FunctionContainer<double> func_container{SET_F(MyFunction,double)};

      double stepSize;

      /* Check which implementations are available */

      std::cout << "# Registered uniform tables: \n#  ";

      for (auto it : UniformLookupTableFactory::get_registry_keys() ) {

      for (auto it : UniformLookupTableFactory<double>::get_registry_keys() ) {

        std::cout << it << "\n#  ";

      }

      std::cout << "\n";

      /* Fill in the implementations */

      std::vector<unique_ptr<EvaluationImplementation>> impls;

      std::vector<unique_ptr<EvaluationImplementation<double>>> impls;

      /* Which LUT implementations to use */

      std::vector<std::string> implNames {"UniformLinearInterpolationTable",

          "UniformLinearPrecomputedInterpolationTable",

          "UniformQuadraticPrecomputedInterpolationTable",

          "UniformCubicPrecomputedInterpolationTable",

          "UniformArmadilloPrecomputedInterpolationTable<4>",

          "UniformArmadilloPrecomputedInterpolationTable<5>",

          "UniformArmadilloPrecomputedInterpolationTable<6>",

          "UniformArmadilloPrecomputedInterpolationTable<7>",

          "UniformPadeTable<1,1>",

          "UniformPadeTable<2,2>",

          "UniformPadeTable<3,3>",

          "UniformPadeTable<4,3>",

          "UniformLinearTaylorTable",

          "UniformQuadraticTaylorTable",

          "UniformCubicTaylorTable"};

      UniformLookupTableGenerator gen(&func, tableMin, tableMax);

      std::vector<std::string> implNames {

        "UniformArmadilloPrecomputedInterpolationTable<4>",

        "UniformArmadilloPrecomputedInterpolationTable<5>",

        "UniformArmadilloPrecomputedInterpolationTable<6>",

        "UniformArmadilloPrecomputedInterpolationTable<7>",

        "UniformCubicHermiteTable",

        "UniformCubicPrecomputedInterpolationTable",

        "UniformCubicTaylorTable",

        "UniformLinearInterpolationTable",

        "UniformLinearPrecomputedInterpolationTable",

        "UniformLinearTaylorTable",

        "NonUniformLinearInterpolationTable",

        "UniformQuadraticPrecomputedInterpolationTable",

        "UniformQuadraticTaylorTable"

      };

      std::vector<std::string> padeNames {

        "UniformPadeTable<1,1>",

        "UniformPadeTable<2,1>",

        "UniformPadeTable<3,1>",

        "UniformPadeTable<4,1>",

        "UniformPadeTable<5,1>",

        "UniformPadeTable<6,1>",

        "UniformPadeTable<2,2>",

        "UniformPadeTable<3,2>",

        "UniformPadeTable<4,2>",

        "UniformPadeTable<5,2>",

        "UniformPadeTable<3,3>",

        "UniformPadeTable<4,3>",

      };

      UniformLookupTableGenerator<double> gen(&func_container, tableMin, tableMax);

      /* add implementations to vector */

      // unique_ptr<EvaluationImplementation> test = make_unique<DirectEvaluation>(&func,tableMin,tableMax);

      impls.emplace_back(unique_ptr<EvaluationImplementation>(new DirectEvaluation(&func,tableMin,tableMax)));

      impls.emplace_back(unique_ptr<EvaluationImplementation<double>>(new DirectEvaluation<double>(&func_container,tableMin,tableMax)));

      for (auto itName : implNames) {

        impls.emplace_back(gen.generate_by_tol(itName,tableTol));

      }

      /* Run comparator */

      ImplementationComparator implCompare(impls, nEvals, seed);

      //for (auto itName : padeNames) {

      //  impls.emplace_back(gen.generate_by_tol(itName,tableTol));

      //}

      //add a composite table. The generator doesn't converge with mid = the root 

      //and also this is far too specific for this experiment.

      //double mid = exp(7.7/13.0287)+1;

      //UniformLookupTableGenerator gen1(&func_container, tableMin, mid);

      //UniformLookupTableGenerator gen2(&func_container, mid, tableMax);

      //impls.emplace_back(unique_ptr<EvaluationImplementation>(

      //      new CompositeLookupTable({gen1.generate_by_tol(implNames[3],tableTol*(mid-tableMin)/(tableMax-tableMin)),

      //        gen2.generate_by_tol(implNames[7],tableTol*(tableMax-mid)/(tableMax-tableMin))})));

      ImplementationComparator<double> implCompare(impls, nEvals, seed);

      implCompare.run_timings(nExperiments);

      /* Summarize the results */

examples/experiment_best_worst.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,15 +6,8 @@
  
          ./experiment_best_worst <tableMin> <tableMax> <tableTol> <nExperiments> <nEvals> <seed>

     */

    // #include "sin.hpp"

    // #include "func.hpp"

    #include "func.hpp"

    #include "ZeroFunction.hpp"

    // #include "chaste_log_function.hpp"

    #include "ImplementationComparator.hpp"

    #include "UniformLookupTableGenerator.hpp"

    #include "UniformTables.hpp"

    #include "DirectEvaluation.hpp"

    #include <iostream>

    #include <fstream>

    @@ -43,7 +36,8 @@ int main(int argc, char* argv[])
  
      int    nEvals       = std::stoi(argv[3]);

      int    seed         = std::stoi(argv[4]);

      ZeroFunction func;

      FunctionContainer<double> func_container {SET_F(ZeroFunction,double)};

      double stepSize;

      /* Which LUT implementations to use */

    @@ -68,10 +62,10 @@ int main(int argc, char* argv[])
  
      std::cout << "\n# impls using ~ " << percentRam <<"% of RAM\n";

      cout << "# Function:  " << FUNCNAME << endl << endl;

      UniformLookupTableGenerator gen(&func, 0, 1);

      UniformLookupTableGenerator<double> gen(&func_container, 0, 1);

      /* Fill in the implementations */

      std::vector<unique_ptr<EvaluationImplementation>> impls;

      std::vector<unique_ptr<EvaluationImplementation<double>>> impls;

      /* Run the best case */

    @@ -82,7 +76,7 @@ int main(int argc, char* argv[])
  
      }

      /* Run comparator */

      ImplementationComparator implCompare_best(impls, nEvals, seed);

      ImplementationComparator<double> implCompare_best(impls, nEvals, seed);

      implCompare_best.run_timings(nExperiments);

      /* Summarize the results */

    @@ -108,7 +102,7 @@ int main(int argc, char* argv[])
  
      }

      /* Run comparator */

      ImplementationComparator implCompare_worst(impls, nEvals, seed);

      ImplementationComparator<double> implCompare_worst(impls, nEvals, seed);

      implCompare_worst.run_timings(nExperiments);

      /* Summarize the results */

examples/generate_tables_at_tol.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,12 +18,12 @@ int main()
  
    {

      using namespace std;

      MyFunction func;

      FunctionContainer<double> func_container{SET_F(MyFunction,double)};

      cout << "# Function: " << FUNCNAME << "\n";

      cout << "# Tol:      " << TOL << "\n";

      vector<unique_ptr<EvaluationImplementation>> impls;

      vector<unique_ptr<EvaluationImplementation<double>>> impls;

      /* Which LUT implementations to use */

      vector<string> implNames {"UniformLinearInterpolationTable",

    @@ -34,7 +34,7 @@ int main()
  
          "UniformCubicTaylorTable"};

      UniformLookupTableGenerator gen(&func, MIN_ARG, MAX_ARG);

      UniformLookupTableGenerator<double> gen(&func_container, MIN_ARG, MAX_ARG);

      for (auto itName : implNames) {

        std::cout << "\nGenerating " << itName << ":" << std::endl;

examples/plot_impl.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,8 @@ int main() @@
     {
       using namespace std;
-      MyFunction func;
+      FunctionContainer func_container;
+      func_container.double_func = new MyFunction<double>;
       cout << "# Function: " << FUNCNAME << endl;
       cout << "# h";
@@ Expand All / @@ -25,7 +26,7 @@ int main() @@
       // UniformLookupTableGenerator<UniformLinearInterpolationTable>
       //   gen(&func,MIN_ARG,MAX_ARG,0.0);
-      UniformLookupTableGenerator gen(&func,MIN_ARG,MAX_ARG);
+      UniformLookupTableGenerator gen(&func_container,MIN_ARG,MAX_ARG);
       gen.plot_implementation_at_step_size("UniformLinearInterpolationTable",STEP);
@@ Expand Down @@

examples/test_function.hpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,20 +4,9 @@ @@
     #define FUNC(x) (7.7*x*exp(x)-13.0287*x*x*log(x)-x +13.0*x*x*x)
     #define FUNCNAME "(7.7*x*exp(x)-13.0287*x*x*log(x)-x +13.0*x*x*x)"
-    class MyFunction final : public EvaluationFunctor<double,double>
+    template <typename T>
+    class MyFunction final : public EvaluationFunctor<T,T>
     {
     public:
-      double operator()(double x) override { return FUNC(x); }
-      double deriv(double x) override
-      {
-        return 7.7*exp(x)*(1.0+x) - 13.0287*(2.0*x*log(x)+x) - 1.0 + 39.0*x*x;
-      }
-      double deriv2(double x) override
-      {
-        return 7.7*exp(x)*(2.0+x) - 13.0287*(2.0*log(x)+3.0) + 78.0*x;
-      }
-      double deriv3(double x) override
-      {
-        return 7.7*exp(x)*(3.0+x) - 13.0287*(2.0/x) + 78.0;
-      }
+      T operator()(T x) override { return FUNC(x); }
     };

src/ArgumentRecord.cpp

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Transfer functions #11

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!