From cf3badb66de94bc8c199264f13e7446931413698 Mon Sep 17 00:00:00 2001 From: Jay Robson Date: Sun, 14 Jan 2024 17:07:45 +1100 Subject: [PATCH] move code --- src/main.cpp | 16 ++++++++-------- src/{ => reactor}/control/control_rod.cpp | 2 +- src/{ => reactor}/control/control_rod.hpp | 6 +++--- src/{ => reactor}/coolant/pipe.cpp | 4 ++-- src/{ => reactor}/coolant/pipe.hpp | 6 +++--- src/{ => reactor}/fuel/fuel_rod.cpp | 4 ++-- src/{ => reactor}/fuel/fuel_rod.hpp | 6 +++--- src/{ => reactor}/fuel/half_life.hpp | 2 +- src/{ => reactor}/fuel/sample.cpp | 6 +++--- src/{ => reactor}/fuel/sample.hpp | 4 ++-- src/{ => reactor}/fuel/waste.cpp | 2 +- src/{ => reactor}/fuel/waste.hpp | 2 +- src/{ => reactor}/reactor.hpp | 6 +++--- src/{ => reactor}/rod.cpp | 2 +- src/{ => reactor}/rod.hpp | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) rename src/{ => reactor}/control/control_rod.cpp (95%) rename src/{ => reactor}/control/control_rod.hpp (68%) rename src/{ => reactor}/coolant/pipe.cpp (83%) rename src/{ => reactor}/coolant/pipe.hpp (50%) rename src/{ => reactor}/fuel/fuel_rod.cpp (90%) rename src/{ => reactor}/fuel/fuel_rod.hpp (66%) rename src/{ => reactor}/fuel/half_life.hpp (86%) rename src/{ => reactor}/fuel/sample.cpp (94%) rename src/{ => reactor}/fuel/sample.hpp (92%) rename src/{ => reactor}/fuel/waste.cpp (95%) rename src/{ => reactor}/fuel/waste.hpp (90%) rename src/{ => reactor}/reactor.hpp (87%) rename src/{ => reactor}/rod.cpp (95%) rename src/{ => reactor}/rod.hpp (97%) diff --git a/src/main.cpp b/src/main.cpp index 77c1661..bf38495 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ -#include "reactor.hpp" -#include "control/control_rod.hpp" -#include "fuel/fuel_rod.hpp" -#include "coolant/pipe.hpp" +#include "reactor/reactor.hpp" +#include "reactor/control/control_rod.hpp" +#include "reactor/fuel/fuel_rod.hpp" +#include "reactor/coolant/pipe.hpp" #include "display.hpp" #include @@ -18,12 +18,12 @@ int main() nodelay(stdscr, TRUE); curs_set(0); - sim::reactor<2, 2> reactor({ - new sim::fuel::fuel_rod(100, 400), new sim::fuel::fuel_rod(100, 400), - new sim::control::control_rod(1000), new sim::coolant::pipe() + sim::reactor::reactor<2, 2> reactor({ + new sim::reactor::fuel::fuel_rod(100, 400), new sim::reactor::fuel::fuel_rod(100, 400), + new sim::reactor::control::control_rod(1000), new sim::reactor::coolant::pipe() }); - ((sim::control::control_rod*)reactor.rods[0][1])->set_reactivity(0.99); + ((sim::reactor::control::control_rod*)reactor.rods[0][1])->set_reactivity(0.99); for(;;) { diff --git a/src/control/control_rod.cpp b/src/reactor/control/control_rod.cpp similarity index 95% rename from src/control/control_rod.cpp rename to src/reactor/control/control_rod.cpp index 164d26a..774944a 100644 --- a/src/control/control_rod.cpp +++ b/src/reactor/control/control_rod.cpp @@ -1,7 +1,7 @@ #include "control_rod.hpp" -using namespace sim::control; +using namespace sim::reactor::control; control_rod::control_rod(double limit) { diff --git a/src/control/control_rod.hpp b/src/reactor/control/control_rod.hpp similarity index 68% rename from src/control/control_rod.hpp rename to src/reactor/control/control_rod.hpp index 202bb09..b1b5c68 100644 --- a/src/control/control_rod.hpp +++ b/src/reactor/control/control_rod.hpp @@ -3,17 +3,17 @@ #include "../rod.hpp" -namespace sim::control +namespace sim::reactor::control { -class control_rod : public sim::rod +class control_rod : public sim::reactor::rod { double inserted = 1; double absorbed = 0; double limit; virtual const char* get_name() const; - virtual double get_k(sim::rod::val_t type) const; + virtual double get_k(sim::reactor::rod::val_t type) const; virtual void display(std::ostream& o) const; public: diff --git a/src/coolant/pipe.cpp b/src/reactor/coolant/pipe.cpp similarity index 83% rename from src/coolant/pipe.cpp rename to src/reactor/coolant/pipe.cpp index df8a646..0e46ea5 100644 --- a/src/coolant/pipe.cpp +++ b/src/reactor/coolant/pipe.cpp @@ -1,14 +1,14 @@ #include "pipe.hpp" -using namespace sim::coolant; +using namespace sim::reactor::coolant; const char* pipe::get_name() const { return "Coolant Pipe"; } -double pipe::get_k(sim::rod::val_t type) const +double pipe::get_k(val_t type) const { switch(type) { diff --git a/src/coolant/pipe.hpp b/src/reactor/coolant/pipe.hpp similarity index 50% rename from src/coolant/pipe.hpp rename to src/reactor/coolant/pipe.hpp index 94ec5d4..6530366 100644 --- a/src/coolant/pipe.hpp +++ b/src/reactor/coolant/pipe.hpp @@ -3,13 +3,13 @@ #include "../rod.hpp" -namespace sim::coolant +namespace sim::reactor::coolant { -class pipe : public sim::rod +class pipe : public sim::reactor::rod { virtual const char* get_name() const; - virtual double get_k(sim::rod::val_t type) const; + virtual double get_k(sim::reactor::rod::val_t type) const; public: diff --git a/src/fuel/fuel_rod.cpp b/src/reactor/fuel/fuel_rod.cpp similarity index 90% rename from src/fuel/fuel_rod.cpp rename to src/reactor/fuel/fuel_rod.cpp index 7c63860..e366526 100644 --- a/src/fuel/fuel_rod.cpp +++ b/src/reactor/fuel/fuel_rod.cpp @@ -1,7 +1,7 @@ #include "fuel_rod.hpp" -using namespace sim::fuel; +using namespace sim::reactor::fuel; fuel_rod::fuel_rod(double fuel, double mass) : s(fuel, mass) { @@ -19,7 +19,7 @@ const char* fuel_rod::get_name() const return "Fuel"; } -double fuel_rod::get_k(sim::rod::val_t type) const +double fuel_rod::get_k(val_t type) const { switch(type) { diff --git a/src/fuel/fuel_rod.hpp b/src/reactor/fuel/fuel_rod.hpp similarity index 66% rename from src/fuel/fuel_rod.hpp rename to src/reactor/fuel/fuel_rod.hpp index 8d52313..f1b2677 100644 --- a/src/fuel/fuel_rod.hpp +++ b/src/reactor/fuel/fuel_rod.hpp @@ -4,15 +4,15 @@ #include "sample.hpp" #include "../rod.hpp" -namespace sim::fuel +namespace sim::reactor::fuel { -class fuel_rod : public sim::rod +class fuel_rod : public sim::reactor::rod { sample s; virtual const char* get_name() const; - virtual double get_k(sim::rod::val_t type) const; + virtual double get_k(sim::reactor::rod::val_t type) const; virtual void display(std::ostream& o) const; public: diff --git a/src/fuel/half_life.hpp b/src/reactor/fuel/half_life.hpp similarity index 86% rename from src/fuel/half_life.hpp rename to src/reactor/fuel/half_life.hpp index c326e2b..1e79e83 100644 --- a/src/fuel/half_life.hpp +++ b/src/reactor/fuel/half_life.hpp @@ -3,7 +3,7 @@ #include -namespace sim::fuel::half_life +namespace sim::reactor::fuel::half_life { const double Te_135 = 19; diff --git a/src/fuel/sample.cpp b/src/reactor/fuel/sample.cpp similarity index 94% rename from src/fuel/sample.cpp rename to src/reactor/fuel/sample.cpp index 98e1611..b1aa35b 100644 --- a/src/fuel/sample.cpp +++ b/src/reactor/fuel/sample.cpp @@ -2,7 +2,7 @@ #include "sample.hpp" #include "half_life.hpp" -using namespace sim::fuel; +using namespace sim::reactor::fuel; static const double Xe_135_M = 1e4; static const double NEUTRON_BG = 1e-10; @@ -17,7 +17,7 @@ void sample::update(double secs) { double m; - // sim::fuelulate waste and extract products + // sim::reactor::fuelulate waste and extract products waste.update(secs); fast_neutrons += waste.extract_neutrons(); energy += waste.extract_energy(); @@ -49,7 +49,7 @@ void sample::update(double secs) if(neutrons_xenon > xe_135) neutrons_xenon = xe_135; if(neutrons_iodine > i_135) neutrons_iodine = i_135; - // sim::fuelulate fuel use + // sim::reactor::fuelulate fuel use fuel -= neutrons_fuel; energy += neutrons_fuel; fast_neutrons += neutrons_fuel * 3; diff --git a/src/fuel/sample.hpp b/src/reactor/fuel/sample.hpp similarity index 92% rename from src/fuel/sample.hpp rename to src/reactor/fuel/sample.hpp index 98e95e2..7b20a2c 100644 --- a/src/fuel/sample.hpp +++ b/src/reactor/fuel/sample.hpp @@ -5,12 +5,12 @@ #include -namespace sim::fuel +namespace sim::reactor::fuel { class sample { - sim::fuel::waste waste; + sim::reactor::fuel::waste waste; double fuel = 0; double i_135 = 0; diff --git a/src/fuel/waste.cpp b/src/reactor/fuel/waste.cpp similarity index 95% rename from src/fuel/waste.cpp rename to src/reactor/fuel/waste.cpp index 367f9dd..45178f5 100644 --- a/src/fuel/waste.cpp +++ b/src/reactor/fuel/waste.cpp @@ -2,7 +2,7 @@ #include "waste.hpp" #include "half_life.hpp" -using namespace sim::fuel; +using namespace sim::reactor::fuel; void waste::update(double secs) { diff --git a/src/fuel/waste.hpp b/src/reactor/fuel/waste.hpp similarity index 90% rename from src/fuel/waste.hpp rename to src/reactor/fuel/waste.hpp index 3bd4a8e..68c3590 100644 --- a/src/fuel/waste.hpp +++ b/src/reactor/fuel/waste.hpp @@ -1,7 +1,7 @@ #pragma once -namespace sim::fuel +namespace sim::reactor::fuel { class waste diff --git a/src/reactor.hpp b/src/reactor/reactor.hpp similarity index 87% rename from src/reactor.hpp rename to src/reactor/reactor.hpp index 87aa5ad..52d585a 100644 --- a/src/reactor.hpp +++ b/src/reactor/reactor.hpp @@ -5,7 +5,7 @@ #include -namespace sim +namespace sim::reactor { template @@ -14,9 +14,9 @@ struct reactor const static int width = W; const static int height = H; - std::array, W> rods; + std::array, W> rods; - reactor(std::array rods) + reactor(std::array rods) { for(int y = 0; y < H; y++) for(int x = 0; x < W; x++) diff --git a/src/rod.cpp b/src/reactor/rod.cpp similarity index 95% rename from src/rod.cpp rename to src/reactor/rod.cpp index 2300f7b..a45bb7e 100644 --- a/src/rod.cpp +++ b/src/reactor/rod.cpp @@ -1,7 +1,7 @@ #include "rod.hpp" -using namespace sim; +using namespace sim::reactor; double rod::get(val_t type) const { diff --git a/src/rod.hpp b/src/reactor/rod.hpp similarity index 97% rename from src/rod.hpp rename to src/reactor/rod.hpp index c8f06a8..d45152f 100644 --- a/src/rod.hpp +++ b/src/reactor/rod.hpp @@ -3,7 +3,7 @@ #include -namespace sim +namespace sim::reactor { class rod