fixed csound round

Author: johannphilippe

README.md

@@ -160,6 +160,7 @@ The resulting binaries will all be located in `bin` directory. On Windows, `lua_
 This must be considered when packaging the library to be embedded or used by another application.
 
 # TODO
+* ISSUE : Still bugs when segments size is 1/3 or /6 (etc) in Csound. Probably due to the use of floor instead of round. // Probably fixed
 * Improve hc_resize to resize curve without creating new one (temp memory)
 * Documentation on hc_resize, and hc_cubic_spline_curve
 * Propagate resize to Lua, Faust and C++ api

csound_opcode/csound_hypercurve.cpp

@@ -87,7 +87,8 @@ class cs_rt_hypercurve
     void process_init() {it = samples.begin(); }
     void process_one(std::shared_ptr<segment> seg)
     {
-        seg->process(it, std::floor(seg->fractional_size * _definition));
+        //
+        seg->process(it, std::round(seg->fractional_size * _definition));
     }
 
     double *get_samples() {return samples.data();}
@@ -693,10 +694,12 @@ struct cs_gen : public csnd::Plugin<1, 67>, public cs_rt_hypercurve
   {
       csound->plugin_deinit(this);
       table = allocate_gen(csound->get_csound(), inargs[0], inargs[1]);
+      std::cout << "gen allocated with result : " << table.res << std::endl;
       if(table.res != 0) {
           return table.res;
       }
 
+
       _initialize(inargs[1], inargs[2], table.t_ptr);
       check_total_size();
       process_init();
@@ -743,6 +746,7 @@ struct cs_gen : public csnd::Plugin<1, 67>, public cs_rt_hypercurve
 
     int deinit()
     {
+        std::cout << "hypercurve deallocation for gen number : " << table.fno << std::endl;
         csound->get_csound()->FTDelete(csound->get_csound(), table.fno);
         curve_map.erase(table.fno);
         return OK;
@@ -759,7 +763,10 @@ struct cs_concat : public csnd::Plugin<1, 66>, public cs_rt_hypercurve
         size_t total_size = count_total_size();
         size_t size = (inargs[1] == 0) ? total_size : inargs[1];
         table = allocate_gen(csound->get_csound(), inargs[0], size);
-
+        std::cout << "gen allocated with result : " << table.res << std::endl;
+        if(table.res != 0) {
+            return table.res;
+        }
 
         t = get_gen(csound->get_csound(), inargs[2]);
         _initialize(size, *t.t_ptr, table.t_ptr);
@@ -841,6 +848,7 @@ struct cs_concat : public csnd::Plugin<1, 66>, public cs_rt_hypercurve
 
     int deinit()
     {
+        std::cout << "hypercurve deallocation for gen number : " << table.fno << std::endl;
         csound->get_csound()->FTDelete(csound->get_csound(), table.fno);
         curve_map.erase(table.fno);
         return OK;

faust_lib/faust_hypercurve_lib/hypercurve_faust.h

@@ -1231,7 +1231,7 @@ class mouth_curve : public curve_base
 
     constexpr static const double a = 1.0;
 };
-using kiss_curve = mouse_curve;
+using kiss_curve = mouth_curve;
 
 // See https://mathcurve.com/courbes2d/bicorne/bicorne.shtml
 class bicorn_curve : public curve_base
@@ -1912,6 +1912,62 @@ class curve
         process();
     }
 
+    // Concatenate constructor
+    // If definition is 0, it will be the sum of all curves
+    curve(size_t definition_, std::vector<curve*> to_concat)
+    {
+        double total_size = 0;
+        for(auto & it : to_concat)
+            total_size += it->definition;
+        if(definition_ == 0)
+        {
+            definition = total_size;
+        } else {
+            definition = definition_;
+        }
+
+        y_start = to_concat[0]->y_start;
+        samples.resize(definition);
+
+        if(definition_ == 0) {
+            // Full size, copy all samples
+            size_t index = 0;
+            for(auto &it : to_concat)
+            {
+                for(size_t i = 0; i < it->definition; ++i)
+                {
+                    samples[index] = it->samples[i];
+                    index++;
+                }
+            }
+        } else {
+            // Interpolate
+            double incr = double(total_size) / double(definition);
+            int passed = 0;
+            size_t current = 0;
+            for(size_t i = 0; i < definition; ++i)
+            {
+               double index = i * incr;
+               double cindex = index - passed;
+               if(cindex >= to_concat[current]->definition)
+               {
+                   passed += to_concat[current]->definition;
+                   current++;
+               }
+               if(cindex == 0)
+               {
+                   samples[i] = to_concat[current]->samples[0];
+               } else {
+                   int f = floor(cindex);
+                   int c = f + 1;
+                   double relative_x = relative_position(f, c, cindex);
+                   samples[i] = linear_interpolation(to_concat[current]->samples[f], to_concat[current]->samples[c], relative_x );
+               }
+
+            }
+        }
+    }
+
     curve() {}
     virtual  ~curve() {}
 
@@ -2112,6 +2168,9 @@ class curve
     memory_vector<double> samples;
 };
 
+inline curve concatenate(size_t new_size, std::vector<curve*> to_concat) {return curve(new_size, to_concat);}
+inline curve concat(size_t new_size, std::vector<curve*> to_concat) {return curve(new_size, to_concat);}
+
 }
 #endif // CORE_H
 
@@ -2401,7 +2460,7 @@ const char *get_curve_base_name (const curve_base_index b)
     case polynomial_i: return "polynomial";
     case user_defined_i: return "user_defined";
     case typed_i: return "typed";
-    case mouse_i: return "mouse";
+    case mouth_i: return "mouse";
     case bicorn_i: return "bicorn";
     case lagrange_polynomial_i: return "lagrange_polynomial";
     default: return "";
@@ -2499,7 +2558,7 @@ std::pair<std::vector<double>, std::vector<control_point>> random_args_generator
         return {{}, cps};
     };
     case typed_i: return {{random<double>(-10, 10)}, {}};
-    case mouse_i: return {{},{}};
+    case mouth_i: return {{},{}};
     case bicorn_i: return {{(double)random<int>(-1, 1)}, {}};
 
     default: return {{},{}};

src/curve_lib.h

@@ -385,7 +385,7 @@ class conchal_curve : public curve_base
 //////////////////////////////////////////////////
 // Tightrope walker cure
 // https://mathcurve.com/courbes2d.gb/danseur/danseur.shtml
-// The more a is sperior to b, the more is is "straight"
+// The more a is superior to b, the more is is "straight"
 // abs(b) is the curve x max point
 // Also a must not be too close to b (undefined behavior) : a = 1.01 b = 1 is ok. a = 1.0001 is not.
 //////////////////////////////////////////////////