Release 0.6 (also for Windows).

samhocevar · Mar 2, 2020 · e51100b · e51100b
1 parent a2af5ff
commit e51100b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 32 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,6 +6,9 @@
   <PropertyGroup Condition="'$(Platform)'=='x64'" Label="Configuration">
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,10 @@
 
-EXTRA_DIST = $(lol_headers) bootstrap README.md \
-             .travis.yml lolremez.sln build.config \
-             .gitignore .gitattributes .gitmodules
+lol_files := $(filter %.h %.ipp %.hpp, $(shell find $(srcdir)/lol/include -type f))
+git_files = .gitignore .gitattributes .gitmodules
+vs_files = lolremez.sln Directory.Build.props
 
-lol_headers := $(filter %.h %.ipp %.hpp, $(shell find $(srcdir)/lol/include -type f))
+EXTRA_DIST = bootstrap README.md .travis.yml \
+             $(lol_files) $(git_files) $(vs_files)
 
 SUBDIRS = src
 

diff --git a/build.config b/build.config
diff --git a/lol b/lol
diff --git a/src/expression.h b/src/expression.h
@@ -469,7 +469,7 @@ struct expression::action<expression::r_sup_float>
             }
         }
 
-        that->m_ops.push_back(std::make_tuple(id::constant, that->m_constants.size()));
+        that->m_ops.push_back(std::make_tuple(id::constant, (int)that->m_constants.size()));
         that->m_constants.push_back(val);
         that->m_ops.push_back(std::make_tuple(id::pow, -1));
     }
@@ -487,7 +487,7 @@ struct expression::action<expression::r_name>
             that->m_ops.push_back(std::make_tuple(id::y, -1));
         else
         {
-            that->m_ops.push_back(std::make_tuple(id::constant, that->m_constants.size()));
+            that->m_ops.push_back(std::make_tuple(id::constant, (int)that->m_constants.size()));
             if (in.string() == "e")
                 that->m_constants.push_back(lol::real::R_E());
             else if (in.string() == "pi" || in.string() == "π")

diff --git a/src/lolremez.vcxproj b/src/lolremez.vcxproj
@@ -37,7 +37,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>PACKAGE_VERSION="0.4";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PACKAGE_VERSION="0.6";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <PropertyGroup Label="Globals">

diff --git a/src/matrix.h b/src/matrix.h
@@ -61,7 +61,7 @@ class array2d
 template<typename T>
 struct linear_system : public array2d<T>
 {
-    inline linear_system<T>(int n)
+    inline linear_system<T>(size_t n)
     {
         assert(n > 0);
         this->resize(n, n);

diff --git a/src/solver.cpp b/src/solver.cpp
@@ -218,10 +218,7 @@ void remez_solver::remez_step()
         error += system[m_order + 1][i] * fxn[i];
 
     if (show_stats)
-    {
-        using std::printf;
-        printf(" -:- timing for inversion: %f ms\n", t.get() * 1000.f);
-    }
+        std::cout << " -:- timing for inversion: " << (t.get() * 1000.f) << " ms\n";
 }
 
 /*
@@ -272,10 +269,7 @@ void remez_solver::find_zeros()
     }
 
     if (show_stats)
-    {
-        using std::printf;
-        printf(" -:- timing for zeros: %f ms\n", t.get() * 1000.f);
-    }
+        std::cout << " -:- timing for zeros: " << (t.get() * 1000.f) << " ms\n";
 }
 
 

diff --git a/src/solver.h b/src/solver.h
@@ -19,8 +19,10 @@
 
 #include <lol/base/thread.h>
 #include <lol/math/polynomial.h>
+#include <lol/types/real.h>
 
-#include <cstdio>
+#include <vector>
+#include <array>
 
 #include "expression.h"