Merge branch 'master' into 267-initial-tensor-dimensions-arent-always-accurate

Author: khatchad

com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java

@@ -4613,8 +4613,8 @@ private void test(
       Map<Integer, Set<TensorType>> expectedTensorParameterValueNumberToTypes)
       throws ClassHierarchyException, CancelException, IOException {
     List<File> pathFiles = this.getPathFiles(pythonPath);
-    PythonTensorAnalysisEngine E = makeEngine(pathFiles, projectFilenames);
-    PythonSSAPropagationCallGraphBuilder builder = E.defaultCallGraphBuilder();
+    PythonTensorAnalysisEngine engine = makeEngine(pathFiles, projectFilenames);
+    PythonSSAPropagationCallGraphBuilder builder = engine.defaultCallGraphBuilder();
 
     addPytestEntrypoints(builder);
 
@@ -4630,10 +4630,10 @@ private void test(
       LOGGER.fine("Call graph:\n" + CG);
     }
 
-    TensorTypeAnalysis analysis = E.performAnalysis(builder);
+    TensorTypeAnalysis analysis = engine.performAnalysis(builder);
     LOGGER.info("Tensor analysis: " + analysis);
 
-    Map<PointerKey, AnalysisError> errors = E.getErrors();
+    Map<PointerKey, AnalysisError> errors = engine.getErrors();
 
     errors.forEach(
         (k, v) ->