Added code to generate plot_space for jupyter integration and draw a …

…subset of the space notebooks for the workshop

create more plots use 1 - var
bumped version number

CADETMatch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CADETMatch
-Version: 0.4.2
+Version: 0.4.4
 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>generate_corner_graphs.py</StartupFile>
+    <StartupFile>match.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_parameters\fit_nsga3\example_nsga3.json"  2</CommandLineArguments>
+    <CommandLineArguments>"F:\temp\cadet_tutorial\install\fit\example.json"  2</CommandLineArguments>
     <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
-    <InterpreterArguments>-m scoop -n 1</InterpreterArguments>
+    <InterpreterArguments>-m scoop -n 6</InterpreterArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>

CADETMatch/generate_graphs.py

@@ -455,6 +455,12 @@ def plot_3d(arg):
 
 def plot_2d(arg):
     directory_path, header_x, scoreName, data, scores = arg
+    plot_2d_single(directory_path, header_x, scoreName, data, scores)
+
+    plot_2d_single(directory_path, header_x, '1- ' + scoreName, data, 1-scores)
+
+
+def plot_2d_single(directory_path, header_x, scoreName, data, scores):
     directory = Path(directory_path)
 
     if numpy.all(scores <= 0):
@@ -466,7 +472,7 @@ def plot_2d(arg):
         scores = numpy.log(scores)
         scoreName = 'log(%s)' % scoreName
 
-    fig = figure.Figure()
+    fig = figure.Figure(figsize=[10,10])
     canvas = FigureCanvas(fig)
     graph = fig.add_subplot(1, 1, 1)
 

CADETMatch/jupyter.py

@@ -73,4 +73,13 @@ def get_best(self):
             else:
                 best[name].append(col_name)
 
-        return best, score, best_score
+        return best, score, best_score
+
+    def plot_space(self):
+        space_dir = self.cache.settings['resultsDirSpace'] / '2d'
+
+        for image in space_dir.glob('*.png'):
+            if '1- ' in image.name or 'SSE' in image.name:
+                print(image.name)
+                img = dp.Image(filename=image, embed=True)
+                dp.display(img)

setup.py

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