Changeset 2442

Timestamp:

09/30/09 16:28:40 (6 months ago)

Author:

wark

Message:

Added calculation of num desc for binary tree

Files:

• HydroWatch/Tim/matlab/testadapt2.m (modified) (3 diffs)

HydroWatch/Tim/matlab/testadapt2.m

@@ -107 +107 @@
     sys.Tdata = 1*24*3600;
     sys.TreportCurrent  = user.Treportmin;
-    
+
+    % Details around the actual nodes
+    % Need to put in details of node children here (assume binary tree
+    % currently)
+    sys.Nlevel = 2;
+    sys.nodehop = [1, 2];
+    
+
+    %%%%%%%%%%%%%%%%%%%
     % Now read in the specified range of historical data
     env.Edailyharvest = parseData(data);
@@ -180 +188 @@
     Eharvest = [];
 
-    % Number of nodes
-    Nnode = 1
+    % Sort fixed params for the nodes
+    for n=1:length(sys.nodehop)
+
+        % Get the number of descendants for this node
+        % (currently just assuming this is a binary tree)
+        sys.numDesc(n) = 2^(sys.Nlevel - sys.nodehop(n) + 1) - 2;
+
+        % Now calculate the forwarding and gamma(n) parameters which will
+        % feed into the optimization
+        % assume bin tree
+        sys.gamma(n) =  sys.numDesc(n); 
+
+    end
+
     
     % Now loop through the various intervals/days
@@ -201 +221 @@
         % Init just have the additional Elr + Ehr (minus gaurd times)
 
-        % TODO: Have an additional loop in here for the nodes
-        for n=1:Nnode 
-        
-            % Calculate the appropriate min and target
-            % energy for start of NEXT day interval
-            % as we set parameters for current interval to be 
-            % bound by this. 
-            sys.Emin(k+1) = sys.Emin(k) - Ec_min;   
-            sys.Etarget(k+1) = sys.Etarget(k) - (sys.Etarget(k) / (user.L - k + 1)); 
-
-            % Calculate the various system variables
-            % 1. Interval when to send back latest batch of high-res data
-            sys = BestDataSendInterval(user, sys, env);
-            % 2. Get Tsamp
-            sys = Eoptimize(user, sys, env);
-
-            % Update the number of buffered samples given the newly
-            % calculated sample rate for this interval (includes the
-            % samples for this interval)
-            sys = getNumBufferedSamples(sys, user, k);
-     
-            % Now calculate the consumed energy for the various parameters
-            % determined by the optmization for this interval
-            % (In the real deployment case iCount could be used here)
-            Ec = Econsump(user, sys);
-
-            % Now get the actual energy that will remain at start of next interval
-            sys.Ea(k+1) = sys.Ea(k) - Ec + Eharvest;
-
-        end   
+                  
+        % Calculate the appropriate min and target
+        % energy for start of NEXT day interval
+        % as we set parameters for current interval to be 
+        % bound by this. 
+        sys.Emin(k+1) = sys.Emin(k) - Ec_min;   
+        sys.Etarget(k+1) = sys.Etarget(k) - (sys.Etarget(k) / (user.L - k + 1)); 
+
+        % Calculate the various system variables
+        % 1. Interval when to send back latest batch of high-res data
+        sys = BestDataSendInterval(user, sys, env);
+        % 2. Get Tsamp
+        sys = Eoptimize(user, sys, env);
+
+        % Update the number of buffered samples given the newly
+        % calculated sample rate for this interval (includes the
+        % samples for this interval)
+        sys = getNumBufferedSamples(sys, user, k);
+ 
+        % Now calculate the consumed energy for the various parameters
+        % determined by the optmization for this interval
+        % (In the real deployment case iCount could be used here)
+        Ec = Econsump(user, sys);
+
+        % Now get the actual energy that will remain at start of next interval
+        sys.Ea(k+1) = sys.Ea(k) - Ec + Eharvest;
 
     end