added table printting helper

This commit is contained in:
Zastian Pretorius
2022-07-20 14:16:48 +01:00
parent 002c27aefc
commit 30baaff563
4 changed files with 99 additions and 48 deletions

1
src/helpers/mod.rs Normal file
View File

@@ -0,0 +1 @@
pub mod table_printers;

View File

@@ -0,0 +1,49 @@
use prettytable::{Table, Row, Cell};
use std::vec::Vec;
pub fn print_first_table(table: &Vec<Vec<f64>>){
let mut print_table = Table::new();
let mut titles: Vec<Cell> = vec![];
for title in 0..table[0].len(){
if title == table[1].len() - 1 {
titles.push(Cell::new("rhs"));
} else if title < table[0].len() / 2 {
titles.push(Cell::new(&format!("x{}",title+1)));
} else {
titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
}
}
print_table.add_row(Row::new(titles));
for i in 0..table.len() {
let mut cells: Vec<Cell> = vec![];
for j in 0..table[i].len(){
cells.push(Cell::new(&table[i][j].to_string()));
};
print_table.add_row(Row::new(cells));
};
print_table.printstd();
}
pub fn print_table(table: &Vec<Vec<f64>>,pivot_col: &usize, pivot_row: &usize) {
let mut print_table = Table::new();
let mut titles: Vec<Cell> = vec![];
for title in 0..table[0].len(){
if title == table[0].len() - 1 {
titles.push(Cell::new("rhs"));
} else if title < table[0].len() / 2 {
titles.push(Cell::new(&format!("x{}",title+1)));
} else {
titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
}
}
print_table.add_row(Row::new(titles));
for i in 0..table.len() {
let mut cells: Vec<Cell> = vec![];
for j in 0..table[i].len(){
cells.push(Cell::new(&table[i][j].to_string()).style_spec(if j == *pivot_col || i == *pivot_row+1{ "Fgb"} else {""}));
};
print_table.add_row(Row::new(cells));
};
print_table.printstd();
}

View File

@@ -1,4 +1,5 @@
mod simplex;
mod helpers;
use simplex::simplex::simplex;
fn main() {
simplex();

View File

@@ -1,6 +1,6 @@
use std::io::{self, Write};
use std::vec::Vec;
use prettytable::{Table, Row, Cell};
use crate::helpers::table_printers::{print_table, print_first_table};
struct Coll {
restriction: Vec<f64>,
sign: String,
@@ -78,53 +78,53 @@ fn check_optimal(table: &Vec<Vec<f64>>) -> bool {
}
}
fn print_first_table(table: &Vec<Vec<f64>>){
let mut print_table = Table::new();
let mut titles: Vec<Cell> = vec![];
for title in 0..table[0].len(){
if title == table[1].len() - 1 {
titles.push(Cell::new("rhs"));
} else if title < table[0].len() / 2 {
titles.push(Cell::new(&format!("x{}",title+1)));
} else {
titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
}
}
print_table.add_row(Row::new(titles));
for i in 0..table.len() {
let mut cells: Vec<Cell> = vec![];
for j in 0..table[i].len(){
cells.push(Cell::new(&table[i][j].to_string()));
};
print_table.add_row(Row::new(cells));
};
print_table.printstd();
}
fn print_table(table: &Vec<Vec<f64>>,pivot_col: &usize, pivot_row: &usize) {
let mut print_table = Table::new();
let mut titles: Vec<Cell> = vec![];
for title in 0..table[0].len(){
if title == table[0].len() - 1 {
titles.push(Cell::new("rhs"));
} else if title < table[0].len() / 2 {
titles.push(Cell::new(&format!("x{}",title+1)));
} else {
titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
}
}
print_table.add_row(Row::new(titles));
for i in 0..table.len() {
let mut cells: Vec<Cell> = vec![];
for j in 0..table[i].len(){
cells.push(Cell::new(&table[i][j].to_string()).style_spec(if j == *pivot_col || i == *pivot_row+1{ "Fgb"} else {""}));
};
print_table.add_row(Row::new(cells));
};
print_table.printstd();
}
//fn print_first_table(table: &Vec<Vec<f64>>){
// let mut print_table = Table::new();
// let mut titles: Vec<Cell> = vec![];
// for title in 0..table[0].len(){
// if title == table[1].len() - 1 {
// titles.push(Cell::new("rhs"));
// } else if title < table[0].len() / 2 {
// titles.push(Cell::new(&format!("x{}",title+1)));
// } else {
// titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
// }
// }
// print_table.add_row(Row::new(titles));
// for i in 0..table.len() {
// let mut cells: Vec<Cell> = vec![];
// for j in 0..table[i].len(){
// cells.push(Cell::new(&table[i][j].to_string()));
// };
// print_table.add_row(Row::new(cells));
// };
// print_table.printstd();
//
//}
//
//
//fn print_table(table: &Vec<Vec<f64>>,pivot_col: &usize, pivot_row: &usize) {
// let mut print_table = Table::new();
// let mut titles: Vec<Cell> = vec![];
// for title in 0..table[0].len(){
// if title == table[0].len() - 1 {
// titles.push(Cell::new("rhs"));
// } else if title < table[0].len() / 2 {
// titles.push(Cell::new(&format!("x{}",title+1)));
// } else {
// titles.push(Cell::new(&format!("s{}",title - table[0].len() / 2 + 1)));
// }
// }
// print_table.add_row(Row::new(titles));
// for i in 0..table.len() {
// let mut cells: Vec<Cell> = vec![];
// for j in 0..table[i].len(){
// cells.push(Cell::new(&table[i][j].to_string()).style_spec(if j == *pivot_col || i == *pivot_row+1{ "Fgb"} else {""}));
// };
// print_table.add_row(Row::new(cells));
// };
// print_table.printstd();
//}
fn pivot_table(table: &mut Vec<Vec<f64>>, pivot_row: usize, pivot_col: usize) -> Vec<Vec<f64>> {
// firnd the pivot point