Merge branch 'development'

Author: Anders Reenberg Andersen

RelSys/HeuristicQueue.cpp

@@ -390,10 +390,6 @@ double HeuristicQueue::rejectionProbability(){
     return(margDist[margDist.size()-1]);
 }
 
-double HeuristicQueue::expectedOccupancyFraction(){
-    return(expectedOccupancy()/cap);
-}
-
 void HeuristicQueue::printStateSpace(){
    initializeState();
     for (int i=0; i<Ns; i++){

RelSys/HeuristicQueue.h

@@ -64,7 +64,6 @@ class HeuristicQueue {
 
     void marginalDist(vector<double> &pi); //returns the marginal distribution
     double expectedOccupancy(); //returns the expected occupancy of capacity
-    double expectedOccupancyFraction(); //returns the expected fraction of capacity utilized
     double rejectionProbability(); //returns the rejection probability using the marginal occupancy distribution
 
     //constructor and destructor

RelSys/RelocEvaluation.cpp

@@ -226,7 +226,7 @@ void RelocEvaluation::evalSingleWard(int widx){
         for (int k=0; k<marginalDist.size(); k++){
             expectedOccupancy += marginalDist[k]*k;
         }
-        expOccFraction = servers/expectedOccupancy;
+        expOccFraction = expectedOccupancy/(double)servers;
         blockingProbability = marginalDist[marginalDist.size()-1];
     }
 }
@@ -316,7 +316,7 @@ void RelocEvaluation::runHeuristic(int main_widx){
 
         }
         expectedOccupancy = hqueue.expectedOccupancy();
-        expOccFraction = hqueue.expectedOccupancyFraction();
+        expOccFraction = expectedOccupancy/(double)capacity;
         blockingProbability = marginalDist[marginalDist.size()-1];
 
         auto stop = high_resolution_clock::now(); //stop time 

RelSys/nbproject/private/private.xml

@@ -9,22 +9,19 @@
             <url>RelocSimulation.h</url>
             <bookmark id="4">
                 <name/>
-                <line>120</line>
+                <line>117</line>
                 <key/>
             </bookmark>
             <bookmark id="1">
                 <name/>
-                <line>137</line>
+                <line>135</line>
                 <key/>
             </bookmark>
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/anders/Dropbox/Til%20mig%20selv/Forskning/Projekter/Multimorbidity/Projekter/Sengefordeling/Beregninger/Git/RelSys/RelSys/main.cpp</file>
-            <file>file:/home/anders/Dropbox/Til%20mig%20selv/Forskning/Projekter/Multimorbidity/Projekter/Sengefordeling/Beregninger/Git/RelSys/RelSys/RelocSimulation.h</file>
-            <file>file:/home/anders/Dropbox/Til%20mig%20selv/Forskning/Projekter/Multimorbidity/Projekter/Sengefordeling/Beregninger/Git/RelSys/RelSys/RelocSimulation.cpp</file>
-            <file>file:/home/anders/Dropbox/Til%20mig%20selv/Forskning/Projekter/Multimorbidity/Projekter/Sengefordeling/Beregninger/Git/RelSys/RelSys/RelocEvaluation.cpp</file>
+            <file>file:/C:/Users/arean/Dropbox/Til%20mig%20selv/Forskning/Projekter/Multimorbidity/Projekter/Sengefordeling/Beregninger/Git/RelSys/RelSys/main.cpp</file>
         </group>
     </open-files>
 </project-private>