Changeset 2416 for code/branches/presentation/src

Timestamp:

Dec 12, 2008, 10:43:48 AM (16 years ago)

Author:

scheusso

Message:

some improvement in diffing (after trimming the objectlist we sort the list after the datastream again)

Location:

code/branches/presentation/src/network

Files:

• TrafficControl.cc (modified) (6 diffs)
• TrafficControl.h (modified) (2 diffs)

code/branches/presentation/src/network/TrafficControl.cc

@@ -80 +80 @@
         */
         TrafficControl::~TrafficControl()
-        { 
-          //was macht das genau? da instance ja gleich this ist im moment
+        {
           instance_=0;
-          //muss ich alles deallozieren was ich im constructor aufgebaut habe?
         }
 
@@ -92 +90 @@
   void TrafficControl::setConfigValues()
   {
+    SetConfigValue ( bActive_, true );
     SetConfigValue ( targetSize, 5000 );
   }
@@ -108 +107 @@
   
   /**
-  * eigener sortieralgorithmus
+  * sort-algorithm for sorting the objectlist after priorities
   */
-  bool TrafficControl::priodiffer(uint32_t clientID, obj i, obj j)
+  bool TrafficControl::prioritySort(uint32_t clientID, obj i, obj j)
   {
     assert(clientListPerm_.find(clientID) != clientListPerm_.end());  //make sure the client exists in our list
@@ -118 +117 @@
     int prio1 = clientListPerm_[clientID][i.objID].objValuePerm + clientListPerm_[clientID][i.objID].objValueSched;
     int prio2 = clientListPerm_[clientID][j.objID].objValuePerm + clientListPerm_[clientID][j.objID].objValueSched;
-//     int prio1 = clientListPerm_[clientID][i.objID].objID;
-//     int prio2 = clientListPerm_[clientID][j.objID].objID;
-    // NOTE: smaller priority is better
     return prio1 < prio2;
   }
 
+  /**
+  * sort-algorithm for sorting the objectList after position in original data stream
+  */
+  bool TrafficControl::dataSort(obj i, obj j)
+  {
+    int pos1 = i.objDataOffset;
+    int pos2 = j.objDataOffset;
+    return pos1 < pos2;
+  }
+
+  
 
         void TrafficControl::processObjectList(unsigned int clientID, unsigned int gamestateID, std::list<obj> *list)
@@ -354 +361 @@
     //sort copied list aufgrund der objprioperm in clientlistperm
     // use boost bind here because we need to pass a memberfunction to stl sort
-    list->sort(boost::bind(&TrafficControl::priodiffer, this, clientID, _1, _2) );
+    list->sort(boost::bind(&TrafficControl::prioritySort, this, clientID, _1, _2) );
     
     //now we check, that the creator of an object always exists on a client
@@ -366 +373 @@
     //now the cutting, work the same obj out in processobjectlist and copiedlist, compression rate muss noch festgelegt werden. 
     cut(list, targetSize);
+    
+    //now sort again after objDataOffset
+    list->sort(boost::bind(&TrafficControl::dataSort, this, _1, _2) );
 //     printList(list, clientID);
     //diese Funktion updateClientList muss noch gemacht werden

code/branches/presentation/src/network/TrafficControl.h

@@ -123 +123 @@
     unsigned int currentClientID;
     unsigned int targetSize;
+    bool         bActive_;
     /**
     *copiedVector is a copy of the given Vector by the GSmanager, on this list all manipulations are performed
@@ -169 +170 @@
     void deleteObject(unsigned int objectID);                           // this function gets called when an object has been deleted (in order to clean up lists and maps)
     
-    bool priodiffer(uint32_t clientID, obj i, obj j);
+    bool prioritySort(uint32_t clientID, obj i, obj j);
+    bool dataSort(obj i, obj j);
     void printList(std::list<obj> *list, unsigned int clientID);
     void fixCreatorDependencies(std::list<obj>::iterator it, std::list<obj> *list, unsigned int clientID);