Changeset 20893ab in OpenModelica

Timestamp:

2021-04-06T15:07:08+02:00 (3 years ago)

Author:

phannebohm <philip.hannebohm@…>

Children:

2d459fc8

Parents:

a94b02e4

Message:

Remove unused use of obsolete HashTable

Location:

OMCompiler/Compiler

Files:

• NBackEnd/Modules/2_Pre/NBRemoveSimpleEquations.mo (modified) (2 diffs)
• NBackEnd/NBReplacements.mo (modified) (4 diffs)
• NBackEnd/NBSolve.mo (modified) (2 diffs)
• NBackEnd/NBStrongComponent.mo (modified) (3 diffs)
• NBackEnd/NBVariable.mo (modified) (4 diffs)
• NBackEnd/Util/NBHashTableCrToCrEqLst.mo (deleted)
• boot/LoadCompilerSources.mos (modified) (1 diff)

OMCompiler/Compiler/NBackEnd/Modules/2_Pre/NBRemoveSimpleEquations.mo

@@ -2 +2 @@
 * This file is part of OpenModelica.
 *
-* Copyright (c) 1998-2020, Open Source Modelica Consortium (OSMC),
+* Copyright (c) 1998-2021, Open Source Modelica Consortium (OSMC),
 * c/o Linköpings universitet, Department of Computer and Information Science,
 * SE-58183 Linköping, Sweden.
@@ -46 +46 @@
   import ComponentRef = NFComponentRef;
   import Expression = NFExpression;
-  import HashSet = NFHashSet;
-  import HashTableCrToExp = NFHashTableCrToExp;
   import Operator = NFOperator;
   import Variable = NFVariable;

OMCompiler/Compiler/NBackEnd/NBReplacements.mo

@@ -2 +2 @@
 * This file is part of OpenModelica.
 *
-* Copyright (c) 1998-2020, Open Source Modelica Consortium (OSMC),
+* Copyright (c) 1998-2021, Open Source Modelica Consortium (OSMC),
 * c/o Linköpings universitet, Department of Computer and Information Science,
 * SE-58183 Linköping, Sweden.
@@ -50 +50 @@
   import Expression = NFExpression;
   import NFFlatten.FunctionTreeImpl;
-  import HashSet = NFHashSet;
   import HashTableCrToExp = NFHashTableCrToExp;
   import HashTableCrToLst = NFHashTable3;
@@ -58 +57 @@
   // Backend imports
   import BVariable = NBVariable;
-  import EqData = NBEquation.EqData;
-  import Equation = NBEquation.Equation;
-  import EquationPointers = NBEquation.EquationPointers;
-  import HashTableCrToCrEqLst = NBHashTableCrToCrEqLst;
+  import NBEquation.{EqData, Equation, EquationPointers};
   import Solve = NBSolve;
   import StrongComponent = NBStrongComponent;
-  import VarData = NBVariable.VarData;
-  import VariablePointers = NBVariable.VariablePointers;
+  import NBVariable.{VarData, VariablePointers};
 
   // Util imports
@@ -261 +256 @@
   function empty
     "Returns an empty set of replacement rules"
-    input Integer size = BaseHashTable.defaultBucketSize;
-    input Boolean simple = false;
-    output Replacements variableReplacements;
-  protected
-    HashTableCrToExp.HashTable replacements;
-    HashTableCrToCrEqLst.HashTable groups;
-  algorithm
-    // ToDo: remove all those sized calls, they are just duplicate functions
-    replacements := HashTableCrToExp.emptyHashTableSized(size);
-    groups := HashTableCrToCrEqLst.emptyHashTableSized(size);
-    variableReplacements := SIMPLE_REPLACEMENTS(replacements, groups);
-  end empty;
-
-  function add
-    input output Replacements replacements;
-    input Expression src                    "for simple replacements src and dst are not yet determined";
-    input Expression dst;
-    input Equation eqn;
-  algorithm
-    // new (a -> b), existing (b -> c)
-    // new (a -> b), existing (a -> c) (FAIL or REPLACE?)
-    // new (a -> b), existing (c -> a) (how to detect for f(.., a, ...)?)
-    replacements := match replacements
-      case SIMPLE_REPLACEMENTS() algorithm
-      then replacements;
-
-      else algorithm
-        Error.addMessage(Error.INTERNAL_ERROR,{getInstanceName() + " failed adding replacement for expressions: "
-        + "\n\t 1. " + Expression.toString(src) + "\n\t 2. " + Expression.toString(dst) + "\n In equation: \n\t"
-        + Equation.toString(eqn)});
-      then fail();
-    end match;
-  end add;
-
-  function addStatic
-    input output Replacements repl;
-    input ComponentRef src;
-    input Expression dst;
-    input Equation eqn;
-  algorithm
-    repl := match repl
-      case SIMPLE_REPLACEMENTS() guard(not BaseHashTable.hasKey(src, repl.replacements)) algorithm
-        repl.replacements := BaseHashTable.add((src, dst), repl.replacements);
-      then repl;
-
-      // need forward replacement
-
-      else algorithm
-        Error.addMessage(Error.INTERNAL_ERROR,{getInstanceName() + " failed adding replacement for componentRef: "
-        + "\n\t - " + ComponentRef.toString(src) + "\n In equation: \n\t" + Equation.toString(eqn)});
-      then fail();
-    end match;
-
-  end addStatic;
-
-  function empty
-    "Returns an empty set of replacement rules"
     output Replacements variableReplacements;
     input Integer size = BaseHashTable.defaultBucketSize;

OMCompiler/Compiler/NBackEnd/NBSolve.mo

@@ -2 +2 @@
 * This file is part of OpenModelica.
 *
-* Copyright (c) 1998-2020, Open Source Modelica Consortium (OSMC),
+* Copyright (c) 1998-2021, Open Source Modelica Consortium (OSMC),
 * c/o Linköpings universitet, Department of Computer and Information Science,
 * SE-58183 Linköping, Sweden.
@@ -41 +41 @@
   import ComponentRef = NFComponentRef;
   import Expression = NFExpression;
-  import FunctionTree = NFFlatten.FunctionTree;
+  import NFFlatten.FunctionTree;
   import Operator = NFOperator;
   import SimplifyExp = NFSimplifyExp;

OMCompiler/Compiler/NBackEnd/NBStrongComponent.mo

@@ -2 +2 @@
 * This file is part of OpenModelica.
 *
-* Copyright (c) 1998-2020, Open Source Modelica Consortium (OSMC),
+* Copyright (c) 1998-2021, Open Source Modelica Consortium (OSMC),
 * c/o Linköpings universitet, Department of Computer and Information Science,
 * SE-58183 Linköping, Sweden.
@@ -50 +50 @@
   import NBEquation.Equation;
   import NBEquation.EquationAttributes;
-  import HashTableCrToCrLst = NBHashTableCrToCrLst;
   import Matching = NBMatching;
   import Tearing = NBTearing;
@@ -255 +254 @@
   function getDependentCrefs
     "Collects dependent crefs in current comp and saves them in the
-    HashTable. Saves both directions."
+     unordered map. Saves both directions."
     input StrongComponent comp                    "strong component to be analyzed";
     input UnorderedMap<ComponentRef, list<ComponentRef>> map "unordered map to save the dependencies";

OMCompiler/Compiler/NBackEnd/NBVariable.mo

@@ -2 +2 @@
 * This file is part of OpenModelica.
 *
-* Copyright (c) 1998-2020, Open Source Modelica Consortium (OSMC),
+* Copyright (c) 1998-2021, Open Source Modelica Consortium (OSMC),
 * c/o Linköpings universitet, Department of Computer and Information Science,
 * SE-58183 Linköping, Sweden.
@@ -46 +46 @@
   //NF Imports
   import BackendExtension = NFBackendExtension;
-  import BackendInfo = NFBackendExtension.BackendInfo;
-  import Binding = NFBinding.Binding;
+  import NFBackendExtension.BackendInfo;
+  import NFBinding.Binding;
   import Component = NFComponent;
   import ComponentRef = NFComponentRef;
   import Dimension = NFDimension;
   import Expression = NFExpression;
-  import InstNode = NFInstNode.InstNode;
+  import NFInstNode.InstNode;
   import Prefixes = NFPrefixes;
   import Subscript = NFSubscript;
   import Type = NFType;
   import Variable = NFVariable;
-  import VariableKind = NFBackendExtension.VariableKind;
+  import NFBackendExtension.VariableKind;
 
   // Backend Imports
@@ -1313 +1313 @@
     end getMarkedVars;
 
-    function compress"O(n)
+    function compress "O(n)
       Reorders the elements in order to remove all the gaps.
       Be careful: This changes the indices of the elements.
@@ -1338 +1338 @@
             lastUsedIndex := lastUsedIndex-1;
           end while;
-          // udpate HashTable element
+          // udpate hash table element
           UnorderedMap.add(getVarName(moved_var), i, vars.map);
         end if;

OMCompiler/Compiler/boot/LoadCompilerSources.mos

@@ -314 +314 @@
     "../NBackEnd/Util/NBGraphUtil.mo",
     "../NBackEnd/Util/NBHashTableCrToCr.mo",
-    "../NBackEnd/Util/NBHashTableCrToCrEqLst.mo",
     "../NBackEnd/Util/NBHashTableCrToCrLst.mo",