vato007/ingey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove smush rules, fix warnings

Browse Source
This commit is contained in:
Piv
2023-03-09 18:58:54 +10:30
parent 540e4c778d
commit 887e7c950b
6 changed files with 23 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/create_products.rs
View File

@@ -8,7 +8,6 @@ use std::{
use chrono::NaiveDateTime;
use csv::Position;
use itertools::Itertools;
use serde::Serialize;
#[derive(Hash, PartialEq, PartialOrd, Ord, Eq)]

9
src/lib.rs
View File

@@ -5,9 +5,6 @@ use std::ffi::CString;
pub use self::move_money::*;
mod smush_rules;
pub use self::smush_rules::*;
mod overhead_allocation;
pub use self::overhead_allocation::*;
@@ -50,7 +47,8 @@ pub extern "C" fn move_money_from_text(
&mut output_writer,
use_numeric_accounts,
true,
);
)
.expect("Failed to move money");
// TODO: Replace all these unwraps with something more elegant
let inner = output_writer.into_inner().unwrap();
CString::new(String::from_utf8(inner).unwrap())
@@ -119,7 +117,8 @@ pub extern "C" fn allocate_overheads_from_text(
false,
true,
account_type.to_str().unwrap().to_owned(),
);
)
.expect("Failed to allocate overheads");
let inner = output_writer.into_inner().unwrap();
CString::new(String::from_utf8(inner).unwrap())
.unwrap()

33
src/main.rs
View File

@@ -1,8 +1,6 @@
use std::{collections::HashMap, error::Error, io::Write, path::PathBuf};
use std::path::PathBuf;
use clap::{Parser, Subcommand};
use coster_rs::CsvCost;
use serde::Deserialize;
#[derive(Parser)]
#[command(name = "coster-rs")]
@@ -17,7 +15,7 @@ struct Cli {
#[derive(Subcommand)]
enum Commands {
/// Moves money between accounts and departments, using the given rules and lines
move_money {
MoveMoney {
#[arg(short = 'r', long, value_name = "FILE")]
rules: PathBuf,
@@ -39,16 +37,8 @@ enum Commands {
#[arg(short, long)]
flush_pass: bool,
},
/// Combines rules to the minimum set required
smush_rules {
#[arg(short = 'r', long, value_name = "FILE")]
rules: PathBuf,
#[arg(short, long, value_name = "FILE")]
output: Option<PathBuf>,
},
/// Allocates servicing department amounts to operating departments
allocate_overheads {
AllocateOverheads {
#[arg(short, long, value_name = "FILE")]
lines: PathBuf,
@@ -79,7 +69,7 @@ fn main() -> anyhow::Result<()> {
let cli = Cli::parse();
match cli.command {
Commands::move_money {
Commands::MoveMoney {
rules,
lines,
accounts,
@@ -96,8 +86,7 @@ fn main() -> anyhow::Result<()> {
use_numeric_accounts,
flush_pass,
),
Commands::smush_rules { rules, output } => smush_rules(rules, output),
Commands::allocate_overheads {
Commands::AllocateOverheads {
lines,
accounts,
allocation_statistics,
@@ -139,10 +128,6 @@ fn move_money(
)
}
fn smush_rules(rules_path: PathBuf, output: Option<PathBuf>) -> anyhow::Result<()> {
Ok(())
}
fn allocate_overheads(
lines: PathBuf,
accounts: PathBuf,
@@ -166,11 +151,3 @@ fn allocate_overheads(
account_type,
)
}
#[derive(Debug, Deserialize)]
struct CsvOverheadAllocationRule {
from_overhead_department: String,
to_department: String,
percent: f64,
to_department_type: String,
}

30
src/move_money.rs
View File

@@ -1,7 +1,4 @@
use std::{
collections::{HashMap, HashSet},
thread::current,
};
use std::collections::{HashMap, HashSet};
use itertools::Itertools;
use serde::{Deserialize, Serialize, Serializer};
@@ -26,15 +23,6 @@ struct CsvMovementRule {
dest_from_account: String,
#[serde(rename = "AccountDestTo", default)]
dest_to_account: String,
// TODO: Check how these actually work, they're somehow integrated into other columns
#[serde(default)]
all_from_departments: bool,
#[serde(default)]
all_to_departments: bool,
#[serde(default)]
all_from_accounts: bool,
#[serde(default)]
all_to_accounts: bool,
#[serde(rename = "AmountValue")]
amount: Option<f64>,
#[serde(rename = "AmountType", default)]
@@ -166,7 +154,7 @@ where
)
})
.collect();
let mut accounts_reader = accounts_reader;
let accounts_reader = accounts_reader;
let all_accounts = accounts_reader
.deserialize()
.collect::<Result<Vec<CsvAccount>, csv::Error>>()?;
@@ -203,7 +191,6 @@ where
.unique()
.sorted()
.collect();
let mut rules_reader = rules_reader;
let mut rules: Vec<MovementRule> = vec![];
for movement_rule in rules_reader.deserialize() {
// TODO: Consider reclass rule group, how does that even work?
@@ -375,10 +362,10 @@ pub fn move_money_2(
// to add a new line
let mut running_total = HashMap::from(initial_totals);
let mut temp_total = running_total.clone();
let mut moveMoneyResult: Vec<MoveMoneyResult> = vec![];
let mut move_money_result: Vec<MoveMoneyResult> = vec![];
let mut current_pass = 0;
if flush_pass {
moveMoneyResult.push(MoveMoneyResult {
move_money_result.push(MoveMoneyResult {
pass: current_pass,
totals: running_total.clone(),
})
@@ -388,7 +375,7 @@ pub fn move_money_2(
if flush_pass {
current_pass += 1;
// Flush the totals at the end of this pass (more specifically the change)
moveMoneyResult.push(MoveMoneyResult {
move_money_result.push(MoveMoneyResult {
pass: current_pass,
totals: temp_total
.iter()
@@ -433,12 +420,12 @@ pub fn move_money_2(
}
}
}
moveMoneyResult.push(MoveMoneyResult {
move_money_result.push(MoveMoneyResult {
pass: current_pass,
totals: temp_total,
});
moveMoneyResult
move_money_result
}
#[cfg(test)]
@@ -453,6 +440,7 @@ mod tests {
&mut csv::Writer::from_path("output.csv").unwrap(),
false,
true,
);
)
.unwrap();
}
}

12
src/overhead_allocation.rs
View File

@@ -1,4 +1,7 @@
use std::{collections::{HashMap, HashSet}, io::Read, path::Path};
use std::{
collections::{HashMap, HashSet},
io::Read,
};
use itertools::Itertools;
use nalgebra::{DMatrix, Dynamic, LU};
@@ -26,8 +29,6 @@ impl DepartmentType {
pub struct CsvAllocationStatistic {
#[serde(rename = "Name")]
name: String,
#[serde(rename = "Description")]
description: Option<String>,
#[serde(rename = "AccountType")]
account_type: String,
#[serde(rename = "AccountRanges")]
@@ -39,8 +40,6 @@ pub struct AllocationStatisticAccountRange {
end: usize,
}
type CsvArea = HashMap<String, String>;
// Note: remember these are overhead departments only when calculating the lu decomposition or pseudoinverse, and for each department,
// you either need -1 or rest negative for a row to subtract the initial amounts so we end up effectively 0 (simultaneous equations end
// up with negative there so yes this is expected)
@@ -247,7 +246,7 @@ where
if current_area_ccs.is_none() {
continue;
}
let mut current_area_ccs = current_area_ccs.unwrap().clone();
let current_area_ccs = current_area_ccs.unwrap().clone();
for cc in current_area_ccs {
overhead_ccs.insert(cc);
@@ -592,7 +591,6 @@ fn do_solve_reciprocal<T: ReciprocalAllocationSolver>(
mod tests {
use crate::reciprocal_allocation;
use crate::AccountCost;
use crate::CsvCost;
use crate::DepartmentType;
use crate::OverheadAllocationRule;
use crate::TotalDepartmentCost;

22
src/smush_rules.rs
View File

@@ -1,22 +0,0 @@
// Rules get parsed from file, converted into matrix format (for the in-memory movement),
// then combined (smushed) into a single matrix + vector/rule for each . The list of units can then have the rules applied
//
// For now just ignore the all from/to stuff, it's kind of a shit thing to do, and can
// be worked around by actually inputting every type into the rules
use std::collections::HashMap;
use crate::MovementRule;
pub fn smush_rules(rules: Vec<MovementRule>) -> Vec<MovementRule> {
let ruleMapping: HashMap<String, usize> = HashMap::new();
// First build out the list/map of all departments (store index of each element in the array)
// TODO: We could make this more advanced by only smushing per divider, so that only the departments
// needed between each pass is actually required
for rule in rules {
for department in rule.from_departments {
// ruleMapping.entry(department).or_insert(ruleMapping.len());
}
}
vec![]
}