fix(python): Print tree by default with python cli

Fixes #106

Author: danieledler

interfaces/python/infomap_cli.py

@@ -2,7 +2,8 @@ def main():
     import sys
     import infomap as im
     args = " ".join(sys.argv[1:])
-    infomap = im.Infomap(im.Config(args, True))
+    conf = im.Config(args, True)
+    infomap = im.Infomap(conf)
     infomap.run()
 
 

src/core/InfomapBase.cpp

@@ -216,7 +216,7 @@ void InfomapBase::run(std::string parameters)
 	std::string currentParameters = io::Str() << m_initialParameters << (parameters.empty() ? "" : " ") << parameters;
 	if (currentParameters != m_currentParameters) {
 		m_currentParameters = currentParameters;
-		this->setConfig(Config::fromString(m_currentParameters, this->requireFileInput));
+		this->setConfig(Config::fromString(m_currentParameters, this->isCLI));
 		m_network.setConfig(*this);
 	}
 
@@ -329,9 +329,9 @@ void InfomapBase::run(Network& network)
 
 	// If used as a library, we may want to reuse the network instance, else clear to use less memory
 	// TODO: May have to use some meta data for output?
-	#ifndef AS_LIB
-	network.clearLinks();
-	#endif
+	if (this->isCLI) {
+		network.clearLinks();
+	}
 
 	if (haveMemory())
 		Log(2) << "Run Infomap with memory..." << std::endl;

src/io/Config.cpp

@@ -15,20 +15,20 @@ const std::string FlowModel::undirdir = "undirdir";
 const std::string FlowModel::outdirdir = "outdirdir";
 const std::string FlowModel::rawdir = "rawdir";
 
-Config Config::fromString(std::string flags, bool requireFileInput)
+Config Config::fromString(std::string flags, bool isCLI)
 {
 	Config conf;
-	conf.requireFileInput = requireFileInput;
+	conf.isCLI = isCLI;
 
 	ProgramInterface api("Infomap",
 		"Implementation of the Infomap clustering algorithm based on the Map Equation (see www.mapequation.org)",
 		INFOMAP_VERSION);
 
 	api.setGroups({"Input", "Algorithm", "Accuracy", "Output"});
 
-	std::vector<std::string> optionalOutputDir; // Used if !requireFileInput
+	std::vector<std::string> optionalOutputDir; // Used if !isCLI
 	// --------------------- Input options ---------------------
-	if (requireFileInput)
+	if (isCLI)
 	{
 		api.addNonOptionArgument(conf.networkFile, "network_file",
 			"File containing the network data. Assumes a link list format if no Pajek formatted heading.", "Input");
@@ -207,7 +207,7 @@ Config Config::fromString(std::string flags, bool requireFileInput)
 			"Parallelize the inner-most loop for greater speed. This may give some accuracy tradeoff.", "Accuracy", true);
 
 	// --------------------- Output options ---------------------
-	// if (requireFileInput)
+	// if (isCLI)
 	// {
 	// 	api.addNonOptionArgument(conf.outDirectory, "out_directory",
 	// 			"The directory to write the results to");
@@ -235,10 +235,10 @@ Config Config::fromString(std::string flags, bool requireFileInput)
 	if (!optionalOutputDir.empty())
 		conf.outDirectory = optionalOutputDir[0];
 
-	if (!requireFileInput && conf.outDirectory == "")
+	if (!isCLI && conf.outDirectory == "")
 		conf.noFileOutput = true;
 
-	if (!conf.noFileOutput && conf.outDirectory == "" && requireFileInput)
+	if (!conf.noFileOutput && conf.outDirectory == "" && isCLI)
 	{
 		throw InputDomainError("Missing out_directory");
 	}
@@ -307,12 +307,10 @@ void Config::adaptDefaults()
 		}
 	}
 
-	#ifndef AS_LIB
 	// Of no output format specified, use tree as default (if not used as a library).
-	if (!haveModularResultOutput()) {
+	if (isCLI && !haveModularResultOutput()) {
 		printTree = true;
 	}
-	#endif
 
 
 	// if (!haveModularResultOutput())

src/io/Config.h

@@ -52,7 +52,7 @@ struct FlowModel {
 struct Config
 {
 	// Input
-	bool requireFileInput = false;
+	bool isCLI = false;
 	std::string networkFile = "";
 	std::vector<std::string> additionalInput;
 	std::string inputFormat = "";
@@ -164,13 +164,13 @@ struct Config
 		// adaptDefaults();
 	}
 
-	Config(std::string flags, bool requireFileInput = false)
+	Config(std::string flags, bool isCLI = false)
 	{
-		*this = Config::fromString(flags, requireFileInput);
+		*this = Config::fromString(flags, isCLI);
 	}
 
 	Config(const Config& other) :
-		requireFileInput(other.requireFileInput),
+		isCLI(other.isCLI),
 		networkFile(other.networkFile),
 	 	additionalInput(other.additionalInput),
 	 	inputFormat(other.inputFormat),
@@ -270,7 +270,7 @@ struct Config
 
 	Config& operator=(const Config& other)
 	{
-		requireFileInput = other.requireFileInput;
+		isCLI = other.isCLI;
 		networkFile = other.networkFile;
 	 	additionalInput = other.additionalInput;
 	 	inputFormat = other.inputFormat;
@@ -369,7 +369,7 @@ struct Config
 
 	Config& cloneAsNonMain(const Config& other)
 	{
-		requireFileInput = other.requireFileInput;
+		isCLI = other.isCLI;
 		networkFile = other.networkFile;
 	 	additionalInput = other.additionalInput;
 	 	inputFormat = other.inputFormat;
@@ -579,7 +579,7 @@ struct Config
 		return error != "";
 	}
 
-	static Config fromString(std::string flags, bool requireFileInput = false);
+	static Config fromString(std::string flags, bool isCLI = false);
 };
 
 }