Remove smush rules, fix warnings

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

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;