From eaf4fec9e0375405dcdfd99f4b16e62bcdabe8ac Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Mon, 20 Jan 2025 20:15:58 +0100 Subject: [PATCH] Refactoring --- Direction.py => LinearAlgebra/Direction.py | 0 Quaternion.py => LinearAlgebra/Quaternion.py | 0 Spherical.py => LinearAlgebra/Spherical.py | 0 SwingTwist.py => LinearAlgebra/SwingTwist.py | 0 Messages.py | 23 -------------------- Messages/LowLevelMessages.py | 2 +- Thing.py | 4 ++-- __init__.py | 11 ++-------- 8 files changed, 5 insertions(+), 35 deletions(-) rename Direction.py => LinearAlgebra/Direction.py (100%) rename Quaternion.py => LinearAlgebra/Quaternion.py (100%) rename Spherical.py => LinearAlgebra/Spherical.py (100%) rename SwingTwist.py => LinearAlgebra/SwingTwist.py (100%) delete mode 100644 Messages.py diff --git a/Direction.py b/LinearAlgebra/Direction.py similarity index 100% rename from Direction.py rename to LinearAlgebra/Direction.py diff --git a/Quaternion.py b/LinearAlgebra/Quaternion.py similarity index 100% rename from Quaternion.py rename to LinearAlgebra/Quaternion.py diff --git a/Spherical.py b/LinearAlgebra/Spherical.py similarity index 100% rename from Spherical.py rename to LinearAlgebra/Spherical.py diff --git a/SwingTwist.py b/LinearAlgebra/SwingTwist.py similarity index 100% rename from SwingTwist.py rename to LinearAlgebra/SwingTwist.py diff --git a/Messages.py b/Messages.py deleted file mode 100644 index 9bf0f93..0000000 --- a/Messages.py +++ /dev/null @@ -1,23 +0,0 @@ -# from . import LowLevelMessages -# from .Thing import Thing - -# class IMessage: -# id = 0x00 - -# ## Serialize the message into the given buffer -# # -# ## @returns: the length of the message -# def Serialize(buffer): -# return 0 - -# def SendTo(self, participant): -# buffer_size = self.Serialize([participant.buffer]) -# if buffer_size == 0: -# return False -# return participant.SendBuffer(buffer_size) - -# def Publish(self, participant): -# bufferSize = self.Serialize([participant.buffer]) -# if bufferSize == 0: -# return False -# return participant.PublishBuffer(bufferSize) diff --git a/Messages/LowLevelMessages.py b/Messages/LowLevelMessages.py index b02616c..eb6a560 100644 --- a/Messages/LowLevelMessages.py +++ b/Messages/LowLevelMessages.py @@ -1,5 +1,5 @@ import numpy as np -from ..SwingTwist import SwingTwist +from ..LinearAlgebra.SwingTwist import SwingTwist def SendAngle8(buffer, ix_ref, angle): # Normalize angle diff --git a/Thing.py b/Thing.py index a01b6ce..b719af7 100644 --- a/Thing.py +++ b/Thing.py @@ -1,5 +1,5 @@ -from .Spherical import Spherical -from .Quaternion import Quaternion +from .LinearAlgebra.Spherical import Spherical +from .LinearAlgebra.Quaternion import Quaternion ## A thing is the basic building block # diff --git a/__init__.py b/__init__.py index b2489e2..0584e21 100644 --- a/__init__.py +++ b/__init__.py @@ -1,14 +1,7 @@ -__all__ = ['Direction', - 'Spherical', - 'Thing', +__all__ = ['Thing', 'Participant', - 'Messages', - 'SiteServer', - 'SwingTwist'] + 'SiteServer'] -from .Direction import Direction from .Participant import Participant from .Thing import Thing -from .Spherical import Spherical -from .SwingTwist import SwingTwist from .SiteServer import SiteServer \ No newline at end of file