Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement battery item type #32141

Merged
merged 19 commits into from
Jul 15, 2019
Merged

Implement battery item type #32141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b7fc135
add unit values for loading energy strings
Jul 4, 2019
137b66f
add battery item type
Jul 5, 2019
c676ca2
add testing BATTERY item
Jul 5, 2019
ad2ec00
template all energy to_unit functions
Jul 5, 2019
f5e2cc9
add item::is_battery
Jul 6, 2019
e13e704
update item::info for batteries
Jul 6, 2019
03c89a3
remove namespace prefixes from to_X calls
Jul 5, 2019
151d70e
simplify item name finding
Jul 5, 2019
471729c
store current charge of a battery
Jul 6, 2019
fc16cab
display current battery charge
Jul 6, 2019
68b6aae
add item::set_energy
Jul 6, 2019
f30520f
allow recharging batteries
Jul 6, 2019
1c6818d
save and load battery energy
Jul 6, 2019
a0d8d31
validate battery capacity
Jul 6, 2019
381f00a
update JSON documentation
Jul 6, 2019
4c9653c
update item::set_energy
Jul 7, 2019
0a7f5ea
cut comment length
Jul 7, 2019
0c0a055
namespace template specialization for gcc <7.0
Jul 9, 2019
690ce69
comment namespace end
Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add unit values for loading energy strings
  • Loading branch information
ymber committed Jul 9, 2019
commit b7fc135a4eaa587f90dc5453248da16572952e8e
10 changes: 10 additions & 0 deletions src/units.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,16 @@ inline constexpr units::quantity<double, units::energy_in_millijoule_tag> operat
return units::from_kilojoule( v );
}

namespace units
{
static const std::vector<std::pair<std::string, energy>> energy_units = { {
{ "mJ", 1_mJ },
{ "J", 1_J },
{ "kJ", 1_kJ },
}
};
}

template<typename T>
T read_from_json_string( JsonIn &jsin, const std::vector<std::pair<std::string, T>> &units )
{
Expand Down
34 changes: 34 additions & 0 deletions tests/energy_units_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include <sstream>
#include <string>

#include "catch/catch.hpp"
#include "json.h"
#include "units.h"

static units::energy parse_energy_quantity( const std::string &json )
{
std::istringstream buffer( json );
JsonIn jsin( buffer );
return read_from_json_string<units::energy>( jsin, units::energy_units );
}

TEST_CASE( "energy parsing from JSON" )
{
CHECK_THROWS( parse_energy_quantity( "\"\"" ) ); // empty string
CHECK_THROWS( parse_energy_quantity( "27" ) ); // not a string at all
CHECK_THROWS( parse_energy_quantity( "\" \"" ) ); // only spaces
CHECK_THROWS( parse_energy_quantity( "\"27\"" ) ); // no energy unit

REQUIRE( parse_energy_quantity( "\"1 mJ\"" ) == 1_mJ );
REQUIRE( parse_energy_quantity( "\"1 J\"" ) == 1_J );
REQUIRE( parse_energy_quantity( "\"1 kJ\"" ) == 1_kJ );
REQUIRE( parse_energy_quantity( "\"+1 mJ\"" ) == 1_mJ );
REQUIRE( parse_energy_quantity( "\"+1 J\"" ) == 1_J );
REQUIRE( parse_energy_quantity( "\"+1 kJ\"" ) == 1_kJ );

REQUIRE( parse_energy_quantity( "\"1 mJ 1 J 1 kJ\"" ) == 1_mJ + 1_J + 1_kJ );
REQUIRE( parse_energy_quantity( "\"1 mJ -4 J 1 kJ\"" ) == 1_mJ - 4_J + 1_kJ );

REQUIRE( 1_mJ * 1000 == units::from_joule( 1 ) );
REQUIRE( 1_J * 1000 == units::from_kilojoule( 1 ) );
}