From a429c752c4e2a82d77ac23503f9b368366682eaf Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 21:26:08 +0300 Subject: [PATCH 01/12] 1 --- src/vector.cpp | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/vector.cpp diff --git a/src/vector.cpp b/src/vector.cpp new file mode 100644 index 0000000..23705a9 --- /dev/null +++ b/src/vector.cpp @@ -0,0 +1,85 @@ +#include "vector.h" + +Vector::Vector(){ + for(int i=0; i++; icoords_[i] = other.coords_[i]; +}; + +Vector::Vector &operator=(const Vector &other){ + for(int i=0; i++; i Date: Wed, 13 Jan 2016 21:28:17 +0300 Subject: [PATCH 02/12] 1 --- src/vector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector.cpp b/src/vector.cpp index 23705a9..cad236c 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -2,7 +2,7 @@ Vector::Vector(){ for(int i=0; i++; i Date: Wed, 13 Jan 2016 21:28:52 +0300 Subject: [PATCH 03/12] 1 --- src/vector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector.cpp b/src/vector.cpp index cad236c..54af12c 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -7,7 +7,7 @@ Vector::Vector(){ Vector::Vector(double h){ for(int i=0; i++; i Date: Wed, 13 Jan 2016 21:43:54 +0300 Subject: [PATCH 04/12] 1 --- include/vector.h | 2 +- src/vector.cpp | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/vector.h b/include/vector.h index 222a4fe..bfcfe03 100644 --- a/include/vector.h +++ b/include/vector.h @@ -45,6 +45,6 @@ class Vector { double coords_[n]; }; // class Vector -bool operator!=(const Vector &, const Vector &); +//bool operator!=(const Vector &, const Vector &); #endif // VECTOR_H diff --git a/src/vector.cpp b/src/vector.cpp index 54af12c..4556206 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -1,27 +1,31 @@ #include "vector.h" Vector::Vector(){ - for(int i=0; i++; icoords_[i] = other.coords_[i]; + unsigned int i; + for(i = 0; i++; i < n) + coords_[i] = other.coords_[i]; }; -Vector::Vector &operator=(const Vector &other){ - for(int i=0; i++; i Date: Wed, 13 Jan 2016 21:55:08 +0300 Subject: [PATCH 05/12] 1 --- src/vector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vector.cpp b/src/vector.cpp index 4556206..18b9522 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -2,25 +2,25 @@ Vector::Vector(){ unsigned int i; - for(i = 0; i++; i < n) + for(i = 0; i < n; i++) coords_[i] = 0; }; Vector::Vector(double h){ unsigned int i; - for(i = 0; i++; i < n) + for(i = 0; i < n; i++) coords_[i] = h; }; Vector::Vector(const Vector &other){ unsigned int i; - for(i = 0; i++; i < n) + for(i = 0; i < n; i++) coords_[i] = other.coords_[i]; }; Vector& Vector::operator=(const Vector &other) { unsigned int i; - for(i = 0; i++; i < n) + for(i = 0; i < n; i++) coords_[i] = other.coords_[i]; return *this; }; From 67c170c74277f5288572f85d3473c35bfa0212b2 Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 22:53:30 +0300 Subject: [PATCH 06/12] 1 --- include/vector.h | 38 ++++++++-------- src/vector.cpp | 112 ++++++++++++++++++++++++++--------------------- 2 files changed, 82 insertions(+), 68 deletions(-) diff --git a/include/vector.h b/include/vector.h index bfcfe03..d976ad4 100644 --- a/include/vector.h +++ b/include/vector.h @@ -5,44 +5,44 @@ class Vector { public: const static unsigned long n = 3; - Vector(); + Vector(); - explicit Vector(double); + explicit Vector(double); - Vector(const Vector &); + Vector(const Vector &); - Vector &operator=(const Vector &); + Vector &operator=(const Vector &); - double operator[](unsigned long i) const; + double operator[](unsigned long i) const; - double &operator[](unsigned long i); + double &operator[](unsigned long i); - Vector &operator+=(const Vector &); + Vector &operator+=(const Vector &); - Vector &operator-=(const Vector &); + Vector &operator-=(const Vector &); - Vector &operator*=(double); + Vector &operator*=(double); - Vector &operator/=(double); + Vector &operator/=(double); - friend bool operator==(const Vector &, const Vector &); + friend bool operator==(const Vector &, const Vector &); - friend Vector operator+(const Vector &, const Vector &); + friend Vector operator+(const Vector &, const Vector &); - friend Vector operator-(const Vector &, const Vector &); + friend Vector operator-(const Vector &, const Vector &); - friend Vector operator*(const Vector &, double); + friend Vector operator*(const Vector &, double); - friend Vector operator*(double, const Vector &); + friend Vector operator*(double, const Vector &); - friend Vector operator/(const Vector &, double); + friend Vector operator/(const Vector &, double); - friend double operator^(const Vector &, const Vector &); + friend double operator^(const Vector &, const Vector &); - Vector operator-() const; + Vector operator-() const; private: - double coords_[n]; + double coords_[n]; }; // class Vector //bool operator!=(const Vector &, const Vector &); diff --git a/src/vector.cpp b/src/vector.cpp index 18b9522..e3b38bd 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -4,86 +4,100 @@ Vector::Vector(){ unsigned int i; for(i = 0; i < n; i++) coords_[i] = 0; -}; +} Vector::Vector(double h){ unsigned int i; for(i = 0; i < n; i++) coords_[i] = h; -}; +} Vector::Vector(const Vector &other){ unsigned int i; for(i = 0; i < n; i++) coords_[i] = other.coords_[i]; -}; +} Vector& Vector::operator=(const Vector &other) { unsigned int i; for(i = 0; i < n; i++) coords_[i] = other.coords_[i]; return *this; -}; +} double Vector::operator[](unsigned long i) const { return coords_[i]; -}; +} -Vector::double &operator[](unsigned long i){ - return &coords_[i]; -}; +double & Vector::operator[](unsigned long i){ + return coords_[i]; +} -Vector::Vector &operator+=(const Vector &other){ - for(int i=0; i++; i Date: Wed, 13 Jan 2016 23:03:24 +0300 Subject: [PATCH 07/12] 1 --- include/vector.h | 2 +- src/vector.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/vector.h b/include/vector.h index d976ad4..4acc8e0 100644 --- a/include/vector.h +++ b/include/vector.h @@ -45,6 +45,6 @@ class Vector { double coords_[n]; }; // class Vector -//bool operator!=(const Vector &, const Vector &); +bool operator!=(const Vector &, const Vector &); #endif // VECTOR_H diff --git a/src/vector.cpp b/src/vector.cpp index e3b38bd..9336921 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -98,6 +98,10 @@ double operator^(const Vector &one, const Vector &two){ return tmp; } -Vector operator-() const{ +Vector Vector::operator-() const { return Vector(*this) *= -1; -}; +} + +bool operator!=(const Vector &one, const Vector &two){ + return !(one==two); +}; \ No newline at end of file From 8bc6605229abf8712f958db2d925679c0d356bee Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 23:13:23 +0300 Subject: [PATCH 08/12] 1 --- src/vector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector.cpp b/src/vector.cpp index 9336921..754d290 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -103,5 +103,5 @@ Vector Vector::operator-() const { } bool operator!=(const Vector &one, const Vector &two){ - return !(one==two); + return ! (one==two) ; }; \ No newline at end of file From 8c65b1fda8d3e2af6afab46b243fca4cb1553bfd Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 23:19:16 +0300 Subject: [PATCH 09/12] 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f536447..d1d1c5d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# vector +# vector [![Build Status](https://travis-ci.org/Waaazzzuuup/vector.svg)](https://travis-ci.org/Waaazzzuuup/vector) Linear space element representation From 52ed5e71ec214101e411379818b627a6e7848ba6 Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 23:21:34 +0300 Subject: [PATCH 10/12] 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1d1c5d..fdb99e0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# vector [![Build Status](https://travis-ci.org/Waaazzzuuup/vector.svg)](https://travis-ci.org/Waaazzzuuup/vector) +# vector [![Build Status](https://travis-ci.org/Waaazzzuuup/vector.svg)](https://travis-ci.org/Waaazzzuuup/vector) [![Build status](https://ci.appveyor.com/api/projects/status/rcky427ihf3x7o54?svg=true)](https://ci.appveyor.com/project/Waaazzzuuup/vector) Linear space element representation From b964db4a94bca6123c2c7727deadf18c5ad2ac1a Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 23:23:03 +0300 Subject: [PATCH 11/12] 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fdb99e0..95ab16c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # vector [![Build Status](https://travis-ci.org/Waaazzzuuup/vector.svg)](https://travis-ci.org/Waaazzzuuup/vector) [![Build status](https://ci.appveyor.com/api/projects/status/rcky427ihf3x7o54?svg=true)](https://ci.appveyor.com/project/Waaazzzuuup/vector) -Linear space element representation +Linear space element representation mfck From dd8a593cfed60e8b2e0c7cd7b0605fe654241987 Mon Sep 17 00:00:00 2001 From: Waaazzzuuup Date: Wed, 13 Jan 2016 23:24:50 +0300 Subject: [PATCH 12/12] 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95ab16c..fdb99e0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # vector [![Build Status](https://travis-ci.org/Waaazzzuuup/vector.svg)](https://travis-ci.org/Waaazzzuuup/vector) [![Build status](https://ci.appveyor.com/api/projects/status/rcky427ihf3x7o54?svg=true)](https://ci.appveyor.com/project/Waaazzzuuup/vector) -Linear space element representation mfck +Linear space element representation