Draft: parse prefix as scale factor

Siehe #17 (closed)

Klappt jetzt fast alles. Es kann sein, dass nicht alle Ausgabenmodi die Scale-Faktoren enthalten. Ich habe auch noch nicht die Integration mit dccQuantities getestet.

Die Umrechnung in Base-Einheiten hat auch noch ein paar Probleme, siehe Test-case unten. Bin aber nicht sicher, ob das in den gleichen PR gehört.

Test-Code

from dsiUnits import dsiUnit

u_cm = dsiUnit(r"\centi\metre")
u_m = dsiUnit(r"\metre")
u_s = dsiUnit(r"\second")


u_cm2 = dsiUnit(r"\centi\metre\tothe{2}")
u_mcm = dsiUnit(r"\metre\centi\metre")
u_cmm = dsiUnit(r"\centi\metre\metre")

u_cm1 = dsiUnit(r"\centi\metre\tothe{-1}")
u_pcm = dsiUnit(r"\one\per\centi\metre")


print(f"s * cm = {u_s*u_cm} = {(u_s*u_cm).toBaseUnitTree()}")
print(f"cm * s = {u_cm*u_s} = {(u_cm*u_s).toBaseUnitTree()}")
print(f"cm * m = {u_cm*u_m} = {(u_cm*u_m).toBaseUnitTree()}")
print(f"m * cm = {u_m*u_cm} = {(u_m*u_cm).toBaseUnitTree()}")
print("")

print(f"cm = {u_cm} = {u_cm.toBaseUnitTree()}" )
print(f"cm2 = {u_cm2} = {u_cm2.toBaseUnitTree()}" )
print("")

print(f"cm-1 = {u_cm1} = {u_cm1.toBaseUnitTree()}" )
print(f"1/cm = {u_pcm} = {u_pcm.toBaseUnitTree()}" )
print("")

print(f"cm2^-1 = {u_cm2**-1} = {(u_cm2**-1).toBaseUnitTree()} " )
print(f"cm / (cm2) = {u_cm/u_cm2} = {(u_cm/u_cm2).toBaseUnitTree()}" )

print("")
print(f"cm2 / m = {u_cm2/u_m} = {(u_cm2/u_m).toBaseUnitTree()}" )
print(f"m*cm / (cm2) = {u_mcm/u_cm2} = {(u_mcm/u_cm2).toBaseUnitTree()}" )
print("")

u_eV = dsiUnit(r"\electronvolt")
u_J = dsiUnit(r"\joule")
print(f"eV = {u_eV} = {u_eV.toBaseUnitTree()}")
print(f"J = {u_J} = {u_J.toBaseUnitTree()}")
print(f"eV/J = {(u_eV/u_J)} = {(u_eV/u_J).toBaseUnitTree()}")
print(f"J*eV = {u_J*u_eV} = {(u_J*u_eV).toBaseUnitTree()}")

Ausgabe

s * cm = 0.01*\metre\second = 0.01*\metre\second
cm * s = 0.01*\metre\second = 0.01*\metre\second
cm * m = 0.01*\metre\tothe{2} = 0.01*\metre\tothe{2}
m * cm = 0.01*\metre\tothe{2} = 0.01*\metre\tothe{2}

cm = 0.01*\metre = 0.01*\metre
cm2 = 0.0001*\metre\tothe{2} = 0.0001*\metre\tothe{2}

cm-1 = 100.0*\metre\tothe{-1} = 100.0*\metre\tothe{-1}
1/cm = \one\per0.01*\metre = 100.0*\metre\tothe{-1}

cm2^-1 = 10000.0*\metre\tothe{-2} = 10000.0*\metre\tothe{-2}
cm / (cm2) = \one\per0.01*\metre = 100.0*\metre\tothe{-1}

cm2 / m = 0.0001*\metre = 0.0001*\metre
m*cm / (cm2) = 100.0*\one = 100.0*\one

eV = \electronvolt = 1.602176634e-19*\joule
J = \joule = \kilogram\metre\tothe{2}\second\tothe{-2}
eV/J = \electronvolt\per\joule = 1.602176634e-19*\joule\kilogram\tothe{-1}\metre\tothe{-2}\second\tothe{2}
J*eV = \electronvolt\joule = 1.602176634e-19*\joule\kilogram\metre\tothe{2}\second\tothe{-2}

src/dsiUnits.py

@@ -218,6 +218,13 @@ class dsiParser:
             if (len(items) == 0) and (item == ''): break
             (prefix, unit, exponent) = ('', '', '')
             valid=True
+
+        #Convert prefixes to scale factors
+        for node in nodes:
+            if node.prefix != "":
+                node.scaleFactor *= _dsiPrefixesScales[node.prefix]**node.exponent
+                node.prefix = ""
+
         return (nodes, warningMessages)
 
     def info(self):
@@ -339,7 +346,8 @@ class dsiUnit:
 
                 # Handle prefix (if any) and unit
                 prefixStr = _dsiPrefixesUTF8.get(node.prefix, '⚠'+node.prefix+'⚠') if node.prefix else ""
-                utf8Str = f"{prefixStr}{unitStr}"  # Direct concatenation for compactness
+                scaleFactorStr = f"{node.scaleFactor}*" if node.scaleFactor != 1 else ""
+                utf8Str = f"{scaleFactorStr}{prefixStr}{unitStr}"  # Direct concatenation for compactness
 
                 # Handle exponent, converting to UTF-8 subscript, if not 1
                 if node.exponent and node.exponent != 1:
@@ -406,6 +414,12 @@ class dsiUnit:
                 fractionalScaleFactor = 1 / node.scaleFactor
                 consolidated_nodes.append(_node(node.prefix, node.unit, invertedExponent,  scaleFactor=fractionalScaleFactor))
 
+        ##Convert prefixes to scale factors
+        #for node in consolidated_nodes:
+        #    if node.prefix != "":
+        #        node.scaleFactor *= _dsiPrefixesScales[node.prefix]**node.exponent
+        #        node.prefix = ""
+
         # Consolidating nodes with the same unit
         i = 0
         while i < len(consolidated_nodes):
@@ -429,22 +443,18 @@ class dsiUnit:
             node.scaleFactor = 1.0  # Reset scale factor for individual nodes
         # Sort nodes alphabetically by unit
         consolidated_nodes.sort(key=lambda x: x.unit)
-        # Apply overall scale factor to the first node, if it exists
-        if consolidated_nodes:
-            consolidated_nodes[0].scaleFactor = overall_scale_factor
+
         nodesWOPowerZero=[]
         for node in consolidated_nodes:
-            if node.exponent != 0:
+            if node.exponent != 0 and node.unit != "one":
                 nodesWOPowerZero.append(node)
         if len(nodesWOPowerZero) == 0: # ok all nodes have ben power of zero so we deleted them so we end up with one as unit and 1.0 as exponent
-            nodesWOPowerZero.append(_node("", "one", 1.0,scaleFactor=overall_scale_factor))
+            nodesWOPowerZero.append(_node("", "one", 1.0,scaleFactor=1))
         consolidated_nodes=nodesWOPowerZero
-        # Check for ones and delete them if they are not the only node ad set there exponent to 1.0 since 1^x = 1
-        if len(consolidated_nodes) > 1:
-            consolidated_nodes = [node for node in consolidated_nodes if node.unit != "one"]
-        else:
-            if consolidated_nodes[0].unit == "one":
-                consolidated_nodes[0].exponent=1.0
+
+        # Apply overall scale factor to the first node
+        consolidated_nodes[0].scaleFactor = overall_scale_factor
+
         # Create and return a new instance of _dsiTree with consolidated nodes
         return dsiUnit(self.dsiString, [consolidated_nodes], self.warnings, self._latexDefaultWrapper,
                        self._latexDefaultPrefix, self._latexDefaultSuffix)
@@ -454,6 +464,7 @@ class dsiUnit:
             for i,node in enumerate(self.tree[1]):
                 #invert exponent node.
                 node.exponent=node.exponent*-1
+                node.scaleFactor = 1/node.scaleFactor
                 self.tree[0].append(node)
                 self.tree[1].pop(i)
             self.tree.pop(1)
@@ -463,16 +474,18 @@ class dsiUnit:
         for node in self.tree[0]: # numerator
             if node.exponent < 0:
                 node.exponent = -node.exponent
+                node.scaleFactor = 1.0/node.scaleFactor
                 try:
-                    self.tree[1].append(_node("", node.unit, node.exponent))
+                    self.tree[1].append(_node("", node.unit, node.exponent, scaleFactor = node.scaleFactor))
                 except IndexError:# if we have only the numerator list we need to add the denominator list
-                    self.tree.append([_node("", node.unit, node.exponent)])
+                    self.tree.append([_node("", node.unit, node.exponent, scaleFactor = node.scaleFactor)])
                 self.tree[0].remove(node)
         if len(self.tree) ==2: # we have a numerator and a denominator so we must treat the denominator as well
             for node in self.tree[1]: # numerator
                 if node.exponent < 0:
                     node.exponent = -node.exponent
-                    self.tree[0].append(_node("", node.unit, node.exponent))
+                    node.scaleFactor = 1.0/node.scaleFactor
+                    self.tree[0].append(_node("", node.unit, node.exponent, scaleFactor = node.scaleFactor))
                     self.tree[1].remove(node)
         if len(self.tree[0]) == 0:
             self.tree[0].append(_node("", "one", 1.0))
@@ -587,6 +600,7 @@ class dsiUnit:
         for unitFraction in resultNodeLIst:
             for node in unitFraction:
                 node.exponent *= other
+                node.scaleFactor = node.scaleFactor**other
         resultTree =dsiUnit("", resultNodeLIst, self.warnings, self._latexDefaultWrapper, self._latexDefaultPrefix, self._latexDefaultSuffix)
         resultTree = resultTree.reduceFraction()
         if len(self.tree)==2: # check if we had a per representation
@@ -696,7 +710,7 @@ class _node:
         """
         # Adjust the scale factor for the prefix
         prefixScale = _dsiPrefixesScales.get(self.prefix, 1)  # Default to 1 if no prefix
-        adjustedScaleFactor = self.scaleFactor * prefixScale
+        adjustedScaleFactor = self.scaleFactor * prefixScale**self.exponent
 
         # Convert to base units if it's a derived unit
         if self.unit in _derivedToBaseUnits:
@@ -705,7 +719,7 @@ class _node:
             for i, (baseUnit, exponent, scaleFactor) in enumerate(baseUnitsInfo):
                 # Apply the adjusted scale factor only to the first base unit
                 finalScaleFactor = math.pow(adjustedScaleFactor * scaleFactor, self.exponent) if i == 0 else 1.0
-                baseUnits.append(_node('', baseUnit, exponent * self.exponent, scaleFactor=finalScaleFactor))
+                baseUnits.append(_node('', baseUnit, exponent = exponent, scaleFactor=finalScaleFactor))
             return baseUnits
         elif complete:
             # Additional logic for converting ampere, volt, and mole to kg, s, and m equivalents
@@ -714,7 +728,7 @@ class _node:
                 kgsUnits = []
                 for i, (kgsUnit, exponent, scaleFactor) in enumerate(kgsUnitsInfo):
                     finalScaleFactor = math.pow(adjustedScaleFactor * scaleFactor, self.exponent) if i == 0 else 1.0
-                    kgsUnits.append(_node('', kgsUnit, exponent * self.exponent, scaleFactor=finalScaleFactor))
+                    kgsUnits.append(_node('', kgsUnit, exponent = exponent, scaleFactor=finalScaleFactor))
                 return kgsUnits
 
         # Return the node as is if it's already a base unit, with adjusted scale factor
@@ -727,6 +741,9 @@ class _node:
     def __str__(self):
         result=''
 
+        if self.scaleFactor != 1:
+            result+= f"{self.scaleFactor}*"
+
         if self.prefix !='':
             result+='\\'+self.prefix
         result = result + '\\' + self.unit
@@ -1066,4 +1083,4 @@ _additionalConversions = {
 }
 _dsiKeyWords = {
     'tothe': r'\tothe',
-    'per': r'\per'}
+    'per': r'\per'}
\ No newline at end of file