- update layout

- allow adjusting parameter ranges and grid resolution

regularization.py

@@ -37,7 +37,7 @@ def min_corresponding_entries(W1, W2, w1, tol=0.1):
     values = W2[mask]
 
     if values.size == 0:
-        raise ValueError("No entries in W1 approximately equal to w1")
+        raise ValueError("No entries in W1 less than equal to w1")
 
     return np.min(values)
 
@@ -103,6 +103,9 @@ class Regularization:
         self.Regularizer = self.Regularizers[self.reg_type]
 
         self.reg_levels = [10, 20, 30]
+        self.w1_range = (-100, 100)
+        self.w2_range = (-100, 100)
+        self.num_dots = 100
 
     def plot(self):
         '''
@@ -135,8 +138,8 @@ class Regularization:
         #loss_levels = [sol[3] for sol in solutions]
  
         # build grid in parameter space
-        w1 = np.linspace(-100, 100, 400)
-        w2 = np.linspace(-100, 100, 400)
+        w1 = np.linspace(self.w1_range[0], self.w1_range[1], self.num_dots)
+        w2 = np.linspace(self.w2_range[0], self.w2_range[1], self.num_dots)
         W1, W2 = np.meshgrid(w1, w2)
 
         # compute regularizer surface
@@ -173,11 +176,11 @@ class Regularization:
 
         # regularizer contours
         cs1 = ax.contour(W1, W2, regs, levels=reg_levels, colors=colors)
-        #ax.clabel(cs1, inline=True, fontsize=8) # show contour levels
+        ax.clabel(cs1, inline=True, fontsize=8) # show contour levels
 
         # loss contours
         cs2 = ax.contour(W1, W2, losses, levels=loss_levels, colors=colors[::-1])
-        #ax.clabel(cs2, inline=True, fontsize=8)
+        ax.clabel(cs2, inline=True, fontsize=8)
 
         # plot solutions
         #for alpha, w, norm, mse in solutions:
@@ -208,8 +211,22 @@ class Regularization:
 
         return self.plot()
 
+    def update_w1_range(self, w1_range):
+        self.w1_range = [float(w1) for w1 in w1_range.split(",")]
+        logger.info("Updated w1 range to " + str(self.w1_range))
+
+        return self.plot()
+
+    def update_w2_range(self, w2_range):
+        self.w2_range = [float(w2) for w2 in w2_range.split(",")]
+        logger.info("Updated w2 range to " + str(self.w2_range))
+
+        return self.plot()
+
+
     def update_resolution(self, num_dots):
         self.num_dots = num_dots
+        logger.info("updated resolution to " + str(num_dots))
         return self.plot()
 
     def launch(self):
@@ -238,18 +255,32 @@ class Regularization:
                                                 value='l2',
                                                 visible=True)
 
-                        # regularizer type 
-                        regularizer_type = gr.Dropdown(choices=['l1', 'l2', 'elastic-net'],
-                                                       label='Regularizer type',
-                                                       value='l2',
-                                                       visible=True)
-
-                        # regularization strength
-                        #reg_textbox = gr.Textbox(label="Regularization constants")
-                        reg_textbox = gr.Textbox(label="Regularizer levels",
-                                                 value="10, 20, 30",
-                                                 interactive=True)
-                        self.reg_textbox = reg_textbox
+                        with gr.Row():
+                            # regularizer type 
+                            regularizer_type = gr.Dropdown(choices=['l1', 'l2', 'elastic-net'],
+                                                           label='Regularizer type',
+                                                           value='l2',
+                                                           visible=True)
+
+                            # regularization strength
+                            #reg_textbox = gr.Textbox(label="Regularization constants")
+                            reg_textbox = gr.Textbox(label="Regularizer levels",
+                                                     value="10, 20, 30",
+                                                     interactive=True)
+                            self.reg_textbox = reg_textbox
+
+                        with gr.Row():
+                            # parameter value ranges
+                            w1_textbox = gr.Textbox(label="w1 range",
+                                                     value="-100, 100",
+                                                     interactive=True)
+
+                            w2_textbox = gr.Textbox(label="w2 range",
+                                                     value="-100, 100",
+                                                     interactive=True)
+
+                        # resolution
+                        slider = gr.Slider(minimum=100, maximum=1000, value=100, step=1, label="Resolution (#points)")
 
                     with gr.Tab("Export"):
                         # use hidden download button to generate files on the fly
@@ -264,8 +295,6 @@ class Regularization:
                         btn_export_code = gr.Button('Code')
                         btn_export_code_hidden = gr.DownloadButton(label="You should not see this", elem_id="btn_export_code_hidden", elem_classes="hidden-button")
 
-                    with gr.Tab("Options"):
-                        slider = gr.Slider(minimum=100, maximum=1000, value=100, step=1, label="Resolution (#points)")
 
                     with gr.Tab("Usage"):
                         gr.Markdown(''.join(open('usage.md', 'r').readlines()))
@@ -280,6 +309,14 @@ class Regularization:
                     reg_textbox.submit(self.update_reg_levels, inputs=reg_textbox,
                                        outputs=self.data_image)
 
+                    w1_textbox.submit(self.update_w1_range, inputs=w1_textbox,
+                                       outputs=self.data_image)
+
+                    w2_textbox.submit(self.update_w2_range, inputs=w2_textbox,
+                                       outputs=self.data_image)
+
+                    slider.change(self.update_resolution, inputs=slider, outputs=self.data_image)
+
         demo.launch()
 
 visualizer = Regularization(width=1200, height=900)