tomoto 0.1.4 → 0.2.0

data/vendor/tomotopy/src/Utils/text.hpp

@@ -4,6 +4,7 @@
 #include <string>
 #include <iostream>
 #include <iterator>
+#include <iomanip>
 #include <algorithm>
 #include <cstdio>
 
@@ -31,6 +32,13 @@ namespace tomoto
 			return s;
 		}
 
+		inline std::string quote(const std::string& s)
+		{
+			std::ostringstream stream;
+			stream << std::quoted(s);
+			return stream.str();
+		}
+
 		inline std::vector<std::string> split(const std::string& str, const std::string& delim)
 		{
 			std::vector<std::string> tokens;

data/vendor/tomotopy/src/Utils/tvector.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include <algorithm>
 #include <cstring>
+#include "serializer.hpp"
+
 namespace tomoto
 {
 	/**
@@ -24,14 +26,10 @@ namespace tomoto
 
 		tvector() noexcept
 		{
-			_first = _Alloc{}.allocate(4);
-			_last = _first;
-			_rsvEnd = _first + 4;
 		}
 
 		tvector(std::nullptr_t) noexcept
 		{
-
 		}
 
 		// non-owning, just pointing constructor
@@ -292,7 +290,7 @@ namespace tomoto
 
 		bool isOwner() const noexcept
 		{
-			return _rsvEnd;
+			return _rsvEnd || (_rsvEnd == nullptr && _first == nullptr);
 		}
 
 		// 23.3.11.5, modifiers:
@@ -521,8 +519,11 @@ namespace tomoto
 		{
 			size_type s = size();
 			T *tarr = _Alloc{}.allocate(newSize);
-			memcpy(tarr, _first, s * sizeof(T));
-			_Alloc{}.deallocate(_first, capacity());
+			if (_first)
+			{
+				memcpy(tarr, _first, s * sizeof(T));
+				_Alloc{}.deallocate(_first, capacity());
+			}
 			_first = tarr;
 			_last = _first + s;
 			_rsvEnd = _first + newSize;
@@ -544,4 +545,45 @@ namespace tomoto
 			return geometric;
 		}
 	};
+
+	namespace serializer
+	{
+		template<typename _Ty>
+		struct Serializer<tvector<_Ty>, typename std::enable_if<std::is_fundamental<_Ty>::value>::type>
+		{
+			using VTy = tvector<_Ty>;
+			void write(std::ostream& ostr, const VTy& v)
+			{
+				writeToStream(ostr, (uint32_t)v.size());
+				if (!ostr.write((const char*)v.data(), sizeof(_Ty) * v.size()))
+					throw std::ios_base::failure(std::string("writing type '") + typeid(_Ty).name() + std::string("' is failed"));
+			}
+
+			void read(std::istream& istr, VTy& v)
+			{
+				auto size = readFromStream<uint32_t>(istr);
+				v.resize(size);
+				if (!istr.read((char*)v.data(), sizeof(_Ty) * size))
+					throw std::ios_base::failure(std::string("reading type '") + typeid(_Ty).name() + std::string("' is failed"));
+			}
+		};
+
+		template<typename _Ty>
+		struct Serializer<tvector<_Ty>, typename std::enable_if<!std::is_fundamental<_Ty>::value>::type>
+		{
+			using VTy = tvector<_Ty>;
+			void write(std::ostream& ostr, const VTy& v)
+			{
+				writeToStream(ostr, (uint32_t)v.size());
+				for (auto& e : v) Serializer<_Ty>{}.write(ostr, e);
+			}
+
+			void read(std::istream& istr, VTy& v)
+			{
+				auto size = readFromStream<uint32_t>(istr);
+				v.resize(size);
+				for (auto& e : v) Serializer<_Ty>{}.read(istr, e);
+			}
+		};
+	}
 }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tomoto
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
 description:
 email: andrew@ankane.org
 executables: []
@@ -75,6 +75,8 @@ files:
 - vendor/EigenRand/EigenRand/EigenRand
 - vendor/EigenRand/EigenRand/Macro.h
 - vendor/EigenRand/EigenRand/MorePacketMath.h
+- vendor/EigenRand/EigenRand/MvDists/Multinomial.h
+- vendor/EigenRand/EigenRand/MvDists/MvNormal.h
 - vendor/EigenRand/EigenRand/PacketFilter.h
 - vendor/EigenRand/EigenRand/PacketRandomEngine.h
 - vendor/EigenRand/EigenRand/RandUtils.h
@@ -499,7 +501,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="