Changeset 6564 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:05:09 PM (18 years ago)

Author:

bwuest

Message:

Converter.cc changed: float converter should work now except for numbers with absolute value less than 10^{(-30) and ± infinity}

Location:

branches/network/src

Files:

• lib/network/converter.cc (modified) (17 diffs)
• lib/network/converter.h (modified) (4 diffs)
• subprojects/network/Makefile.am (modified) (1 diff)
• subprojects/network/isolated_unit_test.cc (added)
• subprojects/network/isolated_unit_test.h (added)
• subprojects/network/read_sync.cc (modified) (1 diff)
• subprojects/network/simple_sync.cc (modified) (1 diff)
• subprojects/network/write_sync.cc (modified) (1 diff)

branches/network/src/lib/network/converter.cc

@@ -22 +22 @@
 /* include your own header */
 #include "converter.h"
+#include "shell_command.h"
+
+#include <limits>
+
+SHELL_COMMAND_STATIC(debug, Converter, Converter::debug);
 
 
@@ -182 +187 @@
 const int expmult = 8388608; //2^23
 
+float Converter::getDenormConst()
+{
+  const int exp = 126;
+  float result = 1.0f;
+  for (int i = 0; i < exp; i++)
+    result /= 2.0f;
+  return result;
+}
+
 /*!
  * Converts a float value into a byte-array
@@ -189 +203 @@
 byte* Converter::floatToByteArray(float x)
 {
+  byte* result = new byte[4];
+  floatToByteArray(x, result, 4);
+  return result;
+  /*
   int mantisse = 0;
   int exponent = 128;
@@ -201 +219 @@
     sgn = 1;
 
-  float sub = 1;
-  while (sub < x)
-  {
-    sub *= 2;
+  if (x == 0)
+  {
+    exponent = 255;
+    mantisse = 0;
+  }
+  else
+  {
+    //if (x < getDenormConst())
+    //  printf("Denormalisiert!\n");
+    //printf("DenormConst = %e", getDenormConst());
+    
+    float sub = 1;
+    while (sub < x)
+    {
+      sub *= 2;
+      exponent++;
+    }
+
+    while (x > 0)
+    {
+      if (x >= sub)
+      {
+        mantisse += 1;
+        x -= sub;
+      }
+
+      mantisse *= 2;
+      exponent--;
+      sub /= 2;
+    }
     exponent++;
-  }
-
-  while (x > 0)
-  {
-    if (x >= sub)
-    {
-      mantisse += 1;
-      x -= sub;
-    }
-
-    mantisse *= 2;
-    exponent--;
-    sub /= 2;
-  }
-  exponent++;
-  mantisse /= 2;
-  while (mantisse < expmult)
-  {
-    mantisse *= 2;
-    exponent--;
-  }
-
-  //printf("mantisse = %i exponent = %i \n", mantisse, exponent);
-
-  mantisse -= expmult;
+    mantisse /= 2;
+    
+    printf("Conv:        mantisse = %i exponent = %i \n", mantisse, exponent);
+
+    
+    if (mantisse != 0)
+    {
+      while (mantisse < expmult)
+      {
+        mantisse *= 2;
+        exponent--;
+      }
+    
+      mantisse -= expmult;
+    }
+  }
+
+  printf("Conv: mantisse = %i exponent = %i \n", mantisse, exponent);
+
 
   int hx = mantisse + expmult * exponent;
@@ -238 +276 @@
 
   return result;
+  */
 }
 
@@ -248 +287 @@
 float Converter::byteArrayToFloat(byte* a)
 {
+  byte* h = new byte[4];
+  float result = 0.0f;
+  byteArrayToFloat(a, &result);
+  return result;
+  /*
+  int hexp = a[2] + a[3] * 256;
+  int exponent = (hexp / 128) % 256;
+  
   int hmant = a[0] + a[1] * 256 + a[2] * 65536;
   int mantisse = hmant % expmult;
+  if (mantisse == 0 && exponent == 255)
+    return 0;
+  
   mantisse += expmult;
-
-  int hexp = a[2] + a[3] * 256;
-  int exponent = (hexp / 128) % 256 - 128;
+  exponent -= 128;
+
 
   int sgn;
@@ -261 +310 @@
     sgn = 1;
 
-  //printf("mantisse = %i exponent = %i \n", mantisse, exponent);
+  printf("ReConv: mantisse = %i exponent = %i \n", mantisse, exponent);
 
   float emult = 1;
@@ -276 +325 @@
 
   return result;
-}
-
-/*!
- * Converts a float value into a byte-array
- * @param x: The float which is to convert
- * @return: A byte-array which accords the given float
- */
-byte* Converter::_floatToByteArray(float x)
-{
-  byte* p = (byte*)&x;
-  byte* result = new byte[4];
-  for (int i = 0; i < 4; i++)
-    result[i] = p[i];
-  return result;
-}
-
-
-/*!
- * Converts a byte-array into a float value
- * @param a: The byte-array which is to convert
- * @return: A float value which accords the given byte-array
- */
-float Converter::_byteArrayToFloat(byte* a)
-{
-  float* p = (float*)a;
-  float result = *p;
-  return result;
+  */
 }
 
@@ -319 +342 @@
 
   //handle 0 else function will loop for ever
-  if ( x == 0 )
+  /*if ( x == 0 )
   {
     for ( int i = 0; i<FLOATSIZE; i++)
       a[i] = 0;
     return FLOATSIZE;
-  }
+}*/
 
   int mantisse = 0;
@@ -338 +361 @@
     sgn = 1;
 
-  float sub = 1;
-  while (sub < x)
-  {
-    sub *= 2;
+  if (x == 0)
+  {
+    exponent = 255;
+    mantisse = 0;
+  }
+  else
+  {
+    //if (x < getDenormConst())
+    //  printf("Denormalisiert!\n");
+    //printf("DenormConst = %e", getDenormConst());
+    
+    float sub = 1;
+    while (sub < x)
+    {
+      sub *= 2;
+      exponent++;
+    }
+
+    while (x > 0)
+    {
+      if (x >= sub)
+      {
+        mantisse += 1;
+        x -= sub;
+      }
+
+      mantisse *= 2;
+      exponent--;
+      sub /= 2;
+    }
     exponent++;
-  }
-
-  while (x > 0)
-  {
-    if (x >= sub)
-    {
-      mantisse += 1;
-      x -= sub;
-    }
-
-    mantisse *= 2;
-    exponent--;
-    sub /= 2;
-  }
-  exponent++;
-  mantisse /= 2;
-  while (mantisse < expmult)
-  {
-    mantisse *= 2;
-    exponent--;
-  }
-
-  //printf("mantisse = %i exponent = %i \n", mantisse, exponent);
-
-  mantisse -= expmult;
-
+    mantisse /= 2;
+    
+
+///    printf("Conv:        mantisse = %i exponent = %i \n", mantisse, exponent);
+
+    
+    if (mantisse != 0)
+    {
+      while (mantisse < expmult)
+      {
+        mantisse *= 2;
+        exponent--;
+      }
+    
+      mantisse -= expmult;
+    }
+  }
+
+///  printf("Conv: mantisse = %i exponent = %i \n", mantisse, exponent);
+
+  
   int hx = mantisse + expmult * exponent;
   int result = intToByteArray(hx, a, length);
@@ -374 +418 @@
     a[3] += sgnadd;
 
+
+//  int hx = mantisse + expmult * exponent;
+//  byte* result = intToByteArray(hx);
+//  if (sgn == -1)
+//    result[3] += sgnadd;
+
   return result;
 }
@@ -385 +435 @@
 int Converter::byteArrayToFloat(const byte* a, float* x)
 {
-  //handle 0
-  for (int i = 0; i<FLOATSIZE; i++)
+    //handle 0
+  /*for (int i = 0; i<FLOATSIZE; i++)
   {
     if (a[i]!=0)
@@ -395 +445 @@
       return FLOATSIZE;
     }
-  }
-
-
+}*/
+
+  int hexp = a[2] + a[3] * 256;
+  int exponent = (hexp / 128) % 256;
+  
   int hmant = a[0] + a[1] * 256 + a[2] * 65536;
   int mantisse = hmant % expmult;
+  
+  //handle 0
+  if (mantisse == 0 && exponent == 255)
+    return 0;
+  
   mantisse += expmult;
-
-  int hexp = a[2] + a[3] * 256;
-  int exponent = (hexp / 128) % 256 - 128;
+  exponent -= 128;
+
 
   int sgn;
@@ -411 +467 @@
     sgn = 1;
 
-  //printf("mantisse = %i exponent = %i \n", mantisse, exponent);
+///  printf("ReConv: mantisse = %i exponent = %i \n", mantisse, exponent);
 
   float emult = 1;
@@ -421 +477 @@
       emult /= 2;
 
+  /*
+  float result = mantisse * emult;
+  if (sgn == -1)
+    result = -result;
+
+  return result;
+  */
+
   *x = mantisse * emult;
   if (sgn == -1)
@@ -426 +490 @@
 
   return FLOATSIZE;
+}
+
+/*!
+ * Converts a float value into a byte-array
+ * @param x: The float which is to convert
+ * @return: A byte-array which accords the given float
+ */
+byte* Converter::_floatToByteArray(float x)
+{
+  byte* p = (byte*)&x;
+  byte* result = new byte[4];
+  for (int i = 0; i < 4; i++)
+    result[i] = p[i];
+  return result;
+}
+
+
+/*!
+ * Converts a byte-array into a float value
+ * @param a: The byte-array which is to convert
+ * @return: A float value which accords the given byte-array
+ */
+float Converter::_byteArrayToFloat(byte* a)
+{
+  float* p = (float*)a;
+  float result = *p;
+  return result;
 }
 
@@ -504 +595 @@
 }
 
+
+
+
+void Converter::floatTest(float x)
+{
+  //float x = 8.0f;
+  //float x = numeric_limits<float>::infinity();
+  
+  printf("To Convert: %e\n", x);
+  
+  byte* res = floatToByteArray(x);
+  for (int i = 0; i < 4; i++)
+    printf("%i ", res[i]);
+  printf("\n");
+  
+  float y = byteArrayToFloat(res);
+  printf("ReConvert: %e\n", y);
+  
+  if (x == y)
+    printf("equal\n");
+  else
+    printf("different\n");
+}
+
+void Converter::debug()
+{
+  printf("We rulez\n");
+  
+  //Denormalized?
+  //floatTest(-9.87624e-38f);
+  //floatTest(-9.87624e-37f);
+  //floatTest(-9.87624e-36f);
+  //floatTest(-9.87624e-35f);
+  
+  /*
+  floatTest(14.7f);
+  floatTest(12.07e15f);
+  floatTest(0.0f);
+  floatTest(5.67e-15f);
+  */
+  
+  //floatTest(-18.0098f);
+  //floatTest(-24.07e23f);
+  //floatTest(-0.0f);
+  //floatTest(-5.67e-29f);
+  floatTest(-45.7e-32f);
+  floatTest(45.7e-33f);
+  floatTest(-45.7e-34f);
+  floatTest(45.7e-35f);
+}

branches/network/src/lib/network/converter.h

@@ -9 +9 @@
 /* include this file, it contains some default definitions */
 #include "netdefs.h"
+
 
 /* include base_object.h since all classes are derived from this one */
@@ -21 +22 @@
  * a class that can convert int to byte-array and vice versa
  */
-class Converter: public BaseObject
+class Converter : public BaseObject
 {
   public:
@@ -45 +46 @@
     static byte* _floatToByteArray(float x);
     static float _byteArrayToFloat(byte* a);
+    
+    
+    static void debug();
+    static void floatTest(float x);
+    static float getDenormConst();
+ 
+    
   private:
     Converter();
@@ -50 +58 @@
 };
 
+#undef byte
+
 #endif /*_CONVERTER*/

branches/network/src/subprojects/network/Makefile.am

@@ -27 +27 @@
                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
                   $(MAINSRCDIR)/lib/util/executor/executor.cc \
-                  $(MAINSRCDIR)/lib/util/multi_type.cc 
+                  $(MAINSRCDIR)/lib/util/multi_type.cc \
+                  \
+                  \
+                  $(MAINSRCDIR)/lib/coord/p_node.cc        \
+                  $(MAINSRCDIR)/world_entities/world_entity.cc
+                  
 
 

branches/network/src/subprojects/network/read_sync.cc

@@ -29 +29 @@
  */
 ReadSync::ReadSync(const char* name)
-  : Synchronizeable(name)
+  : Synchronizeable()
 {
   /* define the local buffer size */

branches/network/src/subprojects/network/simple_sync.cc

@@ -29 +29 @@
  */
 SimpleSync::SimpleSync(const char* name)
-  : Synchronizeable(name)
+  : Synchronizeable()
 {
   /* define the local buffer size */

branches/network/src/subprojects/network/write_sync.cc

@@ -29 +29 @@
  */
 WriteSync::WriteSync(const char* name)
-  : Synchronizeable(name)
+  : Synchronizeable()
 {
   /* define the local buffer size */