コミット: 054eee66529b18c62836c36c85bc3dfcdca85385 - dmath (git)

C++11 Math Library

コミットメタ情報

• リビジョン: 054eee66529b18c62836c36c85bc3dfcdca85385 (tree)
• 日時: 2013-07-03 02:03:14
• 作者: Daisuke Yamashta <yamasdais@gmai...>
• コミッター: Daisuke Yamashta

ログメッセージ

Vector クラス、色々と見直し。
Google Unit Test を組み込んだ。

変更サマリ

• modified: dmath.hh
• modified: tests/Makefile
• modified: tests/test0.cc
• add: tests/utest_vector0.cc

差分

--- a/dmath.hh
+++ b/dmath.hh
@@ -8,42 +8,91 @@
 #include <cstddef>
 #include <array>
 #include <vector>
+#include <algorithm>
 
 namespace dmath {
 typedef std::size_t size_type;
 
 template <typename N_TYPE,
-          size_type LEN=0ul>
+          size_type LEN = 0ul>
 class Vector {
  public:
-  struct Traits;
+  enum Size : size_type {
+    length = LEN,
+    };
+  typedef N_TYPE value_type;
+  typedef std::array<N_TYPE, Size::length> node_type;
+  typedef typename node_type::reference reference;
+  typedef typename node_type::const_reference const_reference;
+  typedef typename node_type::iterator iterator;
+  typedef typename node_type::const_iterator const_iterator;
 
  private:
-  typename Traits::node_type nodes;
+  node_type nodes;
 
  public:
-  struct Traits {
-    enum Size : size_type {
-      length = LEN,
-      };
-    typedef N_TYPE element_type;
-    typedef std::array<N_TYPE, Size::length> node_type;
-  };
-
   explicit Vector()
     : nodes()
   {
   }
 
-  explicit Vector(std::initializer_list<N_TYPE> arg)
-    : nodes(arg)
+  Vector(const node_type& ary)
+    : nodes(ary)
+  {
+  }
+
+  Vector(std::initializer_list<N_TYPE> arg)
+    : nodes()
   {
+    auto dst = nodes.begin();
+    for (auto n : arg) {
+      if (dst == nodes.end()) {
+        break;
+      }
+      *dst++ = n;
+    }
   }
 
   constexpr size_type size() const noexcept {
-    return Traits::Size::length;
+    return Size::length;
   }
 
+  value_type
+  at(size_type i)
+    noexcept(noexcept(nodes.at(i))) {
+    return nodes.at(i);
+  }
+
+  reference
+  operator[](size_type i) {
+    return nodes[i];
+  }
+  const_reference
+  operator[](size_type i)
+    const noexcept {
+    return nodes[i];
+  }
+
+  inline iterator
+  begin() noexcept(noexcept(iterator(nodes.begin()))) {
+    return iterator(nodes.begin());
+  }
+
+  inline const_iterator
+  begin() const noexcept(noexcept(const_iterator(nodes.begin()))) {
+    return const_iterator(nodes.begin());
+  }
+  
+  inline iterator
+  end() noexcept(noexcept(iterator(nodes.end()))) {
+    return iterator(nodes.end());
+  }
+
+  inline const_iterator
+  end() const noexcept(noexcept(const_iterator(nodes.end()))) {
+    return const_iterator(nodes.end());
+  }
+  
   void checker() {
     std::cout << "Base Vector" << std::endl;
   }
@@ -53,27 +102,27 @@ template <typename N_TYPE>
 class Vector<N_TYPE, 0ul> {
  public:
   struct Traits;
+  typedef N_TYPE value_type;
+  typedef std::vector<N_TYPE> node_type;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
 
  private:
-  typename Traits::node_type nodes;
+  node_type nodes;
 
  public:
   struct Traits {
     enum Size : size_type {
       length = 0,
       };
-    typedef N_TYPE element_type;
-    typedef element_type& reference;
-    typedef const element_type& const_reference;
-    typedef typename std::vector<N_TYPE> node_type;
   };
   void checker() {
     std::cout << "Variant Vector" << std::endl;
   }
 
   explicit Vector(size_type size,
-                  typename Traits::const_reference val = N_TYPE())
-    : nodes(size)
+                  const_reference val = N_TYPE())
+    : nodes(size, val)
   {
   }
 

--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +1,16 @@
+GTEST_DIR=/usr/src/gtest
+USER_DIR = ./
 CPLUSPLUS=g++
-TARGETS=test0
-CPLUSPLUSFLAGS=-O -std=c++11
-INCLUDES=-I../
+CPLUSPLUSFLAGS=-O -std=c++11 -Wall -Wextra -g
+INCLUDES=-I../ -I$/usr/include/gtest
 LDFLAGS=
 
+TESTS = test0 utest_vector0
+TARGETS=$(TESTS)
+
+GTEST_HEADERS = /usr/include/gtest/*.h \
+				/usr/include/gtest/internal/*.h
+
 .SUFFIXES: .cc
 
 .cc.o:
@@ -18,6 +25,25 @@ test0 : test0.o
 	$(CPLUSPLUS) $(LDFLAGS) -o $@ test0.o
 
 clean :
-	/bin/rm -f $(TARGETS) *.o *.s
+	/bin/rm -f $(TARGETS) *.o *.s *.a
 
 test0.o : ../dmath.hh
+
+gtest-all.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+		$(GTEST_DIR)/src/gtest-all.cc
+
+gtest_main.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+	  $(GTEST_DIR)/src/gtest_main.cc
+
+gtest.a : gtest-all.o
+	$(AR) $(ARFLAGS) $@ $^
+
+gtest_main.a : gtest-all.o gtest_main.o
+	$(AR) $(ARFLAGS) $@ $^
+
+utest_vector0 : utest_vector0.o gtest_main.a
+	$(CPLUSPLUS) $(CPLUSPLUSFLAGS) $^ -o $@ -lpthread
+
+utest_vector0.cc : ../dmath.hh

--- a/tests/test0.cc
+++ b/tests/test0.cc
@@ -1,4 +1,6 @@
 #include <iostream>
+#include <algorithm>
+#include <array>
 
 #include <dmath.hh>
 
@@ -6,14 +8,23 @@ using namespace std;
 using namespace dmath;
 
 int test_vector() {
-  Vector<double, 3ul> basevec;
+  std::array<double, 3> ary{ {4.24, 35.5 } };
+  Vector<double, 3> vec0{ary};
+  Vector<double, 3> basevec{3.24, 35.5, 34.5, 23456.345 };
   basevec.checker();
+  cout << "at(0): " << vec0.at(0) << endl;
+  for_each(basevec.begin(), basevec.end(), [](double val) {
+      cout << val << ",";
+    });
+  cout << endl;
 
   Vector<double> defaultvec{ 3, 23.5, 3.141592 };
   defaultvec.checker();
 
-  Vector<double, 0ul> varvec(4);
-  varvec.checker();
+//  Vector<double, 0ul> varvec(4);
+//  varvec.checker();
+
+  return 0;
 }
 
 int testfunc() {
@@ -21,6 +32,8 @@ int testfunc() {
   CurMatrix mat;
 
   cout << "column size: " << mat.column_size() << endl;
+
+  return 0;
 }
 
 int main(int argc, char* argv[])

--- /dev/null
+++ b/tests/utest_vector0.cc
@@ -0,0 +1,42 @@
+#include <climits>
+#include <iostream>
+#include <algorithm>
+#include <array>
+
+#include <dmath.hh>
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace dmath;
+
+TEST(VectorTest, Base_NodeOperation) {
+  using VecType = Vector<int, 24>;
+  VecType v0;
+  for_each(begin(v0), end(v0), [](int v) {
+      EXPECT_EQ(0, v);
+    });
+  array<int, 24> ary0{
+    { 3, 4, 5, 6, 7, 8, 9, 10,
+      -24, -100, -124, 34, 4, 235, 795, 34,
+      426, 94, 86, -3, 8, 8264, -82934, 234 }
+  };
+  auto ary_iter = ary0.begin();
+  for_each(begin(v0), end(v0), [&ary_iter](int& v) {
+      v = *ary_iter++;
+    });
+  EXPECT_EQ(24, v0.size());
+  EXPECT_EQ(24, VecType::Size::length);
+  for (size_t i = 0; i < v0.size(); i++) {
+    EXPECT_EQ(ary0[i], v0[i]);
+    EXPECT_EQ(ary0[i], v0.at(i));
+  }
+}
+
+TEST(VectorTest, Variant_NodeOperation) {
+  using VecType = Vector<int>;
+  VecType v0(24ul);
+//  for_each(begin(v0), end(v0), [](int v) {
+//      EXPECT_EQ(0, v);
+//    });
+}