From e6c5618d0a764a5bdd5d1ccf2b6dc2ecd2d3e6f2 Mon Sep 17 00:00:00 2001
From: Jay Robson <jsrobson10@gmail.com>
Date: Wed, 17 Jan 2024 12:56:04 +1100
Subject: [PATCH] added measurements

---
 src/display.cpp                     | 17 +++++++++++------
 src/reactor/control/control_rod.cpp |  2 +-
 src/reactor/coolant/heater.cpp      |  2 +-
 src/reactor/fuel/fuel_rod.cpp       |  4 ++--
 src/reactor/rod.hpp                 |  6 +++---
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/display.cpp b/src/display.cpp
index b92ec98..2ea7ce5 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -2,22 +2,27 @@
 #include "display.hpp"
 
 #include <curses.h>
+#include <string.h>
+#include <stdlib.h>
 
-void display::draw_text(int x, int y, const char* str)
+void display::draw_text(int x, int y, const char* at)
 {
 	for(int i = 0;; i++)
 	{
-		const char* start = str;
-		char c = (str++)[0];
+		const char* start = at;
+		char c = (at++)[0];
 
 		while(c != '\n' && c != '\0')
 		{
-			c = (str++)[0];
+			c = (at++)[0];
 		}
 
-		mvaddnstr(x + i, y, start, (size_t)(str - start));
+		mvaddnstr(x + i, y, start, (size_t)(at - start));
 
-		if(c == '\0') return;
+		if(c == '\0')
+		{
+			return;
+		}
 	}
 }
 
diff --git a/src/reactor/control/control_rod.cpp b/src/reactor/control/control_rod.cpp
index 778ce69..2d3142c 100644
--- a/src/reactor/control/control_rod.cpp
+++ b/src/reactor/control/control_rod.cpp
@@ -14,7 +14,7 @@ control_rod::control_rod(double limit, double max)
 void control_rod::display(std::ostream& o) const
 {
 	o << "Inserted: " << (inserted * 100) << "%\n";
-	o << "Absorbed: " << absorbed << " / " << limit << "\n";
+	o << "Use: " << absorbed << " / " << limit << " mol\n";
 };
 
 double control_rod::get_k(val_t type) const
diff --git a/src/reactor/coolant/heater.cpp b/src/reactor/coolant/heater.cpp
index 4928c9c..42acf00 100644
--- a/src/reactor/coolant/heater.cpp
+++ b/src/reactor/coolant/heater.cpp
@@ -22,6 +22,6 @@ double heater::get_k(sim::reactor::rod::val_t type) const
 
 void heater::display(std::ostream& o) const
 {
-	o << "Rate: " << rate << "\n";
+	o << "Rate: " << rate << " C/s\n";
 }
 
diff --git a/src/reactor/fuel/fuel_rod.cpp b/src/reactor/fuel/fuel_rod.cpp
index a92cd89..9047b69 100644
--- a/src/reactor/fuel/fuel_rod.cpp
+++ b/src/reactor/fuel/fuel_rod.cpp
@@ -10,9 +10,9 @@ fuel_rod::fuel_rod(double fuel, double mass) : s(fuel, mass)
 
 void fuel_rod::display(std::ostream& o) const
 {
-	o << "Fuel: " << s.get_fuel() << " / " << s.get_mass() << "\n";
+	o << "Fuel: " << s.get_fuel() << " / " << s.get_mass() << " mol\n";
 	o << "Efficiency: " << s.get_efficiency() << "\n";
-	o << "Energy: +" << s.get_energy() << "\n";
+	o << "Energy: +" << s.get_energy() << " C\n";
 }
 
 double fuel_rod::get_k(val_t type) const
diff --git a/src/reactor/rod.hpp b/src/reactor/rod.hpp
index a4bb11d..2c6da60 100644
--- a/src/reactor/rod.hpp
+++ b/src/reactor/rod.hpp
@@ -38,9 +38,9 @@ public:
 
 		o << r.get_name() << "\n";
 		r.display(o);
-		o << "Heat: " << r.get(val_t::HEAT) << "\n";
-		o << "Fast: " << r.get(val_t::N_FAST) << "\n";
-		o << "Slow: " << r.get(val_t::N_SLOW) << "\n";
+		o << "Heat: " << r.get(val_t::HEAT) << " C\n";
+		o << "Fast: " << r.get(val_t::N_FAST) << " mol\n";
+		o << "Slow: " << r.get(val_t::N_SLOW) << " mol\n";
 
 		return o;
 	}