From 1715eeaa7204e0f17529c0718860f2642aa83eab Mon Sep 17 00:00:00 2001 From: kachelto100370 Date: Fri, 12 Jun 2026 05:29:28 +0200 Subject: [PATCH] 8 von 8 Test passen --- 8_9_Atomkern/code/Atomkern/Atomkern.cpp | 10 +++--- 8_9_Atomkern/code/Atomkern/build/8_Atomkern | Bin 53456 -> 53456 bytes .../CMakeFiles/8_Atomkern.dir/Atomkern.cpp.o | Bin 31040 -> 31088 bytes .../8_Atomkern.dir/Atomkern.cpp.o.d | 3 +- .../8_Atomkern.dir/compiler_depend.internal | 3 ++ .../8_Atomkern.dir/compiler_depend.make | 31 ++++++++++-------- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/8_9_Atomkern/code/Atomkern/Atomkern.cpp b/8_9_Atomkern/code/Atomkern/Atomkern.cpp index a6c97db..93815c9 100644 --- a/8_9_Atomkern/code/Atomkern/Atomkern.cpp +++ b/8_9_Atomkern/code/Atomkern/Atomkern.cpp @@ -1,4 +1,5 @@ #include "Atomkern.h" +#include #include Atomkern::Atomkern(std::string symbol, unsigned int masseZ, @@ -11,7 +12,7 @@ unsigned int Atomkern::ordnungszahl() const { return ordnungs_zahl; } unsigned int Atomkern::massenzahl() const { return massen_zahl; } Atomkern &Atomkern::operator+=(const Atomkern &atom1) { massen_zahl += atom1.massenzahl(); - ordnungs_zahl += atom1.massenzahl(); + ordnungs_zahl += atom1.ordnungszahl(); return *this; } Atomkern Atomkern::operator-(const Atomkern &atom1) { @@ -20,7 +21,7 @@ Atomkern Atomkern::operator-(const Atomkern &atom1) { } Atomkern Atomkern::operator-=(const Atomkern &atom1) { massen_zahl -= atom1.massenzahl(); - ordnungs_zahl -= atom1.massenzahl(); + ordnungs_zahl -= atom1.ordnungszahl(); return *this; } bool Atomkern::operator==(Atomkern const atom2) { @@ -36,8 +37,7 @@ Atomkern operator*(int i, const Atomkern &atom1) { atom1.ordnungszahl() * i); } std::ostream &operator<<(std::ostream &os, const Atomkern &atom) { - os << atom.symbol() - << "(" << atom.massenzahl() - << "," << atom.ordnungszahl() << ")"; + os << atom.symbol() << "(" << atom.massenzahl() << "," << atom.ordnungszahl() + << ")"; return os; } diff --git a/8_9_Atomkern/code/Atomkern/build/8_Atomkern b/8_9_Atomkern/code/Atomkern/build/8_Atomkern index 5bee23707c6e3f862bad7f91164a9a0ddb59ae18..2b8cafe5a68728e0223825c6684916078d4a2d55 100755 GIT binary patch delta 48 zcmV-00MGx>p##vN1F$Fq6a`@u8|oczp)QQkb)gDkXi!2&(X%`QS_A>6la~ka0kpG; G2uH}lJQBkI delta 48 zcmV-00MGx>p##vN1F$Fq6e`=Lcka$9Y;p>7)6Mla~ka0mQS3 G2uH{os1>IG diff --git a/8_9_Atomkern/code/Atomkern/build/CMakeFiles/8_Atomkern.dir/Atomkern.cpp.o b/8_9_Atomkern/code/Atomkern/build/CMakeFiles/8_Atomkern.dir/Atomkern.cpp.o index 544552349aec63bedcb5cb1634312ace2e2bb17c..0f88bcc6654c9c213db5662197666f5d03dc0620 100644 GIT binary patch delta 2651 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