Updating graphing to include labels and improve the graphs a bit

cadet · Oct 11, 2019 · 02993f8 · 02993f8
1 parent 81ad0ef
commit 02993f8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/CADETMatch/CADETMatch.pyproj b/CADETMatch/CADETMatch.pyproj
@@ -14,7 +14,7 @@
     <IsWindowsApplication>False</IsWindowsApplication>
     <InterpreterId>CondaEnv|CondaEnv|CADETMatch</InterpreterId>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <CommandLineArguments>"F:\temp\cadet_tutorial\lesson_7\bypass\example_bypass.json"  2</CommandLineArguments>
+    <CommandLineArguments>"F:\temp\cadet_tutorial\lesson_7\bypass\fit_mcmc\mcmc_refine\example_bypass.json"  2</CommandLineArguments>
     <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
     <InterpreterArguments>-m scoop -n 6</InterpreterArguments>
   </PropertyGroup>

diff --git a/CADETMatch/kde_generator.py b/CADETMatch/kde_generator.py
@@ -58,12 +58,14 @@ def get_bandwidth(scores, cache):
     store = numpy.array(store)
 
     mcmcDir = Path(cache.settings['resultsDirMCMC'])
-    plt.scatter(numpy.log10(store[:,0]), store[:,1])
+    plt.figure(figsize=[10,10])
+    plt.scatter(numpy.log10(store[:,0]), numpy.log10(store[:,1]))
     plt.xlabel('bandwidth')
     plt.ylabel('cross_val_score')
     plt.savefig(str(mcmcDir / "log_bandwidth.png" ), bbox_inches='tight')
     plt.close()
 
+    plt.figure(figsize=[10,10])
     plt.scatter(store[:,0], store[:,1])
     plt.xlabel('bandwidth')
     plt.ylabel('cross_val_score')

diff --git a/CADETMatch/mcmc_plot_tube.py b/CADETMatch/mcmc_plot_tube.py
@@ -224,20 +224,30 @@ def plot_mcmc(output_mcmc, value, expName, name, expTime, expValue):
     minValues = value["min"]
     maxValues = value["max"]
 
-    plt.plot(times, mean)
+    plt.figure(figsize=[10,10])
+    plt.plot(times, mean, label='mean')
     plt.fill_between(times, mean - std, mean + std,
-                color='green', alpha=0.2)
+                color='green', alpha=0.2, label='high prob')
     plt.fill_between(times, minValues, maxValues,
-                color='red', alpha=0.2)
-    plt.plot(expTime, expValue, 'r')
+                color='red', alpha=0.2, label='low prob')
+    plt.plot(expTime, expValue, 'r', label='exp')
+    plt.xlabel('time(s)')
+    plt.ylabel('conc(mM)')
+    plt.legend()
     plt.savefig(str(output_mcmc / ("%s_%s.png" % (expName, name) ) ))
     plt.close()
 
     row, col = data.shape
-    alpha = 0.005
+    alpha = 0.01
+    plt.figure(figsize=[10,10])
+    plt.plot(times, data[0,:], 'g', alpha=0.5, label='prob')
     plt.plot(times, data.transpose(), 'g', alpha=alpha)
-    plt.plot(times, mean, 'k')
-    plt.plot(expTime, expValue, 'r')
+    plt.plot(times, mean, 'k', label='mean')
+    plt.plot(expTime, expValue, 'r', label='exp')
+    plt.xlabel('time(s)')
+    plt.ylabel('conc(mM)')
+    plt.legend()
+
     plt.savefig(str(output_mcmc / ("%s_%s_lines.png" % (expName, name) ) ))
     plt.close()