Skip to content

Commit

Permalink
Format using default indention
Browse files Browse the repository at this point in the history
  • Loading branch information
@aleics
aleics committed Oct 3, 2024
1 parent e56f9c5 commit 90445b4
Show file tree
Hide file tree
Showing 55 changed files with 7,971 additions and 7,960 deletions.
366 changes: 183 additions & 183 deletions bruc-core/benches/graph-transform.rs
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions bruc-core/benches/render-svg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use rand::{thread_rng, Rng};
use test::Bencher;

fn specification(values: &str) -> String {
format!(
r#"
format!(
r#"
{{
"dimensions": {{
"width": 1500,
Expand Down Expand Up @@ -68,39 +68,39 @@ fn specification(values: &str) -> String {
}}
}}
"#
)
)
}

#[bench]
fn bench_render_svg(b: &mut Bencher) {
let mut view = create_view(1000);
b.iter(move || {
futures::executor::block_on(async {
let mut result = view.render(SvgRenderer).await;
result.next().await
let mut view = create_view(1000);
b.iter(move || {
futures::executor::block_on(async {
let mut result = view.render(SvgRenderer).await;
result.next().await
})
})
})
}

fn create_view(data_amount: usize) -> View {
let specification_json = specification(&create_data_json(data_amount));
let spec: Specification = serde_json::from_str(&specification_json).unwrap();
let specification_json = specification(&create_data_json(data_amount));
let spec: Specification = serde_json::from_str(&specification_json).unwrap();

View::build(spec)
View::build(spec)
}

fn create_data_json(amount: usize) -> String {
let mut data = String::new();
let mut rng = thread_rng();
let mut data = String::new();
let mut rng = thread_rng();

for i in 0..(amount - 1) {
let x = i as f32;
for i in 0..(amount - 1) {
let x = i as f32;
let y: f32 = rng.gen_range(0.0..50.0);
data.push_str(&format!(r#"{{ "x": {x}, "y": {y} }},"#));
}
let x = amount;
let y: f32 = rng.gen_range(0.0..50.0);
data.push_str(&format!(r#"{{ "x": {x}, "y": {y} }},"#));
}
let x = amount;
let y: f32 = rng.gen_range(0.0..50.0);
data.push_str(&format!(r#"{{ "x": {x}, "y": {y} }}"#));
data.push_str(&format!(r#"{{ "x": {x}, "y": {y} }}"#));

format!("[{data}]")
format!("[{data}]")
}
16 changes: 8 additions & 8 deletions bruc-core/examples/svg-bar-chart.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use bruc_core::View;

#[tokio::main(flavor = "current_thread")]
async fn main() {
let specification = serde_json::from_str(
r#"{
let specification = serde_json::from_str(
r#"{
"dimensions": {
"width": 1500,
"height": 300
Expand Down Expand Up @@ -68,13 +68,13 @@ async fn main() {
]
}
}"#,
)
.unwrap();
)
.unwrap();

let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;
let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;

let svg = render_result.next().await.unwrap();
let svg = render_result.next().await.unwrap();

println!("{}", svg);
println!("{}", svg);
}
16 changes: 8 additions & 8 deletions bruc-core/examples/svg-line-chart.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use bruc_core::View;

#[tokio::main(flavor = "current_thread")]
async fn main() {
let specification = serde_json::from_str(
r#"{
let specification = serde_json::from_str(
r#"{
"dimensions": {
"width": 500,
"height": 200
Expand Down Expand Up @@ -68,13 +68,13 @@ async fn main() {
]
}
}"#,
)
.unwrap();
)
.unwrap();

let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;
let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;

let svg = render_result.next().await.unwrap();
let svg = render_result.next().await.unwrap();

println!("{}", svg);
println!("{}", svg);
}
16 changes: 8 additions & 8 deletions bruc-core/examples/svg-pie-chart.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use bruc_core::View;

#[tokio::main(flavor = "current_thread")]
async fn main() {
let specification = serde_json::from_str(
r#"{
let specification = serde_json::from_str(
r#"{
"dimensions": {
"width": 300,
"height": 300
Expand Down Expand Up @@ -46,13 +46,13 @@ async fn main() {
]
}
}"#,
)
.unwrap();
)
.unwrap();

let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;
let mut view = View::build(specification);
let mut render_result = view.render(SvgRenderer).await;

let svg = render_result.next().await.unwrap();
let svg = render_result.next().await.unwrap();

println!("{}", svg);
println!("{}", svg);
}
91 changes: 45 additions & 46 deletions bruc-core/src/data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,72 +5,71 @@ use bruc_expression::data::{DataItem, DataSource};
#[derive(Clone, Debug, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
pub struct DataValue {
#[cfg_attr(feature = "serde", serde(flatten))]
pub(crate) instance: HashMap<String, DataItem>,
#[cfg_attr(feature = "serde", serde(flatten))]
pub(crate) instance: HashMap<String, DataItem>,
}

impl DataValue {
pub fn new() -> DataValue {
DataValue {
instance: HashMap::new(),
pub fn new() -> DataValue {
DataValue {
instance: HashMap::new(),
}
}
}

pub fn with_instance(instance: HashMap<String, DataItem>) -> DataValue {
DataValue { instance }
}
pub fn with_instance(instance: HashMap<String, DataItem>) -> DataValue {
DataValue { instance }
}

pub fn from_pairs(pairs: Vec<(&str, DataItem)>) -> DataValue {
let mut vars = DataValue::new();
for (key, var) in pairs {
vars.insert(key, var);
pub fn from_pairs(pairs: Vec<(&str, DataItem)>) -> DataValue {
let mut vars = DataValue::new();
for (key, var) in pairs {
vars.insert(key, var);
}
vars
}
vars
}

pub fn insert(&mut self, key: &str, value: DataItem) {
self.instance.insert(key.to_string(), value);
}
pub fn insert(&mut self, key: &str, value: DataItem) {
self.instance.insert(key.to_string(), value);
}

pub fn pairs(&self) -> Vec<(&str, DataItem)> {
self
.instance
.iter()
.map(|(key, value)| (key.as_str(), value.clone()))
.collect()
}
pub fn pairs(&self) -> Vec<(&str, DataItem)> {
self.instance
.iter()
.map(|(key, value)| (key.as_str(), value.clone()))
.collect()
}

pub fn get_number(&self, field: &str) -> Option<&f32> {
self.instance.get(field).and_then(|item| item.get_number())
}
pub fn get_number(&self, field: &str) -> Option<&f32> {
self.instance.get(field).and_then(|item| item.get_number())
}
}

impl DataSource for DataValue {
fn get(&self, key: &str) -> Option<&DataItem> {
self.instance.get(key)
}
fn get(&self, key: &str) -> Option<&DataItem> {
self.instance.get(key)
}
}

impl Default for DataValue {
fn default() -> Self {
Self::new()
}
fn default() -> Self {
Self::new()
}
}

impl Display for DataValue {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut keys = self.instance.keys().cloned().collect::<Vec<String>>();
keys.sort();
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut keys = self.instance.keys().cloned().collect::<Vec<String>>();
keys.sort();

let result = keys
.iter()
.map(|key| format!("\"{}\": {}", key, self.instance.get(key).unwrap()))
.collect::<Vec<String>>();
let result = keys
.iter()
.map(|key| format!("\"{}\": {}", key, self.instance.get(key).unwrap()))
.collect::<Vec<String>>();

if result.is_empty() {
write!(f, "{{}}")
} else {
write!(f, "{{ {} }}", result.join(", "))
if result.is_empty() {
write!(f, "{{}}")
} else {
write!(f, "{{ {} }}", result.join(", "))
}
}
}
}
Loading

0 comments on commit 90445b4

Please sign in to comment.