From 35e6857fb09b006da9f8cc3f59f239f078cc69a1 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Tue, 29 Aug 2017 13:54:43 +0200 Subject: Still working on the implementation. --- instance-calculator/src/Main.java | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'instance-calculator/src/Main.java') diff --git a/instance-calculator/src/Main.java b/instance-calculator/src/Main.java index 488b9bb..3835c16 100644 --- a/instance-calculator/src/Main.java +++ b/instance-calculator/src/Main.java @@ -54,25 +54,18 @@ public class Main * { * a = Candidates.pop(); * - * for (c: a.component) + * if (a.has_components_not_in(ProcessedCandidates)) * { - * if (!contains(c.target, ProcessedCandidates)) - * { - * FuturCandidates.push(a); - * continue; - * } + * FuturCandidates.push(a); * } + * else + * { + * is_stuck = False; * - * is_stuck = False; - * - * a.instantiate_all_processes(); + * a.create_instance(); * - * for (c: a.component) - * { - * a.integrate_instanciated_processes_from(c); + * ProcessedCandidates.add(a); * } - * - * ProcessedCandidates.add(a); * } * * if (is_stuck) @@ -82,4 +75,9 @@ public class Main * } */ } + + public static Parameters get_parameters () + { + return PARAMETERS; + } } -- cgit v1.2.3-70-g09d2