guidepost 0.2.14__tar.gz → 0.2.15__tar.gz

guidepost-0.2.15/MANIFEST.in

@@ -0,0 +1,2 @@
+include README.md
+include LICENSE

{guidepost-0.2.14/guidepost.egg-info → guidepost-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: guidepost
-Version: 0.2.14
+Version: 0.2.15
 Summary: Guidepost. An overview visualization for understanding supercomputer queue data.
 Home-page: https://github.com/cscully-allison/guidepost
 Author: Connor Scully-Allison
@@ -22,6 +22,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -212,7 +213,7 @@ Guidepost is licensed under the MIT License. See the `LICENSE` file for details.
 
 ## Acknowledgments
 
-Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL).
+Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL), the National Science Foundation under NSF IIS-1844573 and IIS-2324465, and the Department of Energy under DE-SC0022044 and DE-SC0024635.
 
 ---
 

{guidepost-0.2.14 → guidepost-0.2.15}/README.md

@@ -184,7 +184,7 @@ Guidepost is licensed under the MIT License. See the `LICENSE` file for details.
 
 ## Acknowledgments
 
-Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL).
+Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL), the National Science Foundation under NSF IIS-1844573 and IIS-2324465, and the Department of Energy under DE-SC0022044 and DE-SC0024635.
 
 ---
 

{guidepost-0.2.14 → guidepost-0.2.15}/guidepost/guidepost.js

@@ -1,11 +1,14 @@
 import * as d3 from "https://esm.sh/d3@7";
+// import * as d3 from "d3";
+
+
 //layout vars
 const FACET_LAYOUT = {
     outer_margin: 30
 }
 
 const OVERVIEW_LAYOUT = {
-    width: 1100,
+    width: 1000,
     height: 300,
     outer_margin: 10,
     inner_padding: 30
@@ -54,6 +57,8 @@ const num_cols = 150;
 
 const MIN_BAR_WIDTH = 45;
 
+const SHARED_X_SCALE = false
+
 // COLORS
 const BLUE = 'rgba(32, 61, 192, 0.7)';
 const RICH_BLUE = 'rgb(32, 61, 192)';
@@ -377,8 +382,11 @@ class JSModel{
         let current_bins = this.faceted_bins[fac].column;
         let sum_stats = this.faceted_sum_stats[fac];
 
+        // console.log("CALC BOX METRICS: ", fac, current_bins, x_axis_thresholds, y_axis_thresholds);
+
         // Iterate over the columns that divide the data along the x axis
         for(let bin in current_bins){
+
             let filtered_bin;
             
             //Do not filter if no filter is specified currently
@@ -400,34 +408,72 @@ class JSModel{
             temp_box_stats.bins = [];
             
             //box bins for this column
-            let row_bins = d3.bin()
-                        .value(d => d[this.vars.y])
-                        .domain([sum_stats.y.min, sum_stats.y.max]).thresholds(y_axis_thresholds)(filtered_bin);
+            function binValues(values, thresholds, accessor) {
+                const bins = [];
+                // Create an empty bin for each interval between consecutive thresholds
+                for (let i = 0; i < thresholds.length - 1; i++) {
+                    bins.push([]);
+                }
+                // Place each value in the appropriate bin
+                values.forEach(d => {
+                    const val = accessor(d);
+                    for (let i = 0; i < thresholds.length - 1; i++) {
+                        // For the last bin, include values equal to the upper bound
+                        if (val >= thresholds[i] && (i === thresholds.length - 2 || val < thresholds[i + 1])) {
+                            bins[i].push(d);
+                            break;
+                        }
+                    }
+                });
+                return bins;
+            }
 
+            const customBins = binValues(filtered_bin, y_axis_thresholds, d => d[this.vars.y]);
+
+            // Process each bin's summary statistics and update color scale range
+            temp_box_stats.bins = customBins.map((bin, index) => {
+                const stats = this.get_summary_stats(bin, this.vars.color);
+                stats.values = bin;
+                stats.std_ratio = stats.std / this.faceted_sum_stats[fac].color.std;
+                stats.threshold = y_axis_thresholds[index];
+                this.color_scale_range[0] = Math.min(this.color_scale_range[0], stats[this.vars.color_agg]);
+                this.color_scale_range[1] = Math.max(this.color_scale_range[1], stats[this.vars.color_agg]);
+                return stats;
+            });
 
-            //clamps down last bin(s) if more are produced than desired
-            // idk why but d3 produces too many bins sometimes
-            if(row_bins.length > y_axis_thresholds.length-1){
-                let diff = (y_axis_thresholds.length-1)-row_bins.length;
-                let head = row_bins.slice(0, diff);
 
-                for(let i = row_bins.length-1; i > y_axis_thresholds.length-2; i--){
-                    head[head.length-1] = head[head.length-1].concat(row_bins[i]);
-                }
-                row_bins = head;
-            }
+            // let row_bins = d3.bin()
+            //             .value(d => d[this.vars.y])
+            //             .domain([sum_stats.y.min, sum_stats.y.max]).thresholds(y_axis_thresholds)(filtered_bin);
 
-            //load individual boxes of values with summary statistics describing them
-            for(let index in row_bins){
-                let row = row_bins[index];
-                let sum_stats = this.get_summary_stats(row, this.vars.color);
-                sum_stats.values = row;
-                sum_stats['std_ratio'] = sum_stats.std/this.faceted_sum_stats[fac].color.std;
-                sum_stats.threshold = y_axis_thresholds[index];
-                temp_box_stats.bins.push(sum_stats);
-                this.color_scale_range[0] = Math.min(this.color_scale_range[0], sum_stats[this.vars.color_agg]);
-                this.color_scale_range[1] = Math.max(this.color_scale_range[1], sum_stats[this.vars.color_agg]);
-            }
+            // // console.log("ROW BINS BEFORE CLAMP: ", row_bins.length, y_axis_thresholds.length);
+
+
+            // //clamps down last bin(s) if more are produced than desired
+            // // idk why but d3 produces too many bins sometimes
+            // if(row_bins.length > y_axis_thresholds.length-1){
+            //     let diff = (y_axis_thresholds.length-1)-row_bins.length;
+            //     let head = row_bins.slice(0, diff);
+
+            //     for(let i = row_bins.length-1; i > y_axis_thresholds.length-2; i--){
+            //         head[head.length-1] = head[head.length-1].concat(row_bins[i]);
+            //     }
+            //     row_bins = head;
+            // }
+
+            // // console.log("ROW BINS AFTER CLAMP: ", row_bins.length, y_axis_thresholds.length);
+
+            // //load individual boxes of values with summary statistics describing them
+            // for(let index in row_bins){
+            //     let row = row_bins[index];
+            //     let sum_stats = this.get_summary_stats(row, this.vars.color);
+            //     sum_stats.values = row;
+            //     sum_stats['std_ratio'] = sum_stats.std/this.faceted_sum_stats[fac].color.std;
+            //     sum_stats.threshold = y_axis_thresholds[index];
+            //     temp_box_stats.bins.push(sum_stats);
+            //     this.color_scale_range[0] = Math.min(this.color_scale_range[0], sum_stats[this.vars.color_agg]);
+            //     this.color_scale_range[1] = Math.max(this.color_scale_range[1], sum_stats[this.vars.color_agg]);
+            // }
 
             temp_box_stats.column_values = filtered_bin;
             this.faceted_bins[fac].column[bin] = temp_box_stats;
@@ -443,7 +489,21 @@ class JSModel{
      * @returns {Array} - The sanitized and initialized data.
      */
     sanitize_and_intialize_data(data){
-        this.global_sum_stats = {x:{},y:{},color:{}};
+        this.global_sum_stats = {
+            x:{
+                max: Number.MIN_SAFE_INTEGER,
+                min: Number.MAX_SAFE_INTEGER
+            },
+            y:{
+                max: Number.MIN_SAFE_INTEGER,
+                min: Number.MAX_SAFE_INTEGER
+            },
+            color:{
+                max: Number.MIN_SAFE_INTEGER,
+                min: Number.MAX_SAFE_INTEGER
+            },
+            num_cols: 0
+        };
         for(let fac of this.facets){
             //store data about what types of scales x and y are
             this.scale_types[fac] = {
@@ -466,14 +526,6 @@ class JSModel{
             }
 
 
-            // this.global_sum_stats.x.max = Math.max(this.faceted_sum_stats[fac].x.max, this.global_sum_stats.x.max);
-            // this.global_sum_stats.y.max = Math.max(this.faceted_sum_stats[fac].y.max, this.global_sum_stats.y.max);
-            // this.global_sum_stats.color.max = Math.max(this.faceted_sum_stats[fac].color.max, this.global_sum_stats.color.max);
-
-            // this.global_sum_stats.x.min = Math.min(this.faceted_sum_stats[fac].x.min, this.global_sum_stats.x.min);
-            // this.global_sum_stats.y.min = Math.min(this.faceted_sum_stats[fac].y.min, this.global_sum_stats.y.min);
-            // this.global_sum_stats.color.min = Math.min(this.faceted_sum_stats[fac].color.min, this.global_sum_stats.color.max);
-
 
             data[fac] = this.sanitize_data_for_log(data[fac], this.vars.y);
 
@@ -484,9 +536,20 @@ class JSModel{
 
             let sum_stats = this.faceted_sum_stats[fac];
 
+            this.global_sum_stats.x.max = Math.max(this.faceted_sum_stats[fac].x.max, this.global_sum_stats.x.max);
+            this.global_sum_stats.y.max = Math.max(this.faceted_sum_stats[fac].y.max, this.global_sum_stats.y.max);
+            this.global_sum_stats.color.max = Math.max(this.faceted_sum_stats[fac].color.max, this.global_sum_stats.color.max);
+
+            this.global_sum_stats.x.min = Math.min(this.faceted_sum_stats[fac].x.min, this.global_sum_stats.x.min);
+            this.global_sum_stats.y.min = Math.min(this.faceted_sum_stats[fac].y.min, this.global_sum_stats.y.min);
+            this.global_sum_stats.color.min = Math.min(this.faceted_sum_stats[fac].color.min, this.global_sum_stats.color.max);
+
             
             this.faceted_bins[fac] = {}
             
+
+            console.log("SUM STATS: ", fac, sum_stats);
+
             //conditional x axis thresholds based on time or numbers
             // important for calculating the scales which layout the columns
             // of the "heatmap"
@@ -503,7 +566,7 @@ class JSModel{
                 // just do linerats if not
                 if(this.is_more_than_n_orders_of_magnitude(sum_stats.x.min, sum_stats.x.max, 3)){
                     this.scale_types[fac].x.log = true;
-                    this.x_axis_thresholds[fac] = this.logScale(this.log_values_floor, sum_stats.x.max, num_cols);
+                    this.x_axis_thresholds[fac] = this.logScale(this.log_values_floor, sum_stats.x.max+1, num_cols-1);
                     this.faceted_bins[fac].column = d3.bin()
                                                     .value(d => d[this.vars.x])
                                                     .domain([this.log_values_floor, sum_stats.x.max])
@@ -512,7 +575,7 @@ class JSModel{
                 }
                 else{
                     this.scale_types[fac].x.linear = true;
-                    this.x_axis_thresholds[fac] = this.linearScale(sum_stats.x.min, sum_stats.x.max, num_rows);
+                    this.x_axis_thresholds[fac] = this.linearScale(sum_stats.x.min, sum_stats.x.max+1, num_cols-1);
                     this.faceted_bins[fac].column = d3.bin()
                                                     .value(d => d[this.vars.x])
                                                     .domain([sum_stats.x.min, sum_stats.x.max])
@@ -524,9 +587,11 @@ class JSModel{
             if(this.is_more_than_n_orders_of_magnitude(sum_stats.y.min, sum_stats.y.max, 3)){
                 this.scale_types[fac].y.log = true;
                 this.y_axis_thresholds[fac] = this.logScale(this.log_values_floor, sum_stats.y.max, num_rows);
+                console.log("Y AXIS THRESHOLDS LOG: ", fac, this.y_axis_thresholds[fac].length);
             } else {
                 this.scale_types[fac].y.linear = true;
                 this.y_axis_thresholds[fac] = this.linearScale(sum_stats.y.min, sum_stats.y.max, num_rows);
+                console.log("Y AXIS THRESHOLDS LINEAR: ", fac, this.y_axis_thresholds[fac].length);
             }
 
             sum_stats.col_counts = {
@@ -539,6 +604,9 @@ class JSModel{
                 sum_stats.col_counts.min = Math.min(sum_stats.col_counts.min, bin.length);
             }
 
+            
+            this.global_sum_stats.num_cols = Math.max(this.faceted_bins[fac].column.length, this.global_sum_stats.num_cols);
+
             // temporary as Y AXIS IS FIXED LOG
             this.calculate_box_metrics(fac, this.x_axis_thresholds[fac], this.y_axis_thresholds[fac]);
             this.calc_row_major_counts(fac);
@@ -554,6 +622,7 @@ class JSModel{
             this.categorical_bins[fac] = Object.keys(cat_counts).map((key) => { return {"key": key, "val":cat_counts[key]} }).sort((a, b) => b['val'] - a['val']);
         }
 
+
         return data;
     }
 
@@ -582,8 +651,6 @@ class JSModel{
      */
     filter_data_by_category(filter, facet, source, targets){
 
-        console.log("DATA FILTERS: ", filter)
-
         this.faceted_states[facet].filter = filter;
 
         // is anything pinned
@@ -635,9 +702,6 @@ class JSModel{
 
         }
 
-        console.log(this.brushed_ranges[facet].x_range, this.brushed_ranges[facet].y_range);
-
-
 
         if(this.brushed_ranges[facet].x_range.length != 0){
             for(let bin of this.faceted_bins[facet].column){
@@ -683,8 +747,6 @@ class JSModel{
             }
         }
 
-        console.log("TEST", test);
-
         this.anywidget_model.set("selected_records", JSON.stringify(return_ids));
         this.anywidget_model.save_changes();
 
@@ -815,7 +877,7 @@ class SmartScale {
             if(this.model.is_more_than_n_orders_of_magnitude(this.domain[0], this.domain[1], 3)){
                 return d3.scaleLog().domain([this.model.log_values_floor, this.domain[1]]).range(this.range);
             } else {
-                return d3.scaleLinear().domain([this.domain[0], this.domain[1]]).range(this.range);
+                return d3.scaleLinear().domain(this.domain).range(this.range);
             }
         } else {
             throw new Error("Unsupported domain type");
@@ -894,16 +956,23 @@ class Heatmap{
         //                             .domain(this.model.faceted_bins[this.facet].column.keys())
         //                             .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width - OVERVIEW_LAYOUT.inner_padding]);
         
-        this.scale_x = new SmartScale([sum_stats.x.min, sum_stats.x.max],
-                                [OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding],
-                                this.model);
-                            // d3.scaleUtc()
-                            // .domain([new Date(sum_stats.x.min), this.model.addDays(new Date(sum_stats.x.max),1)])
-                            // .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding]);
+
+        if(SHARED_X_SCALE){
+            this.scale_x = new SmartScale([this.model.global_sum_stats.x.min, this.model.global_sum_stats.x.max],
+                        [OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding],
+                        this.model);
+        }
+        else{
+            this.scale_x = new SmartScale([sum_stats.x.min, sum_stats.x.max],
+                        [OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding],
+                        this.model);
+
+        }
+
 
         //Determine if y scale is log or linear based on input data
-        console.log(this.model.scale_types[this.facet]);
         if(this.model.scale_types[this.facet].y.log){
+
             this.scale_y = d3.scaleLog()
                             .domain([this.model.log_values_floor, sum_stats.y.max])
                             .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
@@ -1043,19 +1112,24 @@ class Heatmap{
      * Raises and zooms on a column slightly
      */
     focus_col(update_element){
-       let self = this;
-
-       let base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
-
-       self.scale_y_blocks.range([OVERVIEW_LAYOUT.inner_padding-(zoom_factor_v/2), OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding + (zoom_factor_v/2)]);
+        let self = this;
+        let base_width;
+        if(SHARED_X_SCALE){
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.global_sum_stats.num_cols))
+        }
+        else{
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        }
+       
+        self.scale_y_blocks.range([OVERVIEW_LAYOUT.inner_padding-(zoom_factor_v/2), OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding + (zoom_factor_v/2)]);
 
-       update_element.raise();
-    
-       update_element.selectAll('.row')
-            .attr('width', ()=>{return base_width + zoom_factor_h})
-            .attr('height', ()=>{return ( (OVERVIEW_LAYOUT.height + zoom_factor_v) - 2*OVERVIEW_LAYOUT.inner_padding) / self.model.faceted_bins[self.facet].column[0].bins.length})
-            .attr('y', (d, i)=>{return self.scale_y_blocks(i) - OVERVIEW_LAYOUT.inner_padding});
+        update_element.raise();
         
+        update_element.selectAll('.row')
+                .attr('width', ()=>{return base_width + zoom_factor_h})
+                .attr('height', ()=>{return ( (OVERVIEW_LAYOUT.height + zoom_factor_v) - 2*OVERVIEW_LAYOUT.inner_padding) / self.model.faceted_bins[self.facet].column[0].bins.length})
+                .attr('y', (d, i)=>{return self.scale_y_blocks(i) - OVERVIEW_LAYOUT.inner_padding});
+            
         update_element.selectAll('.col-bg')
             .attr('width', ()=>{return base_width + zoom_factor_h})
             .attr('height', ()=>{return ( (OVERVIEW_LAYOUT.height + zoom_factor_v) - 2*OVERVIEW_LAYOUT.inner_padding)})
@@ -1075,9 +1149,14 @@ class Heatmap{
      */
     unfocus_col(update_element){
         let self = this;
-
-
-        let base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        let base_width;
+        if(SHARED_X_SCALE){
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.global_sum_stats.num_cols))
+        }
+        else{
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        }
+       
         self.scale_y_blocks.range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
 
 
@@ -1130,9 +1209,16 @@ class Heatmap{
     render(){
         const self = this;
 
-        console.log(this.model.faceted_bins[this.facet].column);
 
-        let base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        let base_width = 0;
+        if(SHARED_X_SCALE){
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.global_sum_stats.num_cols))
+        }
+        else{
+            base_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        }
+
+        
 
         if(self.model.row_major_counts[self.facet].length < 2){
             this.view
@@ -1142,6 +1228,7 @@ class Heatmap{
                 .attr('transform', `translate(${draw_width/2},${draw_height/2})`)
         }   
         else{
+
             this.view
             .selectAll('.column')
             .data(this.model.faceted_bins[this.facet].column)
@@ -1214,6 +1301,9 @@ class Heatmap{
                     )
                     col.on('mouseenter', function (e, d){
                         delete self.cached_bins['hover'];
+
+                        console.log("HOVERING OVER: ", d);
+
                         self.focus_col(d3.select(e.target));
                         if(!Object.keys(self.cached_bins).includes(String(d.threshold))){
                             let dt_text_selection = d3.select(e.target).select('.text-field');
@@ -1364,10 +1454,17 @@ class Histogram{
             let y_offset = Y_VARIABLE_OFFSET + OVERVIEW_LAYOUT.height + HISTOGRAM_LAYOUT.outer_margin;
 
 
+
             //create the histograms
             let h_hist = this.parent.append('g')
                     .attr('class', 'faceted-h-hist')
                     .attr('transform', `translate(${x_offset},${y_offset})`);
+            
+            h_hist.append('rect')
+                        .attr('width', this.width - 2*HISTOGRAM_LAYOUT.inner_padding)
+                        .attr('height', this.height - HISTOGRAM_LAYOUT.inner_padding)
+                        .attr('fill', 'rgba(240,240,240)')
+                        .attr('transform', `translate(${HISTOGRAM_LAYOUT.inner_padding},${0})`);;
 
             h_hist.append('g')
                     .attr('class', 'left-axis')
@@ -1389,7 +1486,12 @@ class Histogram{
                     .attr('text-anchor', 'middle')
                     .attr('transform', `translate(${this.width/2},${this.height})`);
 
+            
+            h_hist.append("g")
+                .attr('class', 'bars');
+
             this.view = h_hist;
+        
 
             this.brush = d3.brushX()
                 .extent([[OVERVIEW_LAYOUT.inner_padding, 0], [OVERVIEW_LAYOUT.width - OVERVIEW_LAYOUT.inner_padding, this.height-HISTOGRAM_LAYOUT.inner_padding]])
@@ -1400,9 +1502,8 @@ class Histogram{
                             select = selection.map(self.scale_x.scale.invert, self.scale_x.scale).map(d3.utcDay.round);
                         }
                         if(self.model.scale_types[self.facet]['x']['log'] || self.model.scale_types[self.facet]['x']['linear']){
-                            select = selection.map(self.scale_x.scale.invert, self.scale_x.scale).map((d)=>{return Math.floor(d+1)});
+                            select = selection.map(self.scale_x.scale.invert, self.scale_x.scale).map((d)=>{return d});
                         }
-                        console.log(select);
                     }else{
                         select = [];
                     }
@@ -1410,46 +1511,62 @@ class Histogram{
                 });
 
             h_hist.append("g")
+                .attr('class', 'h-brush')
                 .call(this.brush);
         } 
         
 
         else if(this.orientation == 'right'){
 
-            let x_offset = X_VARIABLE_OFFSET + OVERVIEW_LAYOUT.width;
+            let x_offset = X_VARIABLE_OFFSET + OVERVIEW_LAYOUT.width - 5;
             let y_offset = Y_VARIABLE_OFFSET + VERT_HISTOGRAM_LAYOUT.outer_margin;
 
             let v_hist = this.parent.append('g')
                 .attr('class', 'faceted-v-hist')
                 .attr('transform', `translate(${x_offset},${y_offset})`);
 
+            v_hist.append('rect')
+                    .attr('width', this.width)
+                    .attr('height', this.height - 2*HISTOGRAM_LAYOUT.inner_padding)
+                    .attr('fill', 'rgba(240,240,240)')
+                    .attr('transform', `translate(${0},${HISTOGRAM_LAYOUT.inner_padding})`);
+;
+                
             v_hist.append('g')
                 .attr('class', 'bot-axis')
                 .call(d3.axisBottom().scale(this.scale_x).ticks(5))  
                 .attr('transform', `translate(${VERT_HISTOGRAM_LAYOUT.inner_padding*4},${VERT_HISTOGRAM_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding})`);
 
-            // v_hist.append('g')
-            //         .attr('class', 'left-axis')
-            //         .call(d3.axisLeft().scale(this.scale_y_inverse))  
-            //         .attr('transform', `translate(${VERT_HISTOGRAM_LAYOUT.inner_padding},${0})`);
+            v_hist.append('g')
+                    .attr('class', 'left-axis')
+                    .call(d3.axisRight().scale(this.axis_scale_y_inverse))  
+                    .attr('transform', `translate(${self.width-VERT_HISTOGRAM_LAYOUT.inner_padding},${0})`);
 
             this.brush = d3.brushY()
                 .extent([[0, HISTOGRAM_LAYOUT.inner_padding], [this.width, this.height - OVERVIEW_LAYOUT.inner_padding]])
                 .on("end", function({selection}){
                     let select;
                     if(selection){
-                        select = selection.map(self.scale_y.invert, self.scale_y).map((d)=>{return Math.floor(d+1)})
+                        select = selection.map(self.scale_y.invert, self.scale_y).map((d)=>{return d+0.1})
                     }else{
                         select = [];
                     }
                     self.model.update_subselected_data(self.facet, [`${self.facet}_heatmap`, `${self.facet}_legend`], select, "y");
                 });
 
+            
+            v_hist.append("g")
+                .attr('class', 'bars');
+
             v_hist.append("g")
+                .attr('class', 'v-brush')
                 .call(this.brush);
 
             this.view = v_hist;
         }
+
+
+
     }
 
     /**
@@ -1469,20 +1586,56 @@ class Histogram{
 
             //references OVERVIEW LAYOUT SIZES
             //BE CAREFUL
-            this.scale_x = new SmartScale([sum_stats.x.min, sum_stats.x.max],
+            if(SHARED_X_SCALE){
+                this.scale_x = new SmartScale([this.model.global_sum_stats.x.min, this.model.global_sum_stats.x.max],
                             [OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding],
                             this.model);
+            }
+            else{
+                this.scale_x = new SmartScale([sum_stats.x.min, sum_stats.x.max],
+                            [OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.width-OVERVIEW_LAYOUT.inner_padding],
+                            this.model);
+            }
+            
         }
         
         else if(this.orientation == 'right'){
 
-            this.scale_y = d3.scaleLinear()
+            if(this.model.is_more_than_n_orders_of_magnitude(0, Math.max(...this.model.row_major_counts[this.facet]), 3)){
+                let local_log_floor = 0.3
+                this.scale_x = d3.scaleLog()
+                                    .domain([local_log_floor, Math.max(...this.model.row_major_counts[this.facet])])
+                                    .range([0, VERT_HISTOGRAM_LAYOUT.width - VERT_HISTOGRAM_LAYOUT.inner_padding]);
+            }else{
+                this.scale_x = d3.scaleLinear() 
+                                    .domain([0, Math.max(...this.model.row_major_counts[this.facet])])
+                                    .range([0, VERT_HISTOGRAM_LAYOUT.width - VERT_HISTOGRAM_LAYOUT.inner_padding]);
+            }
+
+
+        if(this.model.scale_types[this.facet].y.log){
+            this.axis_scale_y = d3.scaleLog()
+                            .domain([this.model.log_values_floor, sum_stats.y.max])
+                            .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
+
+            this.axis_scale_y_inverse = d3.scaleLog()
+                            .domain([sum_stats.y.max, this.model.log_values_floor])
+                            .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
+        }
+        else if(this.model.scale_types[this.facet].y.linear){
+            this.axis_scale_y = d3.scaleLinear()
+                        .domain([sum_stats.y.min, sum_stats.y.max])
+                        .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
+
+            this.axis_scale_y_inverse = d3.scaleLinear()
+                        .domain([sum_stats.y.max, sum_stats.y.min])
+                        .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
+        }
+
+        this.scale_y = d3.scaleLinear()
                 .domain([num_rows-2, -1])
                 .range([OVERVIEW_LAYOUT.inner_padding, OVERVIEW_LAYOUT.height - OVERVIEW_LAYOUT.inner_padding]);
 
-            this.scale_x = d3.scaleLinear() 
-                .domain([0, Math.max(...this.model.row_major_counts[this.facet])])
-                .range([0, VERT_HISTOGRAM_LAYOUT.width - VERT_HISTOGRAM_LAYOUT.inner_padding]);
         }
     }
 
@@ -1491,12 +1644,21 @@ class Histogram{
      */
     render(){
         const self = this;
-        let bar_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        let bar_width = 0;
+        if(SHARED_X_SCALE){
+            bar_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.global_sum_stats.num_cols))
+        }
+        else{
+            bar_width = Math.min(MIN_BAR_WIDTH, (draw_width / self.model.faceted_bins[self.facet].column.length))
+        }
+            
+        let bar_layer = this.view.select('.bars');
 
+    
         if(self.model.row_major_counts[self.facet].length > 2){
             if(this.orientation == 'bottom'){
-                this.view.selectAll('.column')
-                        .data(self.model.faceted_bins[self.facet].column, function(d){return this.id} )
+                bar_layer.selectAll('.column')
+                        .data(self.model.faceted_bins[self.facet].column, function(){return this.id} )
                         .join(
                             function(enter){
                                 let col = enter.append('g')
@@ -1524,8 +1686,7 @@ class Histogram{
             }
 
             if(this.orientation == "right"){
-                this.view
-                    .selectAll('.row')
+                bar_layer.selectAll('.row')
                     .data(self.model.row_major_counts[self.facet])
                     .join(
                         function(enter){
@@ -1535,7 +1696,9 @@ class Histogram{
 
                             row.append('rect')
                                 .attr('class', 'bar')
-                                .attr('width', (d)=>{return self.scale_x(d)})
+                                .attr('width', (d)=>{
+                                        return self.scale_x(d) ? self.scale_x(d) : 0;
+                                    })
                                 .attr('height', (d)=>{return draw_height / self.model.faceted_bins[self.facet].column[0].bins.length})
                                 .attr('fill', TAN);
                             
@@ -1544,7 +1707,9 @@ class Histogram{
                         function(update){
                             update.select('.bar')
                                 .transition()
-                                .attr('width', (d)=>{return self.scale_x(d)});
+                                .attr('width', (d)=>{
+                                        return self.scale_x(d) ? self.scale_x(d) : 0;
+                                    });
                         },
                         function(exit){
                             exit.remove();
@@ -1552,6 +1717,7 @@ class Histogram{
                     )
             }
         }
+
     }  
 }
 
@@ -1586,8 +1752,8 @@ class CategoricalBarChart{
             
             //create the histograms
 
-            let x_offset = X_VARIABLE_OFFSET + HISTOGRAM_LAYOUT.outer_margin + OVERVIEW_LAYOUT.width;
-            let y_offset = Y_VARIABLE_OFFSET + OVERVIEW_LAYOUT.height + HISTOGRAM_LAYOUT.outer_margin;
+            let x_offset = X_VARIABLE_OFFSET + OVERVIEW_LAYOUT.width;
+            let y_offset = Y_VARIABLE_OFFSET + HISTOGRAM_LAYOUT.outer_margin + OVERVIEW_LAYOUT.height ;
 
             let h_hist = this.parent.append('g')
                     .attr('class', 'faceted-h-hist')
@@ -1648,15 +1814,31 @@ class CategoricalBarChart{
     setup_scales(){
         this.n = Math.min(this.model.categorical_bins[this.facet].length, this.n);
         let top_n_cats = this.model.categorical_bins[this.facet].slice(0,this.n);
+        
+        this.max_bar_width = 30;
+        this.drawable_width = (this.width-2*CAT_HISTOGRAM_LAYOUT.inner_padding);
+        this.calc_bar_width = Math.min(this.max_bar_width, this.drawable_width/this.n);
 
         if(this.orientation == 'bottom'){
-            this.scale_y = d3.scaleLinear()
-                                .domain([0, top_n_cats[0].val])
-                                .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
-            
-            this.scale_y_inverse = d3.scaleLinear()
-                                        .domain([top_n_cats[0].val, 0])
-                                        .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+            if(this.model.is_more_than_n_orders_of_magnitude(0, top_n_cats[0].val, 3)){
+                let local_log_floor = 0.3
+                this.scale_y = d3.scaleLog()
+                                    .domain([local_log_floor, top_n_cats[0].val])
+                                    .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+                
+                this.scale_y_inverse = d3.scaleLog()
+                                            .domain([top_n_cats[0].val, local_log_floor])
+                                            .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+            }
+            else{
+                this.scale_y = d3.scaleLinear()
+                                    .domain([0, top_n_cats[0].val])
+                                    .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+                
+                this.scale_y_inverse = d3.scaleLinear()
+                                            .domain([top_n_cats[0].val, 0])
+                                            .range([0, this.height - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+            }
 
             //references OVERVIEW LAYOUT SIZES
             //BE CAREFUL
@@ -1664,7 +1846,8 @@ class CategoricalBarChart{
                             .domain(top_n_cats.map((obj)=>{
                                 return obj.key;
                             }))
-                            .range([CAT_HISTOGRAM_LAYOUT.inner_padding, this.width - CAT_HISTOGRAM_LAYOUT.inner_padding]);
+                            .range([CAT_HISTOGRAM_LAYOUT.inner_padding, this.width - CAT_HISTOGRAM_LAYOUT.inner_padding])
+                            .padding(0.1);
         }
         
         else if(this.orientation == 'right'){
@@ -1684,11 +1867,10 @@ class CategoricalBarChart{
      */
     render(){
 
+        const self = this;
         let top_n_cats = this.model.categorical_bins[this.facet].slice(0,this.n);
         let update_targets = [`${this.facet}_heatmap`, `${this.facet}_right_histogram`, `${this.facet}_bottom_histogram`, `${this.facet}_legend`];
 
-        const self = this;
-
         if(self.model.row_major_counts[self.facet].length > 2){
 
             if(this.orientation == 'bottom'){
@@ -1705,17 +1887,18 @@ class CategoricalBarChart{
                                 let col = enter.append('g')
                                                 .attr('class', 'column')
                                                 .attr('transform', (d, i)=>{
-                                                    if(self.scale_x(d.key)){ 
-                                                        return `translate(${self.scale_x(d.key)}, ${CAT_HISTOGRAM_LAYOUT.inner_padding})`
-                                                    }
-                                                    return `translate(${0}, ${CAT_HISTOGRAM_LAYOUT.inner_padding})`
+                                                        const tickPos = self.scale_x(d.key);
+                                                        const bandWidth = self.scale_x.bandwidth();
+                                                        // Center bar if calc_bar_width < bandWidth
+                                                        const offset = (bandWidth - self.calc_bar_width) / 2;
+                                                        return `translate(${tickPos + offset}, ${CAT_HISTOGRAM_LAYOUT.inner_padding})`;
                                                 });
 
                                 col.append('rect')
                                     .attr('class', 'bar')
                                     .attr('height', (d)=>{return self.scale_y(d.val)})
                                     // .attr('width', (d)=>{return ((HISTOGRAM_LAYOUT.width - 2*HISTOGRAM_LAYOUT.inner_padding) / faceted_bins[d.facet].x.length)})
-                                    .attr('width', (self.width-2*CAT_HISTOGRAM_LAYOUT.inner_padding)/self.n)
+                                    .attr('width', self.calc_bar_width)
                                     .attr('fill', TAN)
                                     .attr(`transform`, (d)=>{return `translate(${0}, ${(CAT_HISTOGRAM_LAYOUT.height- self.scale_y(d.val))-2*CAT_HISTOGRAM_LAYOUT.inner_padding})`})
                                     .on('mouseover', function (e,d){
@@ -1910,7 +2093,6 @@ class Validator{
      */
     isValidDate(dateString) {
         const date_time = new Date(dateString);
-        console.log("AAAAA", date_time.getTime());
         return !isNaN(date_time.getTime());
     }
 
@@ -2002,6 +2184,15 @@ class Validator{
         return missing;
     }
 
+
+    // Function to coerce an entire column’s values to strings
+    coerceColumnToString(columnData) {
+        return Object.keys(columnData).reduce((result, key) => {
+            result[key] = String(columnData[key]);
+            return result;
+        }, {});
+    }
+
     /**
      * Ensures that all values in this.var_specs are logically appropriate
      * @param {Object} this.var_specs - The variable specifications.
@@ -2023,11 +2214,11 @@ class Validator{
                 if (typeof test_val !== 'number'){
                     if(typeof test_val == 'string'){
                         if(!this.isValidDate(test_val)){
-                            incorrect.push({ key: key, value: this.var_specs[key], message: 'The x-axis aaaaa only supports floats, integers and dates. Please specify a different variable or verify that the datetime is properly formatted.' });
+                            incorrect.push({ key: key, value: this.var_specs[key], message: 'The x-axis only supports floats, integers and dates. Please specify a different variable or verify that the datetime is properly formatted.' });
                         }
                     }
                     else {
-                        incorrect.push({ key: key, value: this.var_specs[key], message: 'The x-axis bbbbbb only supports floats, integers and dates. Please specify a different variable or verify that the datetime is properly formatted.' });
+                        incorrect.push({ key: key, value: this.var_specs[key], message: 'The x-axis only supports floats, integers and dates. Please specify a different variable or verify that the datetime is properly formatted.' });
                     }
                 }
             }
@@ -2045,8 +2236,15 @@ class Validator{
             }
             else if (key === 'categorical'){
                 let test_val = this.data[this.var_specs[key]][Object.keys(this.data[this.var_specs[key]])[0]];
+                // For categorical variables, coerce data to strings if necessary.
                 if(typeof test_val !== 'string'){
-                    incorrect.push({ key: key, value: this.var_specs[key], message: 'The categorical view only supports categorical variables formatted as strings. Please specify a different column on your dataset or reformat an exisitng column.' });
+                    // Coerce the column data at this.data[this.var_specs[key]]
+                    this.data[this.var_specs[key]] = coerceColumnToString(this.data[this.var_specs[key]]);
+                    // Re-check the data type after coercion
+                    test_val = this.data[this.var_specs[key]][Object.keys(this.data[this.var_specs[key]])[0]];
+                    if(typeof test_val !== 'string'){
+                        incorrect.push({ key: key, value: this.var_specs[key], message: 'The categorical view only supports categorical variables formatted as strings. Please specify a different column on your dataset or reformat an existing column.' });
+                    }
                 }
             }
         }
@@ -2144,7 +2342,6 @@ function render({model, el}){
 
         validator.data = data;
         is_valid = validator.validate();
-        console.log()
         
         if(is_valid){
             let jsmodel = new JSModel(data, var_specs, model);
@@ -2157,4 +2354,4 @@ function render({model, el}){
 
 
 
-export default{ render }
+export default{ render };

guidepost-0.2.15/guidepost/version.py

@@ -0,0 +1,2 @@
+__version_info__ = ("0", "2", "15")
+__version__ = ".".join(__version_info__)

{guidepost-0.2.14 → guidepost-0.2.15/guidepost.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: guidepost
-Version: 0.2.14
+Version: 0.2.15
 Summary: Guidepost. An overview visualization for understanding supercomputer queue data.
 Home-page: https://github.com/cscully-allison/guidepost
 Author: Connor Scully-Allison
@@ -22,6 +22,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -212,7 +213,7 @@ Guidepost is licensed under the MIT License. See the `LICENSE` file for details.
 
 ## Acknowledgments
 
-Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL).
+Guidepost was developed under the auspices and with funding provided by the National Renewable Energy Laboratory (NREL), the National Science Foundation under NSF IIS-1844573 and IIS-2324465, and the Department of Energy under DE-SC0022044 and DE-SC0024635.
 
 ---
 

{guidepost-0.2.14 → guidepost-0.2.15}/guidepost.egg-info/SOURCES.txt

@@ -1,9 +1,8 @@
 LICENSE
+MANIFEST.in
 README.md
 pyproject.toml
 setup.py
-figs/__init__.py
-figs/guidepost_tutorial_info.png
 guidepost/__init__.py
 guidepost/guidepost.js
 guidepost/guidepost.py

{guidepost-0.2.14 → guidepost-0.2.15}/guidepost.egg-info/top_level.txt

@@ -1,3 +1,2 @@
-figs
 guidepost
 tutorials

{guidepost-0.2.14 → guidepost-0.2.15}/setup.py

@@ -4,7 +4,7 @@ from os import path
 
 here = path.abspath(path.dirname(__file__))
 
-with open("README.md", "r", encoding="utf-8") as fh:
+with open(path.join(here, "README.md"), "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 # Get the version in a safe way

guidepost-0.2.14/guidepost/version.py

@@ -1,2 +0,0 @@
-__version_info__ = ("0", "2", "14")
-__version__ = ".".join(__version_info__)