From f90ca0b911395942e2fb9b4ddd55b19152e36a92 Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 13 Mar 2017 08:22:13 +0100 Subject: [PATCH] minor refactoring --- .../digital/gui/components/table/ExpressionCreator.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/components/table/ExpressionCreator.java b/src/main/java/de/neemann/digital/gui/components/table/ExpressionCreator.java index a11036175..758319858 100644 --- a/src/main/java/de/neemann/digital/gui/components/table/ExpressionCreator.java +++ b/src/main/java/de/neemann/digital/gui/components/table/ExpressionCreator.java @@ -95,19 +95,15 @@ public class ExpressionCreator { QuineMcCluskey qmc = new QuineMcCluskey(localVars) .fillTableWith(boolTable); - calcColumn(listener, qmc, resultName, localVars); - } - - private static void calcColumn(ExpressionListener listener, QuineMcCluskey qmc, String name, List vars) throws ExpressionException, FormatterException { PrimeSelector ps = new PrimeSelectorDefault(); Expression e = qmc.simplify(ps).getExpression(); if (ps.getAllSolutions() != null) { for (ArrayList i : ps.getAllSolutions()) { - listener.resultFound(name, QuineMcCluskey.addAnd(null, i, vars)); + listener.resultFound(resultName, QuineMcCluskey.addAnd(null, i, localVars)); } } else { - listener.resultFound(name, e); + listener.resultFound(resultName, e); } }