Changeset 6341 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Dec 30, 2005, 1:57:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

Location:

trunk/src/subprojects/network

Files:

• Makefile.am (modified) (1 diff)
• network_unit_test.cc (modified) (3 diffs)
• read_sync.cc (modified) (1 diff)
• read_sync.h (modified) (1 diff)
• simple_sync.cc (modified) (1 diff)
• simple_sync.h (modified) (1 diff)
• write_sync.cc (modified) (1 diff)
• write_sync.h (modified) (1 diff)

trunk/src/subprojects/network/Makefile.am

@@ -22 +22 @@
                   $(MAINSRCDIR)/lib/lang/class_list.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/util/loading/factory.cc \
                   $(MAINSRCDIR)/lib/util/substring.cc \
                   $(MAINSRCDIR)/util/loading/load_param_description.cc \

trunk/src/subprojects/network/network_unit_test.cc

@@ -284 +284 @@
 }
 
-
+void testFloatConverter(float f)
+{
+  char* s = Converter::floatToBinString(f);
+  printf("%f = ", f);
+  printf(s); printf("\n");
+  
+  byte* res = Converter::floatToByteArray(f);
+  printf("Byte Array: ");
+  for (int i = 0; i < 4; i++)
+    printf("%i  ", res[i]);
+  printf("\n");
+  
+  float b = Converter::byteArrayToFloat(res);
+  printf("ReConvert: %f \n", b);
+}
+
+void testFloatConverter2(float f)
+{
+  char* s = Converter::floatToBinString(f);
+  printf("### %f = ", f);
+  printf(s); printf("\n");
+  
+  byte* res = Converter::_floatToByteArray(f);
+  printf("Byte Array: ");
+  for (int i = 0; i < 4; i++)
+    printf("%i  ", res[i]);
+  printf("\n");
+  
+  float b = Converter::_byteArrayToFloat(res);
+  printf("ReConvert: %f \n", b);
+}
 int converter(int argc, char** argv)
 {
+  /*
   int x = 200564786;
   printf("To convert: %i\n", x);
@@ -305 +336 @@
   printf("\n");
   
+  */
+  /*
   float y;
   char* s;
@@ -328 +361 @@
   printf(s); printf("\n");
   
-  
+  y = -4.7824f;
+  s = Converter::floatToBinString(y);
+  printf("%f = ", y);
+  printf(s); printf("\n");
+  
+  y = -14.35e14f;
+  s = Converter::floatToBinString(y);
+  printf("%f = ", y);
+  printf(s); printf("\n");
+                                                            */
+  
+  
+  /*
+  float a = 12.3f;
+  
+  char* s = Converter::floatToBinString(a);
+  printf("%f = ", a);
+  printf(s); printf("\n");
+  
+  byte* res = Converter::floatToByteArray(a);
+  printf("Byte Array: \n");
+  for (int i = 0; i < 4; i++)
+    printf("%i  ", res[i]);
+  printf("\n");
+  
+  float b = Converter::byteArrayToFloat(res);
+  printf("ReConvert: %f \n", b);
+  */
+//  testFloatConverter(12.3e-53f); printf("\n");
+//  testFloatConverter(134.26455646546548741661675165f); printf("\n");
+ // testFloatConverter(35.67e14f); printf("\n");
+  
+  testFloatConverter(12.3e-7f); printf("\n");
+  testFloatConverter(134.26455646546548741661675165f); printf("\n");
+  testFloatConverter(35.67e14f); printf("\n");
   
   return 0;

trunk/src/subprojects/network/read_sync.cc

@@ -60 +60 @@
  *  write data to Synchronizeable
  */
-void ReadSync::writeBytes(const byte* data, int length)
+int ReadSync::writeBytes(const byte* data, int length, int sender)
 {
   PRINTF(0)("ReadSync: got %i bytes of data\n", length);

trunk/src/subprojects/network/read_sync.h

@@ -16 +16 @@
     ~ReadSync();
 
-    virtual void writeBytes(const byte* data, int length);
+    virtual int writeBytes(const byte* data, int length, int sender);
     virtual int readBytes(byte* data, int maxLength, int * reciever);
 

trunk/src/subprojects/network/simple_sync.cc

@@ -66 +66 @@
  *  write data to Synchronizeable
  */
-void SimpleSync::writeBytes(const byte* data, int length)
+int SimpleSync::writeBytes(const byte* data, int length, int sender)
 {
   PRINTF(0)("SimpleSync: got %i bytes of data\n", length);

trunk/src/subprojects/network/simple_sync.h

@@ -16 +16 @@
     ~SimpleSync();
 
-    virtual void writeBytes(const byte* data, int length);
+    virtual int writeBytes(const byte* data, int length, int sender);
     virtual int readBytes(byte* data, int maxLength, int * reciever);
 

trunk/src/subprojects/network/write_sync.cc

@@ -66 +66 @@
  *  write data to Synchronizeable
  */
-void WriteSync::writeBytes(const byte* data, int length)
+int WriteSync::writeBytes(const byte* data, int length, int sender)
 {
   PRINTF(0)("WriteSync: got %i bytes of data\n", length);

trunk/src/subprojects/network/write_sync.h

@@ -16 +16 @@
     ~WriteSync();
 
-    virtual void writeBytes(const byte* data, int length);
+    virtual int writeBytes(const byte* data, int length, int sender);
     virtual int readBytes(byte* data, int maxLength, int * reciever);