removed bad use of std::string_view, moved comparing objects before t…

…emplates
feabhas · Oct 30, 2024 · 605d9e2 · 605d9e2
1 parent 1030336
commit 605d9e2
Show file tree

Hide file tree

Showing 31 changed files with 79 additions and 64 deletions.
diff --git a/exercises/solutions/01_language_features/src/MeasurementType.h b/exercises/solutions/01_language_features/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/02_vocabulary_types/src/MeasurementType.h b/exercises/solutions/02_vocabulary_types/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/02_vocabulary_types/src/Measurements.h b/exercises/solutions/02_vocabulary_types/src/Measurements.h
@@ -18,7 +18,7 @@ namespace DataLogger
   {
   public:
     using value_type = Measurement::value_type;
-    using add_type = std::variant<double, std::string_view>;
+    using add_type = std::variant<double, std::string>;
 
     Measurements(std::string_view id, MeasurementType type)
     : id{id}, type{type}
@@ -30,7 +30,7 @@ namespace DataLogger
     inline bool add(add_type value);
 
     inline std::vector<Measurement> data() const;
-	inline std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	inline std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -52,7 +52,7 @@ namespace DataLogger
         add(*dp);
         return true;
     }
-    else if(auto* sv = std::get_if<std::string_view>(&value); sv != nullptr) {
+    else if(auto* sv = std::get_if<std::string>(&value); sv != nullptr) {
       char* end {};
       if (double d = std::strtod( sv->data(), &end ); end != sv->data()) {
         add(d);
@@ -66,7 +66,7 @@ namespace DataLogger
     return measures;
   }
 
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/...olutions/03_templates/include/Generator.h → .../03_comparing_objects/include/Generator.h b/...olutions/03_templates/include/Generator.h → .../03_comparing_objects/include/Generator.h
diff --git a/...ns/04_comparing_objects/src/Measurement.h → ...ns/03_comparing_objects/src/Measurement.h b/...ns/04_comparing_objects/src/Measurement.h → ...ns/03_comparing_objects/src/Measurement.h
diff --git a/...utions/03_templates/src/MeasurementType.h → ...3_comparing_objects/src/MeasurementType.h b/...utions/03_templates/src/MeasurementType.h → ...3_comparing_objects/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/...s/04_comparing_objects/src/Measurements.h → ...s/03_comparing_objects/src/Measurements.h b/...s/04_comparing_objects/src/Measurements.h → ...s/03_comparing_objects/src/Measurements.h
@@ -28,7 +28,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -51,7 +51,7 @@ namespace DataLogger
   }
 
   template<typename T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/...lutions/04_comparing_objects/src/main.cpp → ...lutions/03_comparing_objects/src/main.cpp b/...lutions/04_comparing_objects/src/main.cpp → ...lutions/03_comparing_objects/src/main.cpp
@@ -27,5 +27,6 @@ int main()
     assert(Measurement{1.002} > Measurement{1.0});
 
     assert((Measurement{1.0} <=> Measurement{NAN}) == std::partial_ordering::unordered);
+
     return 0;
 }
diff --git a/exercises/solutions/03_templates/src/Measurement.h b/exercises/solutions/03_templates/src/Measurement.h
diff --git a/.../04_comparing_objects/include/Generator.h → ...olutions/04_templates/include/Generator.h b/.../04_comparing_objects/include/Generator.h → ...olutions/04_templates/include/Generator.h
diff --git a/exercises/solutions/04_templates/src/Measurement.h b/exercises/solutions/04_templates/src/Measurement.h
@@ -0,0 +1,41 @@
+// Measurement.h
+// See project README.md for disclaimer and additional information.
+// Feabhas Ltd
+
+#pragma once
+#ifndef MEASUREMENT_H
+#define MEASUREMENT_H
+#include <cmath>
+
+namespace DataLogger
+{
+  class Measurement
+  {
+  public:
+    using value_type = double;
+    static constexpr double eps {1e-3};
+
+    Measurement() = default;
+    explicit Measurement(double value) : value{value} {}
+    // Measurement(const Measurement&&) = delete;
+    double get_value() const { return value; }
+
+    std::partial_ordering operator<=>(const Measurement& rhs) const
+    {
+      auto diff = fabs(value - rhs.value);
+      if (diff <= eps)            return std::partial_ordering::equivalent;
+      else if (value < rhs.value) return std::partial_ordering::less;
+      else if (value > rhs.value) return std::partial_ordering::greater;
+      return std::partial_ordering::unordered;
+    }
+
+    bool operator==(const Measurement& rhs) const
+    {
+      return (*this <=> rhs) == std::partial_ordering::equivalent;
+    }
+
+  private:
+    double value {};
+  };
+}
+#endif
diff --git a/...4_comparing_objects/src/MeasurementType.h → ...utions/04_templates/src/MeasurementType.h b/...4_comparing_objects/src/MeasurementType.h → ...utions/04_templates/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/...solutions/03_templates/src/Measurements.h → ...solutions/04_templates/src/Measurements.h b/...solutions/03_templates/src/Measurements.h → ...solutions/04_templates/src/Measurements.h
@@ -28,7 +28,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -51,7 +51,7 @@ namespace DataLogger
   }
 
   template<typename T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/...cises/solutions/03_templates/src/main.cpp → ...cises/solutions/04_templates/src/main.cpp b/...cises/solutions/03_templates/src/main.cpp → ...cises/solutions/04_templates/src/main.cpp
diff --git a/exercises/solutions/05_requirements/src/MeasurementType.h b/exercises/solutions/05_requirements/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr std::string to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/05_requirements/src/Measurements.h b/exercises/solutions/05_requirements/src/Measurements.h
@@ -35,7 +35,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -73,7 +73,7 @@ namespace DataLogger
       std::is_copy_assignable_v<T> &&
       requires (T x) { x.get_value(); } &&
       requires (T x, T y) { x < y; }
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/exercises/solutions/06_concepts/src/Constraints.h b/exercises/solutions/06_concepts/src/Constraints.h
@@ -16,9 +16,10 @@ namespace DataLogger
 {
   template<typename T>
   concept Measurable = requires {
-    requires std::semiregular<T> &&
-    requires (T x) { x.get_value(); } &&
-    requires (T x, T y) { x < y; };
+    requires std::semiregular<T>;
+    requires
+      requires (T x) { {x.get_value()} -> std::same_as<typename T::value_type>; }  &&
+      requires (T x, T y) { {x < y} -> std::same_as<bool>; };
   };
 
 
@@ -27,7 +28,7 @@ namespace DataLogger
     { t.add(typename T::value_type{}) };
     { t.size() } -> std::same_as<size_t>;
     { t.data() } -> std::same_as<std::vector<typename T::measurement_type>>;
-    { t.summary() } -> std::same_as<std::tuple<std::string_view, MeasurementType, size_t>>;
+    { t.summary() } -> std::same_as<std::tuple<std::string, MeasurementType, size_t>>;
   };
 }
 

diff --git a/exercises/solutions/06_concepts/src/MeasurementType.h b/exercises/solutions/06_concepts/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/06_concepts/src/Measurements.h b/exercises/solutions/06_concepts/src/Measurements.h
@@ -30,7 +30,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -53,7 +53,7 @@ namespace DataLogger
   }
 
   template<Measurable T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/exercises/solutions/07_ranges_views/src/Constraints.h b/exercises/solutions/07_ranges_views/src/Constraints.h
@@ -27,7 +27,7 @@ namespace DataLogger
     { t.add(typename T::value_type{}) };
     { t.size() } -> std::same_as<size_t>;
     { t.data() } -> std::same_as<std::vector<typename T::measurement_type>>;
-    { t.summary() } -> std::same_as<std::tuple<std::string_view, MeasurementType, size_t>>;
+    { t.summary() } -> std::same_as<std::tuple<std::string, MeasurementType, size_t>>;
   };
 }
 

diff --git a/exercises/solutions/07_ranges_views/src/MeasurementType.h b/exercises/solutions/07_ranges_views/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/07_ranges_views/src/Measurements.h b/exercises/solutions/07_ranges_views/src/Measurements.h
@@ -31,7 +31,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -63,7 +63,7 @@ namespace DataLogger
   }
 
   template<Measurable T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/exercises/solutions/08_pmr/src/Constraints.h b/exercises/solutions/08_pmr/src/Constraints.h
@@ -27,7 +27,7 @@ namespace DataLogger
     { t.add(typename T::value_type{}) };
     { t.size() } -> std::same_as<size_t>;
     { t.data() } -> std::same_as<std::vector<typename T::measurement_type>>;
-    { t.summary() } -> std::same_as<std::tuple<std::string_view, MeasurementType, size_t>>;
+    { t.summary() } -> std::same_as<std::tuple<std::string, MeasurementType, size_t>>;
   };
 }
 

diff --git a/exercises/solutions/08_pmr/src/MeasurementType.h b/exercises/solutions/08_pmr/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/08_pmr/src/Measurements.h b/exercises/solutions/08_pmr/src/Measurements.h
@@ -31,7 +31,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -63,7 +63,7 @@ namespace DataLogger
   }
 
   template<Measurable T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/exercises/solutions/09_coroutines/src/Constraints.h b/exercises/solutions/09_coroutines/src/Constraints.h
@@ -27,7 +27,7 @@ namespace DataLogger
     { t.add(typename T::value_type{}) };
     { t.size() } -> std::same_as<size_t>;
     { t.data() } -> std::same_as<std::vector<typename T::measurement_type>>;
-    { t.summary() } -> std::same_as<std::tuple<std::string_view, MeasurementType, size_t>>;
+    { t.summary() } -> std::same_as<std::tuple<std::string, MeasurementType, size_t>>;
   };
 }
 

diff --git a/exercises/solutions/09_coroutines/src/MeasurementType.h b/exercises/solutions/09_coroutines/src/MeasurementType.h
@@ -14,7 +14,7 @@ namespace DataLogger
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  constexpr std::string_view to_string(MeasurementType type) {
+  constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"
     };

diff --git a/exercises/solutions/09_coroutines/src/Measurements.h b/exercises/solutions/09_coroutines/src/Measurements.h
@@ -32,7 +32,7 @@ namespace DataLogger
     void add(value_type value);
 
     std::vector<T> data() const;
-	  std::tuple<std::string_view, MeasurementType, size_t> summary() const;
+	  std::tuple<std::string, MeasurementType, size_t> summary() const;
 
     size_t size() const {
       return measures.size();
@@ -66,7 +66,7 @@ namespace DataLogger
   }
 
   template<Measurable T>
-  std::tuple<std::string_view, MeasurementType, size_t> Measurements<T>::summary() const
+  std::tuple<std::string, MeasurementType, size_t> Measurements<T>::summary() const
   {
       return {id, type, measures.size()};
   }

diff --git a/exercises/solutions/10_modules/src/Constraints.h b/exercises/solutions/10_modules/src/Constraints.h
@@ -30,7 +30,7 @@ namespace DataLogger
     { t.add(typename T::value_type{}) };
     { t.size() } -> std::same_as<size_t>;
     { t.data() } -> std::same_as<std::vector<typename T::measurement_type>>;
-    { t.summary() } -> std::same_as<std::tuple<std::string_view, MeasurementType, size_t>>;
+    { t.summary() } -> std::same_as<std::tuple<std::string, MeasurementType, size_t>>;
   };
 }
 

diff --git a/exercises/solutions/10_modules/src/MeasurementType.ixx b/exercises/solutions/10_modules/src/MeasurementType.ixx
@@ -15,15 +15,13 @@
 // -----------------------------------------------------------------------------
 module;
 #include <cstddef>
-// #include <string_view>
 #include <array>
 export module MeasurementType;
 
 export namespace DataLogger 
 {
   enum class MeasurementType {unknown, temperature, pressure, minT, maxT};
 
-  // gcc 13.1 fails to compile if return type is std::string_view
   constexpr const char* to_string(MeasurementType type) {
     constexpr std::array names {
       "unknown", "temperature", "pressure", "minT", "maxT"