Changeset 601 for trunk/src/series.m

Timestamp:

Apr 3, 2013, 1:39:53 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected

File:

• trunk/src/series.m (modified) (3 diffs)

trunk/src/series.m

@@ -1342 +1342 @@
 
 %% select the Action modes
-RunModeList=get(handles.RunMode,'String');
-RunMode=RunModeList{get(handles.RunMode,'Value')};
+RunMode='local';%default
+if isfield(Series.Action,'RunMode')
+RunMode=Series.Action.RunMode;
+end
 ActionExt='.m';%default
 if isfield(Series.Action,'ActionExt')
@@ -1456 +1458 @@
     for iprocess=1:NbProcess
         if isempty(Series.IndexRange.NbSlice)
-            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
+            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
             if Series.IndexRange.first_i>last_i
                 break
             end
-            Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength-1,last_i);
+            Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength*incr_i-1,last_i);
         else
             Series.IndexRange.first_i= first_i+iprocess-1;
@@ -1509 +1511 @@
     for iprocess=1:NbProcess
         if isempty(Series.IndexRange.NbSlice)% process by blocks of i index
-            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
+            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
             if Series.IndexRange.first_i>last_i
                 NbProcess=iprocess-1;
                 break% leave the loop, we are at the end of the calculation
             end
-            Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength-1);
+            Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength*incr_i-1);
         else% process by slices of i index if NbSlice is defined, computation in a single process if NbSlice =1
             Series.IndexRange.first_i= first_i+iprocess-1;