Commit d06dfc78 authored by qiancheng xu's avatar qiancheng xu

Building jpscore on windows10

parent 1c777214
Pipeline #20195 passed with stages
in 8 minutes and 43 seconds
......@@ -463,7 +463,7 @@ bool GeoFileParser::parseDoorNode(TiXmlElement * xDoor, int id, Building* buildi
case DoorState::TEMP_CLOSE:
building->GetTransition(id)->TempClose();
break;
case DoorState::ERROR:
Please register or sign in to reply
case DoorState::Error:
Log->Write("WARNING:\t Unknown door state: <%s>. open or close. Default: open",
stateStr.c_str());
building->GetTransition(id)->Open();
......
......@@ -627,8 +627,8 @@ double Simulation::RunBody(double maxSimTime)
Transition* Trans = itr.second;
if(Trans->IsTempClose())
{
if ((Trans->GetMaxDoorUsage() != std::numeric_limits<int>::max()) ||
(Trans->GetOutflowRate() != std::numeric_limits<double>::max()) ){
if ((Trans->GetMaxDoorUsage() != (std::numeric_limits<int>::max)()) ||
(Trans->GetOutflowRate() != (std::numeric_limits<double>::max)()) ){
// || (Trans->GetOutflowRate() != std::numeric_limits<double>::max)){
Trans->UpdateClosingTime( _deltaT);
if(Trans->GetClosingTime() <= _deltaT){
......
......@@ -226,7 +226,7 @@ enum USERMODE {
};
// Describes the door
enum class DoorState { OPEN, CLOSE, TEMP_CLOSE, ERROR };
enum class DoorState { OPEN, CLOSE, TEMP_CLOSE, Error };
Please register or sign in to reply
inline DoorState StringToDoorState(std::string name){
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
......@@ -243,7 +243,7 @@ inline DoorState StringToDoorState(std::string name){
return DoorState::CLOSE;
}
return DoorState::ERROR;
return DoorState::Error;
};
constexpr double magicnum(int i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment