Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/Launcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ Launcher::Launcher(const std::string& inputFile, const std::string& exportFolder
void Launcher::run()
{
std::cout << "Loading input file: " << inputFile_ << std::endl;
const std::string outputPrefix = extractCaseName(inputFile_) + ".";
const std::string driverExportFolder = ensureTrailingSlash(exportFolder_) + outputPrefix;
const std::string caseNamePrefix = extractCaseName(inputFile_) + ".";
const std::string outputPathPrefix = ensureTrailingSlash(exportFolder_) + caseNamePrefix;

if (isAdaptedJson(inputFile_)) {
auto driver = Driver::loadFromAdaptedFile(inputFile_);
driver.setExportFolder(driverExportFolder);
driver.setExportFolder(outputPathPrefix);
std::cout << "Running Tulip analysis..." << std::endl;
driver.run();
}
Expand All @@ -82,7 +82,7 @@ void Launcher::run()
Adapter adapter(inputFile_);
AdaptedInputParser parser(inputFile_, adapter.getAdaptedInputJSON());
Driver driver(parser.readModel(), parser.readDriverOptions());
driver.setExportFolder(driverExportFolder);
driver.setExportFolder(outputPathPrefix);
std::cout << "Running Tulip analysis..." << std::endl;
driver.run();
}
Expand Down
Loading