From dbfe0f75026a4a6c54c65ad29694571c292a53e7 Mon Sep 17 00:00:00 2001
From: marho227 <marho227@student.liu.se>
Date: Fri, 14 Jun 2024 11:55:32 +0200
Subject: [PATCH] i fixed my own issues
---
src/simudator/core/processor.py | 6 +-----
src/simudator/gui/pipeline.py | 2 --
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/simudator/core/processor.py b/src/simudator/core/processor.py
index 592ad03..bb33eb9 100644
--- a/src/simudator/core/processor.py
+++ b/src/simudator/core/processor.py
@@ -412,11 +412,7 @@ class Processor:
def pretty_print(self) -> None:
self.pretty_print_verbose(self.ignore_keys)
-<<<<<<< HEAD
- def pretty_print_verbose(self, ignore_keys=[]) -> None:
-=======
def pretty_print_verbose(self, ignore_keys=None) -> None:
->>>>>>> main
"""
Prints the most relevant information about each module
compact and pretty. Fields of modules can be ignored with the
@@ -426,7 +422,7 @@ class Processor:
memory_modules = []
other_modules = []
- if ignore_keys == None:
+ if ignore_keys is None:
ignore_keys = []
# TODO: remove isinstance(module, micro_memory)
diff --git a/src/simudator/gui/pipeline.py b/src/simudator/gui/pipeline.py
index b277942..c351fab 100644
--- a/src/simudator/gui/pipeline.py
+++ b/src/simudator/gui/pipeline.py
@@ -29,8 +29,6 @@ class PipeLine(QTableWidget):
Instructions are set from get_current_instructions() in the Processor class.
"""
- def set_instruction(self, instructions: list[str]) -> None:
- """Give the pipeline the current CPU instructions."""
self.instructions = instructions
for i in range(len(self.instructions)):
instruction = self.instructions[i][0]
--
GitLab