diff --git a/ComplexNumber/ComplexNumber.cpp b/ComplexNumber/ComplexNumber.cpp new file mode 100644 index 0000000..544ee3f --- /dev/null +++ b/ComplexNumber/ComplexNumber.cpp @@ -0,0 +1,31 @@ +#ifndef COMPLEX_CPP +#define COMPLEX_CPP + +#include "ComplexNumber.h" +#include + +Complex::Complex(double real, double imaginary) { + this->real = real; + this->imaginary = imaginary; +} + +double Complex::getReal() const { + return real; +} + +double Complex::getImaginary() const { + return imaginary; +} + +Complex Complex::operator+(const Complex& other) const { + double resultReal = real + other.real; + double resultImaginary = imaginary + other.imaginary; + return Complex(resultReal, resultImaginary); +} + +std::ostream& operator<<(std::ostream& os, const Complex& complex) { + os << complex.getReal() << "+" << complex.getImaginary() << "i"; + return os; +} + +#endif diff --git a/ComplexNumber/ComplexNumber.h b/ComplexNumber/ComplexNumber.h new file mode 100644 index 0000000..a03394c --- /dev/null +++ b/ComplexNumber/ComplexNumber.h @@ -0,0 +1,17 @@ +#ifndef COMPLEX_H +#define COMPLEX_H + +class Complex +{ + private: + double real; + double imaginary; + + public: + Complex(double real, double imaginary); + double getReal() const; + double getImaginary() const; + Complex operator+(const Complex& other) const; +}; + +#endif diff --git a/ComplexNumber/main.cpp b/ComplexNumber/main.cpp new file mode 100644 index 0000000..6ff15ec --- /dev/null +++ b/ComplexNumber/main.cpp @@ -0,0 +1,13 @@ +#include +#include "ComplexNumber.cpp" + + +int main() +{ + Complex C1(2.0,4.0); + Complex C2(1.0,3.0); + + std::cout << C1 << "+" << C2 << "=" << C1 + C2; + + return 0; +} \ No newline at end of file diff --git a/TestMessage/Message.h b/TestMessage/Message.h index 47186c2..a136ba9 100644 --- a/TestMessage/Message.h +++ b/TestMessage/Message.h @@ -8,9 +8,10 @@ class Message std::string message; - public: - Message(std::string); + Message(); + Message(std::string); //Konstruktor with specific parameter + Message(Message&); //& für die Referenz, copy constructor void printMessage(); void setMessage(std::string); diff --git a/TestMessage/TestMessage.cpp b/TestMessage/TestMessage.cpp index 1b20b3d..176a37a 100644 --- a/TestMessage/TestMessage.cpp +++ b/TestMessage/TestMessage.cpp @@ -7,4 +7,4 @@ int main() myMessage.setMessage("Schluss fuer heute!"); myMessage.printMessage(); return 0; -}; \ No newline at end of file +};