Skip to content

Commit

Permalink
revert changes to convert input format main cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
EnergyArchmage committed Jan 6, 2020
1 parent 84ae8b6 commit aa62db0
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/ConvertInputFormat/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@ enum class OutputTypes
BSON
};

template <typename T> void displayMessage(T t)
template <typename T>
void displayMessage(T t)
{
std::cout << t << EnergyPlus::DataStringGlobals::NL;
}

template <typename T, typename... Args> void displayMessage(T t, Args... args) // recursive variadic function
template<typename T, typename... Args>
void displayMessage(T t, Args... args) // recursive variadic function
{
std::cout << t;
displayMessage(args...);
Expand Down Expand Up @@ -145,8 +147,7 @@ void cleanEPJSON(json &epjson)
}
}

bool processInput(
std::string const &inputFilePath, json const &schema, OutputTypes outputType, std::string outputDirectory, std::string &outputTypeStr)
bool processInput(std::string const &inputFilePath, json const &schema, OutputTypes outputType, std::string outputDirectory, std::string & outputTypeStr)
{
auto validation(std::unique_ptr<Validation>(new Validation(&schema)));
auto idf_parser(std::unique_ptr<IdfParser>(new IdfParser()));
Expand Down Expand Up @@ -496,10 +497,11 @@ int main(int argc, const char *argv[])
#endif

#ifdef _OPENMP
#pragma omp parallel default(none) shared(files, number_files, fileCount, schema, outputType, outputTypeStr, output_directory)
#pragma omp parallel default(none) \
shared(files, number_files, fileCount, schema, outputType, outputTypeStr, output_directory)
{
#pragma omp for
for (int i = 0; i < number_files; ++i) {
for (std::size_t i = 0; i < number_files; ++i) {
bool successful = processInput(files[i], schema, outputType, output_directory, outputTypeStr);
#pragma omp atomic
++fileCount;
Expand Down

7 comments on commit aa62db0

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-Linux-Ubuntu-18.04-custom_check: Build Failed

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2633 of 2636 tests passed, 1 test warnings)

Messages:\n

  • 4 tests had: EIO diffs.
  • 2 tests had: Table big diffs.
  • 1 test had: ESO big diffs.

Failures:\n

regression Test Summary

  • Passed: 687
  • Failed: 3

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-MacOS-10.13-clang: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1254 of 1254 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (674 of 675 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 674
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design-Day-WarmUp-Speed-Improvement (EnergyArchmage) - Win64-Windows-10-VisualStudio-16: OK (2521 of 2596 tests passed, 18 test warnings)

Messages:\n

  • 16 tests had: EIO diffs.
  • 2 tests had: Table big diffs.
  • 1 test had: ESO big diffs.
  • 14 tests had: ERR diffs.
  • 8 tests had: EDD diffs.
  • 10 tests had: AUD diffs.
  • 10 tests had: BND diffs.
  • 9 tests had: DXF diffs.
  • 10 tests had: MDD diffs.
  • 10 tests had: MTD diffs.
  • 10 tests had: RDD diffs.
  • 2 tests had: SHD diffs.

Failures:\n

integration Test Summary

  • Passed: 600
  • Failed: 72

regression Test Summary

  • Passed: 667
  • Failed: 3

Build Badge Test Badge

Please sign in to comment.