Skip to content

Commit

Permalink
Enable nested CreditsData
Browse files Browse the repository at this point in the history
  • Loading branch information
@unsigned-wrong-wrong-int
unsigned-wrong-wrong-int committed Feb 27, 2024
1 parent 18e5c00 commit 95e5df4
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 67 deletions.
20 changes: 18 additions & 2 deletions src/pattern.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ pub trait Credits {
fn is_ok(&self) -> bool;
}

pub trait DynCredits: Credits {
fn clone_boxed(&self) -> Box<dyn DynCredits>;
}

impl<T> DynCredits for T where T: Credits + Clone + 'static {
fn clone_boxed(&self) -> Box<dyn DynCredits> {
Box::new(Clone::clone(self))
}
}

impl Clone for Box<dyn DynCredits> {
fn clone(&self) -> Self {
self.clone_boxed()
}
}

#[derive(Clone, Debug)]
pub struct CreditsInfo {
pub name: String,
Expand Down Expand Up @@ -151,11 +167,11 @@ impl Credits for CreditsPE {
}
}

//#[derive(Clone, Debug)]
#[derive(Clone)]
pub struct CreditsData {
pub msg_prefix: String,
pub name: String,
pub credits_list: Vec<Box<dyn Credits>>,
pub credits_list: Vec<Box<dyn DynCredits>>,
pub pattern: CreditsPattern,
}

Expand Down
110 changes: 45 additions & 65 deletions src/pattern/coins22.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,24 +148,24 @@ pub fn check(config: &config::Config) -> Result<Vec<Box<dyn Credits>>> {
msg_prefix: "--------- ".to_string(),
name: "専門必修".to_string(),
credits_list: vec![
Box::new(専門必修実験.clone()),
Box::new(専門必修卒業研究.clone()),
Box::new(専門必修専門語学.clone()),
Box::new(専門必修実験),
Box::new(専門必修卒業研究),
Box::new(専門必修専門語学),
],
pattern: CreditsPattern::Only(16),
};
lst.push(Box::new(専門必修));
lst.push(Box::new(専門必修.clone()));

lst.push(Box::new(専門選択1.clone()));
lst.push(Box::new(専門選択2.clone()));

let 専門選択 = CreditsData {
msg_prefix: "--------- ".to_string(),
name: "専門選択".to_string(),
credits_list: vec![Box::new(専門選択1.clone()), Box::new(専門選択2.clone())],
credits_list: vec![Box::new(専門選択1), Box::new(専門選択2)],
pattern: CreditsPattern::Only(34),
};
lst.push(Box::new(専門選択));
lst.push(Box::new(専門選択.clone()));

lst.push(Box::new(専門基礎必修.clone()));

Expand All @@ -178,39 +178,38 @@ pub fn check(config: &config::Config) -> Result<Vec<Box<dyn Credits>>> {
msg_prefix: "--------- ".to_string(),
name: "専門基礎選択".to_string(),
credits_list: vec![
Box::new(専門基礎選択1.clone()),
Box::new(専門基礎選択2.clone()),
Box::new(専門基礎選択3.clone()),
Box::new(専門基礎選択4.clone()),
Box::new(専門基礎選択1),
Box::new(専門基礎選択2),
Box::new(専門基礎選択3),
Box::new(専門基礎選択4),
],
pattern: CreditsPattern::Only(26),
};
lst.push(Box::new(専門基礎選択));
lst.push(Box::new(専門基礎選択.clone()));

lst.push(Box::new(基礎共通必修総合科目.clone()));
lst.push(Box::new(基礎共通必修外国語.clone()));
let 基礎共通必修体育 = CreditsData {
msg_prefix: String::new(),
name: "基礎共通必修体育".to_string(),
credits_list: vec![Box::new(基礎体育.clone()), Box::new(応用体育.clone())],
credits_list: vec![Box::new(基礎体育), Box::new(応用体育)],
pattern: CreditsPattern::Only(2),
};
lst.push(Box::new(基礎共通必修体育));
lst.push(Box::new(基礎共通必修体育.clone()));
lst.push(Box::new(基礎共通必修情報.clone()));

let 基礎共通必修 = CreditsData {
msg_prefix: "--------- ".to_string(),
name: "基礎共通必修".to_string(),
credits_list: vec![
Box::new(基礎共通必修総合科目.clone()),
Box::new(基礎体育.clone()),
Box::new(応用体育.clone()),
Box::new(基礎共通必修外国語.clone()),
Box::new(基礎共通必修情報.clone()),
Box::new(基礎共通必修総合科目),
Box::new(基礎共通必修体育),
Box::new(基礎共通必修外国語),
Box::new(基礎共通必修情報),
],
pattern: CreditsPattern::Only(12),
};
lst.push(Box::new(基礎共通必修));
lst.push(Box::new(基礎共通必修.clone()));

lst.push(Box::new(基礎共通選択1.clone()));
lst.push(Box::new(基礎共通選択2.clone()));
Expand All @@ -219,12 +218,12 @@ pub fn check(config: &config::Config) -> Result<Vec<Box<dyn Credits>>> {
msg_prefix: "--------- ".to_string(),
name: "基礎共通選択".to_string(),
credits_list: vec![
Box::new(基礎共通選択1.clone()),
Box::new(基礎共通選択2.clone()),
Box::new(基礎共通選択1),
Box::new(基礎共通選択2),
],
pattern: CreditsPattern::Range(1, 5),
};
lst.push(Box::new(基礎共通選択));
lst.push(Box::new(基礎共通選択.clone()));

lst.push(Box::new(基礎関連選択1.clone()));
lst.push(Box::new(基礎関連選択2.clone()));
Expand All @@ -233,73 +232,54 @@ pub fn check(config: &config::Config) -> Result<Vec<Box<dyn Credits>>> {
msg_prefix: "--------- ".to_string(),
name: "基礎関連選択".to_string(),
credits_list: vec![
Box::new(基礎関連選択1.clone()),
Box::new(基礎関連選択2.clone()),
Box::new(基礎関連選択1),
Box::new(基礎関連選択2),
],
pattern: CreditsPattern::Range(6, 10),
};
lst.push(Box::new(基礎関連選択));
lst.push(Box::new(基礎関連選択.clone()));

let 基礎選択: CreditsData = CreditsData {
msg_prefix: "--------- ".to_string(),
name: "基礎選択".to_string(),
credits_list: vec![
Box::new(基礎共通選択),
Box::new(基礎関連選択),
],
pattern: CreditsPattern::Top(11),
};
//lst.push(Box::new(基礎選択.clone()));

let 必修 = CreditsData {
msg_prefix: "***** ".to_string(),
name: "必修".to_string(),
credits_list: vec![
Box::new(専門必修実験.clone()),
Box::new(専門必修卒業研究.clone()),
Box::new(専門必修専門語学.clone()),
Box::new(専門基礎必修.clone()),
Box::new(基礎共通必修総合科目.clone()),
Box::new(基礎体育.clone()),
Box::new(応用体育.clone()),
Box::new(基礎共通必修外国語.clone()),
Box::new(基礎共通必修情報.clone()),
Box::new(専門必修),
Box::new(専門基礎必修),
Box::new(基礎共通必修),
],
pattern: CreditsPattern::Only(54),
};
lst.push(Box::new(必修));
lst.push(Box::new(必修.clone()));

let 選択 = CreditsData {
msg_prefix: "***** ".to_string(),
name: "選択".to_string(),
credits_list: vec![
Box::new(専門選択1.clone()),
Box::new(専門選択2.clone()),
Box::new(専門基礎選択1.clone()),
Box::new(専門基礎選択2.clone()),
Box::new(専門基礎選択3.clone()),
Box::new(専門基礎選択4.clone()),
Box::new(基礎共通選択1.clone()),
Box::new(基礎共通選択2.clone()),
Box::new(基礎関連選択1.clone()),
Box::new(基礎関連選択2.clone()),
Box::new(専門選択),
Box::new(専門基礎選択),
Box::new(基礎選択),
],
pattern: CreditsPattern::Only(71),
};
lst.push(Box::new(選択));
lst.push(Box::new(選択.clone()));

let 卒業 = CreditsData {
msg_prefix: "!!!!!!!!!! ".to_string(),
name: "全体".to_string(),
credits_list: vec![
Box::new(専門必修実験),
Box::new(専門必修卒業研究),
Box::new(専門必修専門語学),
Box::new(専門基礎必修),
Box::new(基礎共通必修総合科目),
Box::new(基礎体育),
Box::new(応用体育),
Box::new(基礎共通必修外国語),
Box::new(基礎共通必修情報),
Box::new(専門選択1),
Box::new(専門選択2),
Box::new(専門基礎選択1),
Box::new(専門基礎選択2),
Box::new(専門基礎選択3),
Box::new(専門基礎選択4),
Box::new(基礎共通選択1),
Box::new(基礎共通選択2),
Box::new(基礎関連選択1),
Box::new(基礎関連選択2),
Box::new(必修),
Box::new(選択),
],
pattern: CreditsPattern::Only(125),
};
Expand Down

0 comments on commit 95e5df4

Please sign in to comment.