small fix to header generation to handle two parameters with the same…

… name in the corner plots

CADETMatch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CADETMatch
-Version: 0.4.1
+Version: 0.4.2
 Summary: CADETMatch is a parameter estimation and error modeling library for CADET
 Home-page: https://github.com/modsim/CADET-Match
 Author: William Heymann

CADETMatch/CADETMatch.pyproj

@@ -4,7 +4,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>0067cb6f-0de6-4dd6-8086-20ea899a691d</ProjectGuid>
     <ProjectHome>.</ProjectHome>
-    <StartupFile>match.py</StartupFile>
+    <StartupFile>generate_corner_graphs.py</StartupFile>
     <SearchPath>
     </SearchPath>
     <WorkingDirectory>..</WorkingDirectory>
@@ -14,9 +14,9 @@
     <IsWindowsApplication>False</IsWindowsApplication>
     <InterpreterId>CondaEnv|CondaEnv|CADETMatch</InterpreterId>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <CommandLineArguments>"F:\temp\cadet_tutorial\lesson_5\multiple_components\example_nsga3_fractionation.json"  2</CommandLineArguments>
+    <CommandLineArguments>"F:\temp\cadet_tutorial\lesson_5\multiple_parameters\fit_nsga3\example_nsga3.json"  2</CommandLineArguments>
     <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
-    <InterpreterArguments>-m scoop -n 6</InterpreterArguments>
+    <InterpreterArguments>-m scoop -n 1</InterpreterArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>

CADETMatch/generate_corner_graphs.py

@@ -150,10 +150,21 @@ def plotMCMCVars(out_dir, headers, data):
             plotMCMCParam(out_dir, param_idx, data.root.run_chain_stat, "Run " + header + str(param_idx))
             plotMCMCParam(out_dir, param_idx, data.root.run_chain_stat_transform, "Run " + header + " Transform" + str(param_idx))
 
+def keep_header(char):
+    allowed = set('-0123456789')
+    return char in allowed
+
+def clean_header(header):
+    splits = header.split()
+    temp = [splits[0]]
+    for string in splits[1:]:
+        temp.append(''.join([i for i in string if keep_header(i)]))
+    return ' '.join(temp)
+
 def graphCorner(cache):
     scoop.logger.info("plotting corner plots")
     headers = list(cache.parameter_headers_actual)
-    headers = [header.split()[0] for header in headers]
+    headers = [clean_header(header) for header in headers]
 
     resultDir = Path(cache.settings['resultsDir'])
     result_h5 = resultDir / "result.h5"

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="CADETMatch",
-    version="0.4.2",
+    version="0.4.3",
     author="William Heymann",
     author_email="[email protected]",
     description="CADETMatch is a parameter estimation and error modeling library for CADET",