Merge remote-tracking branch 'origin/master'

bcomp/lib/rt/src/rt_plc_bcomp.c

@@ -1066,3 +1066,356 @@ void CompCurvePolValueFo_exec(
   co->ActVal = o->ActVal;
   co->In = *o->InP;
 }
+
+/* MPC Model predictive contoller */
+typedef struct {
+  float acc;
+  float value;
+  float output;
+} t_vacc;
+
+/* Interpolation for Curve relations. */
+static float mpc_interpolate(float *curve, unsigned int c_len, float val)
+{
+  unsigned int i;
+  float ret;
+
+  if (val < curve[0]) {
+    ret = curve[1] - (curve[0] - val) * (curve[3]- curve[1]) / (curve[2] - curve[0]);
+    return ret;
+  }
+
+  for (i = 1; i  < c_len * 2; i++) {
+    if (val < curve[i*2]) {
+      ret = curve[i*2+1] + (val - curve[i*2]) * (curve[i*2+1] - curve[(i-1)*2+1]) / (curve[i*2] - curve[(i-1)*2]);
+      return ret;
+    }
+  }
+  
+  ret = curve[(c_len-1)*2+1] + (val - curve[(c_len-1)*2]) * (curve[(c_len-1)*2+1] - curve[(c_len-2)*2+1]) / (curve[(c_len-1)*2] - curve[(c_len-2)*2]);
+  return ret;
+}
+
+
+/* Calculation of linear regression model */
+static float mpc_model(pwr_sClass_CompMPC_Fo *o, pwr_sClass_CompMPC *co, 
+		       float out, float av0, float timestep)
+{
+  float av;
+  switch (co->Algorithm) {
+  case pwr_eMpcAlgorithm_None:
+    av = 0;
+    break;
+  case pwr_eMpcAlgorithm_FixTimeStep:
+  case pwr_eMpcAlgorithm_FixTimeStepModelCorr:
+  case pwr_eMpcAlgorithm_ProgressiveTimeStep:
+  case pwr_eMpcAlgorithm_ProgressiveTimeStepMC:
+  case pwr_eMpcAlgorithm_FirstScanTimeStep:
+  case pwr_eMpcAlgorithm_FirstScanTimeStepMC: {
+    int i, j;
+    pwr_tFloat32 val;
+    for (i = 0; i < co->NoOfAttr; i++) {
+      if (i == 0) {
+	if (co->BaseAttrRelation[0] == pwr_eMpcAttrRelation_Integral)
+	  av = av0;
+	else
+	  av = 0;
+	val = out;
+      }
+      else
+	val = **(pwr_tFloat32 **)((char *)&o->Attr2P + pwr_cInputOffset * (i - 1));
+      switch (co->BaseAttrRelation[i]) {
+      case pwr_eMpcAttrRelation_Integral: {
+	switch (co->TightAttrRelation[i]) {
+	case pwr_eMpcAttrRelation_Curve: {
+	  if ( i > 9)
+	    break;
+	  pwr_sClass_table *t = *(pwr_sClass_table **)
+	    ((char *)&o->Curve1P + pwr_cInputOffset * i);
+	  val = mpc_interpolate(&t->TabVect[1], t->TabVect[0], val);
+	  break;
+	}
+	}
+	for (j = i + 1; j < co->NoOfAttr; j++) {
+	  if (co->BaseAttrRelation[j] == pwr_eMpcAttrRelation_No) {
+	    pwr_tFloat32 tval = **(pwr_tFloat32 **)((char *)&o->Attr2P + pwr_cInputOffset * (j - 1));
+	    switch (co->TightAttrRelation[j]) {
+	    case pwr_eMpcAttrRelation_Sub:
+	      val -= co->AttrCoeff[j] * tval;
+	      break;
+	    case pwr_eMpcAttrRelation_Add:
+	      val += co->AttrCoeff[j] * tval;
+	      break;
+	    case pwr_eMpcAttrRelation_Multiply:
+	      val *= co->AttrCoeff[j] * tval;
+	      break;
+	    case pwr_eMpcAttrRelation_Divide:
+	      val /= co->AttrCoeff[j] * tval;
+	      break;
+	    }
+	  }
+	  else {
+	    j--;
+	    break;
+	  }
+	}
+	av += val * co->AttrCoeff[i] * timestep;
+	i = j;
+	break;
+      }
+      case pwr_eMpcAttrRelation_Linear:
+	av += val * co->AttrCoeff[i];
+	break;
+      case pwr_eMpcAttrRelation_Curve: {
+	if ( i > 9)
+	  break;
+	pwr_sClass_table *t = *(pwr_sClass_table **)
+	    ((char *)&o->Curve1P + pwr_cInputOffset * i);
+	float p = mpc_interpolate(&t->TabVect[1], t->TabVect[0], val);
+	av += p * co->AttrCoeff[i];
+	//printf("Curve %6.3f %6.2f\n", p, val);
+	break;
+      }
+      case pwr_eMpcAttrRelation_Multiply:
+	av = av * val * co->AttrCoeff[i];
+	break;
+      }
+    }
+
+    av += co->Coeff0;
+    break;
+  }
+  }
+  return av;
+} 
+
+/* Executes one predictive time scan */
+static void mpc_tscan(plc_sThread* tp, pwr_sClass_CompMPC_Fo* o, 
+		      pwr_sClass_CompMPC* co, int tix, int *vix, 
+		      int iter, float *iter_vout)
+{
+  if (tix == co->TSize)
+    return;
+
+  t_vacc **vacc = (t_vacc **)co->Vacc;
+  int i;
+  float t;
+  float out;
+  float av;
+  float av0; // Previous procvalue
+  float omin, omax, omiddle;
+  float timestep;
+
+  switch (co->Algorithm) {
+  case pwr_eMpcAlgorithm_ProgressiveTimeStep:
+  case pwr_eMpcAlgorithm_ProgressiveTimeStepMC:
+    t = 0;
+    timestep = co->TStep;
+    for (i = 1; i < tix; i++) {
+      t += timestep;
+      timestep *= co->TStepFactor;
+    }
+    break;
+  case pwr_eMpcAlgorithm_FirstScanTimeStep:
+  case pwr_eMpcAlgorithm_FirstScanTimeStepMC:
+    if (tix == 0) {
+      t = 0;
+      timestep = co->TStepFirst;
+    }
+    else {
+      t = co->TStepFirst + co->TStep * (tix - 1);
+      timestep = co->TStep;
+    }
+    break;
+  default:
+    t = (float)(co->TStep * tix);
+    timestep = co->TStep;
+  }
+
+  for (i = 0; i < co->SSize; i++) {
+    if (iter == 0) {
+      if (tix == 0)
+	omiddle = o->OutValue;
+      else
+	omiddle = vacc[tix-1][vix[tix-1]-1].output;
+      omax = MIN(omiddle + co->OutRamp * timestep, co->OutMax);
+      omin = MAX(omiddle - co->OutRamp * timestep, co->OutMin);
+    }
+    else {
+      if (tix == 0)
+	omiddle = iter_vout[tix];
+      else
+	omiddle = vacc[tix-1][vix[tix-1]-1].output + iter_vout[tix] - iter_vout[tix-1];
+      omax = MIN(omiddle + co->OutRamp * timestep/(iter*2), co->OutMax);
+      omin = MAX(omiddle - co->OutRamp * timestep/(iter*2), co->OutMin);
+    }
+    out = omin + (omax - omin)/(co->SSize - 1) * i;
+    if (tix == 0)
+      av0 = *o->ProcValueP;
+    else
+      av0 = vacc[tix-1][vix[tix]/co->SSize].value;
+
+    av = mpc_model(o, co, out, av0, timestep); 
+    vacc[tix][vix[tix]].output = out;
+    vacc[tix][vix[tix]].value = av;
+    if (tix > 0)
+      vacc[tix][vix[tix]].acc = vacc[tix-1][vix[tix-1]-1].acc;
+
+    switch (co->Algorithm) {
+    case pwr_eMpcAlgorithm_FixTimeStepModelCorr:
+    case pwr_eMpcAlgorithm_ProgressiveTimeStepMC:
+    case pwr_eMpcAlgorithm_FirstScanTimeStepMC:
+      vacc[tix][vix[tix]].acc += fabs(av - (co->SetValue + co->ModelCorr));
+      break;
+    default:
+      vacc[tix][vix[tix]].acc += fabs(av - co->SetValue);
+    }
+    // printf("acc[%2d][%2d] %7.2f     sp %7.2f out %7.2f\n", tix, vix[tix], vacc[tix][vix[tix]].acc, co->SetValue, out);      
+    vix[tix]++;  
+
+    mpc_tscan(tp, o, co, tix+1, vix, iter, iter_vout);
+  }
+}
+
+
+/*_*
+  CompMPC_Fo
+
+  @aref compmpc_fo CompMPC_Fo
+*/
+void CompMPC_Fo_init(pwr_sClass_CompMPC_Fo* o)
+{
+  t_vacc **vacc;
+  int size;
+  int i;
+  pwr_sClass_CompMPC *co;
+  pwr_tDlid dlid;
+  pwr_tStatus sts;
+
+  sts = gdh_DLRefObjectInfoAttrref(
+      &o->PlcConnect, (void**)&o->PlcConnectP, &dlid);
+  if (EVEN(sts))
+    o->PlcConnectP = 0;
+
+  co = (pwr_sClass_CompMPC *)o->PlcConnectP;
+  if (!co)
+    return;
+
+  co->NoOfPaths = 0;
+  co->Vacc = malloc(co->TSize * sizeof(float*));
+  vacc = (t_vacc **)co->Vacc;
+  for (i = 0; i < co->TSize; i++) {
+    size = pow(co->SSize, i+1);
+    vacc[i] = (t_vacc *)malloc(size * sizeof(t_vacc));
+    memset(vacc[i], 0,  size * sizeof(t_vacc));
+    co->NoOfPaths += size;
+  }
+}
+
+void CompMPC_Fo_exec(plc_sThread* tp, pwr_sClass_CompMPC_Fo* o)
+{
+  t_vacc **vacc;
+  int i, j;
+  int min_acc;
+  int *vix;
+  float *vout;
+  int idx;
+  int size;
+  pwr_sClass_CompMPC *co = (pwr_sClass_CompMPC *)o->PlcConnectP;
+
+  if (!co)
+    return;
+
+  co->ProcValue = o->ProcValue = *o->ProcValueP;
+  co->SetValue = o->SetValue = *o->SetValueP;
+  co->ForceValue = o->ForceValue = *o->ForceValueP;
+  co->Force = o->Force = *o->ForceP;
+
+  if (*o->ForceP) {
+    o->OutValue = *o->ForceValueP;
+    return;
+  }
+
+  /* SetValue correction */
+  switch (co->Algorithm) {
+  case pwr_eMpcAlgorithm_FixTimeStepModelCorr:
+  case pwr_eMpcAlgorithm_ProgressiveTimeStepMC:
+  case pwr_eMpcAlgorithm_FirstScanTimeStepMC:
+    if ( fabs(*o->SetValueP - *o->ProcValueP) < co->ModelCorrInterval)
+      co->ModelCorr += (*o->SetValueP - *o->ProcValueP) * (*o->ScanTime) / co->ModelCorrIntTime;
+    else
+      co->ModelCorr = 0;
+    break;
+  default:
+    co->ModelCorr = 0;
+  }
+
+  vacc = (t_vacc **)co->Vacc;
+  vix = (int *)calloc(1, co->TSize * sizeof(unsigned int));
+  mpc_tscan(tp, o, co, 0, vix, 0, 0);
+
+  min_acc = 0;
+  for (i = 0; i < pow(co->SSize, co->TSize); i++) {
+    if (vacc[co->TSize-1][i].acc < vacc[co->TSize-1][min_acc].acc)
+      min_acc = i;	
+    //printf( "%d acc %7.2f\n", i, vacc[co->TSize-1][i].acc);
+  }
+  // printf("min_acc %d\n", min_acc);
+
+  idx = min_acc;
+  for (i = co->TSize - 1; i >= 0; i--) {
+#if 0
+    printf("vacc[%d][%d] %7.2f %7.2f %7.2f\n", i, idx, vacc[i][idx].acc,
+	   vacc[i][idx].value, vacc[i][idx].output);
+#endif
+    idx = idx / co->SSize;
+  }
+
+  vout = (float *)malloc(co->TSize * sizeof(float));
+  for ( j = 0; j < 3; j++) {
+    idx = min_acc;
+    for (i = co->TSize - 1; i >= 0; i--) {
+      vout[i] = vacc[i][idx].output;
+      idx = idx / co->SSize;
+    }
+
+    for (i = 0; i < co->TSize; i++) {
+      size = pow(co->SSize, i+1);
+      memset(vacc[i], 0,  size * sizeof(t_vacc));
+    }
+    memset(vix, 0, co->TSize * sizeof(unsigned int));
+    mpc_tscan(tp, o, co, 0, vix, j+1, vout);
+
+    min_acc = 0;
+    for (i = 0; i < pow(co->SSize,co->TSize); i++) {
+      if (vacc[co->TSize-1][i].acc < vacc[co->TSize-1][min_acc].acc)
+	min_acc = i;	
+      // printf( "%d acc %7.2f\n", i, vacc[co->TSize-1][i].acc);
+    }
+
+    idx = min_acc;
+    for (i = co->TSize - 1; i >= 0; i--) {
+#if 0
+      printf("vacc[%d][%d] %7.2f %7.2f %7.2f\n", i, idx, vacc[i][idx].acc,
+	     vacc[i][idx].value, vacc[i][idx].output);
+#endif
+      if (i == 0)
+	break;
+      idx = idx / co->SSize;
+    }
+  }
+  free(vix);
+  free(vout);
+
+  co->CurrentPath = min_acc;
+  co->Error = *o->SetValueP - *o->ProcValueP;
+  switch (co->Algorithm) {
+  case pwr_eMpcAlgorithm_FirstScanTimeStep:
+    o->OutValue = vacc[0][idx].output;
+    break;
+  default:
+    o->OutValue += (vacc[0][idx].output - o->OutValue) * tp->f_scan_time / co->TStep * co->Gain;
+
+  }
+  co->OutValue = o->OutValue;
+}

bcomp/lib/rt/src/rt_plc_bcomp.h

@@ -62,5 +62,7 @@ void CompCurveTabValueFo_exec(
 void CompCurvePolValueFo_init(pwr_sClass_CompCurvePolValueFo* o);
 void CompCurvePolValueFo_exec(
     plc_sThread* tp, pwr_sClass_CompCurvePolValueFo* o);
+void CompMPC_Fo_init(pwr_sClass_CompMPC_Fo* o);
+void CompMPC_Fo_exec(plc_sThread* tp, pwr_sClass_CompMPC_Fo* o);
 
 #endif

bcomp/wbl/bcomp/src/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+
+exe :  $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html \
+       $(doc_dir)/en_us/orm/pwr_basecomponentclasses_h.html \
+       $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_hpp.html \
+       $(doc_dir)/en_us/orm/pwr_basecomponentclasses_hpp.html
+
+$(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
+	@ echo "Generating html files for struct sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
+	@ echo "Generating html files for struct en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
+
+$(doc_dir)/sv_se/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
+	@ echo "Generating html files for struct sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
+	@ echo "Generating html files for struct en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"

java/jsw/co/src/cli.ts

@@ -264,20 +264,10 @@ class Cli {
         if (this.cliTable[this.cliTableIndex].qualifier[i] === null) {
           break;
         }
-        if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg1")) {
-          this.configuredVerbs++;
-        }
-        if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg2")) {
-          this.configuredVerbs++;
-        }
-        if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg3")) {
-          this.configuredVerbs++;
-        }
-        if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg4")) {
-          this.configuredVerbs++;
-        }
-        if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg5")) {
-          this.configuredVerbs++;
+        for (let i = 1; i <= 5; i++) {
+          if (this.cliTable[this.cliTableIndex].qualifier[i] === ("cli_arg" + String(i))) {
+            this.configuredVerbs++;
+          }
         }
       }
 
@@ -318,17 +308,10 @@ class Cli {
    * @return Returns true if the qualifier is present.
    */
   qualifierFound(qual) {
-    if (qual === ("cli_arg1")) {
-      return !(this.verb.length < 2 || this.configuredVerbs < 1);
-    }
-    if (qual === ("cli_arg2")) {
-      return !(this.verb.length < 3 || this.configuredVerbs < 2);
-    }
-    if (qual === ("cli_arg3")) {
-      return !(this.verb.length < 4 || this.configuredVerbs < 3);
-    }
-    if (qual === ("cli_arg4")) {
-      return !(this.verb.length < 5 || this.configuredVerbs < 4);
+    for (let i = 1; i < 6; i++) {
+      if (qual == ("cli_arg" + String(i))) {
+        return !(this.verb.length < (i+1) || this.configuredVerbs < i);
+      }
     }
     for (let i = 0; i < this.qualifier.length; i++) {
       if (qual === (this.qualifier[i])) {
@@ -344,28 +327,13 @@ class Cli {
    * @return Returns the value of the qualifier.
    */
   getQualValue(qual) {
-    if (qual === ("cli_arg1")) {
-      if (this.verb.length < 2 || this.configuredVerbs < 1) {
-        return "";
-      }
-      return this.verb[1];
-    }
-    if (qual === ("cli_arg2")) {
-      if (this.verb.length < 3 || this.configuredVerbs < 2) {
-        return "";
-      }
-      return this.verb[2];
-    }
-    if (qual === ("cli_arg3")) {
-      if (this.verb.length < 4 || this.configuredVerbs < 3) {
-        return this.verb[3];
-      }
-    }
-    if (qual === ("cli_arg4")) {
-      if (this.verb.length < 5 || this.configuredVerbs < 4) {
-        return "";
+    for (let i = 1; i < 6; i++) {
+      if (qual == ("cli_arg" + String(i))) {
+        if (this.verb.length < (i+1) || this.configuredVerbs < i) {
+          return ""
+        }
+        return this.verb[i];
       }
-      return this.verb[4];
     }
     for (let i = 0; i < this.qualifier.length; i++) {
       if (qual === (this.qualifier[i])) {

java/jsw/co/src/pwr.ts

@@ -208,18 +208,46 @@ class Point {
 }
 
 class Rect {
-  x = 0;
-  y = 0;
-  width = 0;
-  height = 0;
+  ll_x = 0;
+  ll_y = 0;
+  ur_x = 0;
+  ur_y = 0;
 
   constructor() {
   }
 
-  constructor(x: number, y: number, width: number, height: number) {
-    this.x = x;
-    this.y = y;
-    this.width = width;
-    this.height = height;
+  constructor(x: number, y: number, x2: number, y2: number) {
+    this.ll_x = x;
+    this.ll_y = y;
+    this.ur_x = x2;
+    this.ur_y = y2;
+  }
+
+  set(r: Rect) {
+    this.ll_x = r.ll_x;
+    this.ll_y = r.ll_y;
+    this.ur_x = r.ur_x;
+    this.ur_y = r.ur_y;
+  }
+
+  width() {
+    return this.ur_x - this.ll_x;
+  }
+
+  height() {
+    return this.ur_y - this.ll_y;
+  }
+
+  hit(p: Point) {
+    return (p.x >= this.ll_x && p.x <= this.ur_x && p.y >= this.ll_y && p.y <= this.ur_y);
+  }
+
+  static union(r1: Rect, r2: Rect) {
+    return new Rect(
+        Math.min(r1.ll_x, r2.ll_x),
+        Math.min(r1.ll_y, r2.ll_y),
+        Math.max(r1.ur_x, r2.ur_x),
+        Math.max(r1.ur_y, r2.ur_y),
+    );
   }
 }
\ No newline at end of file

java/jsw/ev/src/ev.html

@@ -46,10 +46,11 @@
   </div>
   <canvas id="flowcanvas" width="1200" height="800"></canvas>
   <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
-  <script type="text/babel" src="pwr.js"></script>
-  <script type="text/babel" src="cli.js"></script>
-  <script type="text/babel" src="gdh.js"></script>
-  <script type="text/babel" src="plow.js"></script>
+  <script type="text/babel" src="pwr.ts"></script>
+  <script type="text/babel" src="cli.ts"></script>
+  <script type="text/babel" src="gdh.ts"></script>
+  <script type="text/babel" src="draw.ts"></script>
+  <script type="text/babel" src="plow.ts"></script>
   <script type="text/babel" src="ev.ts"></script>
   <hr>
   <address><a href="mailto:claes@debian86.ssab.com"></a></address>

java/jsw/flow/src/flow.html

@@ -22,8 +22,9 @@
   </div>
   <canvas id="flowcanvas" width="1200" height="800"></canvas>
   <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
-  <script type="text/babel" src="pwr.js"></script>
-  <script type="text/babel" src="gdh.js"></script>
+  <script type="text/babel" src="pwr.ts"></script>
+  <script type="text/babel" src="gdh.ts"></script>
+  <script type="text/babel" src="draw.ts"></script>
   <script type="text/babel" src="flow.ts"></script>
   <hr>
   <address><a href="mailto:claes@debian86.ssab.com"></a></address>

java/jsw/ge/src/ge.html

@@ -8,54 +8,62 @@
 <body>
   <canvas id="flowcanvas" width="1200" height="800"></canvas>
   <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
-  <script type="text/babel" src="pwr.js"></script>
-  <script type="text/babel" src="cli.js"></script>
-  <script type="text/babel" src="gdh.js"></script>
+  <script type="text/babel" src="pwr.ts"></script>
+  <script type="text/babel" src="cli.ts"></script>
+  <script type="text/babel" src="gdh.ts"></script>
+  <script type="text/babel" src="draw.ts"></script>
 
   <script type="text/babel" src="glow.ts"></script>
-  <script type="text/babel" src="glow_point.ts"></script>
   <script type="text/babel" src="glow_color.ts"></script>
-  <script type="text/babel" src="glow_array.ts"></script>
+  <script type="text/babel" src="glow_point.ts"></script>
   <script type="text/babel" src="glow_transform.ts"></script>
-  <script type="text/babel" src="glow_nodeclass.ts"></script>
-  <script type="text/babel" src="glow_nodegroup.ts"></script>
-  <script type="text/babel" src="glow_conclass.ts"></script>
+
+  <script type="text/babel" src="glow_annot.ts"></script>
+  <script type="text/babel" src="glow_arc.ts"></script>
+  <script type="text/babel" src="glow_array.ts"></script>
+  <script type="text/babel" src="glow_arrow.ts"></script>
+  <script type="text/babel" src="glow_cformat.ts"></script>
   <script type="text/babel" src="glow_con.ts"></script>
+  <script type="text/babel" src="glow_conclass.ts"></script>
+  <script type="text/babel" src="glow_conpoint.ts"></script>
   <script type="text/babel" src="glow_line.ts"></script>
-  <script type="text/babel" src="glow_arc.ts"></script>
+  <script type="text/babel" src="glow_node.ts"></script>
+  <script type="text/babel" src="glow_nodeclass.ts"></script>
+  <script type="text/babel" src="glow_nodegroup.ts"></script>
+  <script type="text/babel" src="glow_polyline.ts"></script>
   <script type="text/babel" src="glow_rect.ts"></script>
   <script type="text/babel" src="glow_text.ts"></script>
-  <script type="text/babel" src="glow_conpoint.ts"></script>
-  <script type="text/babel" src="glow_draw.ts"></script>
-  <script type="text/babel" src="glow_cformat.ts"></script>
 
   <script type="text/babel" src="grow_node.ts"></script>
-  <script type="text/babel" src="grow_group.ts"></script>
-  <script type="text/babel" src="grow_slider.ts"></script>
-  <script type="text/babel" src="grow_toolbar.ts"></script>
   <script type="text/babel" src="grow_rect.ts"></script>
-  <script type="text/babel" src="grow_rectrounded.ts"></script>
-  <script type="text/babel" src="grow_line.ts"></script>
-  <script type="text/babel" src="grow_arc.ts"></script>
-  <script type="text/babel" src="grow_text.ts"></script>
+
   <script type="text/babel" src="grow_annot.ts"></script>
-  <script type="text/babel" src="grow_polyline.ts"></script>
-  <script type="text/babel" src="grow_conpoint.ts"></script>
-  <script type="text/babel" src="grow_image.ts"></script>
-  <script type="text/babel" src="grow_conglue.ts"></script>
+  <script type="text/babel" src="grow_arc.ts"></script>
+  <script type="text/babel" src="grow_axis.ts"></script>
+  <script type="text/babel" src="grow_axisarc.ts"></script>
   <script type="text/babel" src="grow_bar.ts"></script>
   <script type="text/babel" src="grow_bararc.ts"></script>
-  <script type="text/babel" src="grow_trend.ts"></script>
-  <script type="text/babel" src="grow_xycurve.ts"></script>
+  <script type="text/babel" src="grow_barchart.ts"></script>
+  <script type="text/babel" src="grow_conglue.ts"></script>
+  <script type="text/babel" src="grow_conpoint.ts"></script>
+  <script type="text/babel" src="grow_group.ts"></script>
+  <script type="text/babel" src="grow_image.ts"></script>
+  <script type="text/babel" src="grow_line.ts"></script>
   <script type="text/babel" src="grow_menu.ts"></script>
+  <script type="text/babel" src="grow_pie.ts"></script>
+  <script type="text/babel" src="grow_polyline.ts"></script>
+  <script type="text/babel" src="grow_rectrounded.ts"></script>
   <script type="text/babel" src="grow_scrollbar.ts"></script>
+  <script type="text/babel" src="grow_slider.ts"></script>
+  <script type="text/babel" src="grow_table.ts"></script>
+  <script type="text/babel" src="grow_text.ts"></script>
+  <script type="text/babel" src="grow_toolbar.ts"></script>
+  <script type="text/babel" src="grow_trend.ts"></script>
   <script type="text/babel" src="grow_window.ts"></script>
+  <script type="text/babel" src="grow_xycurve.ts"></script>
+
   <script type="text/babel" src="grow_folder.ts"></script>
-  <script type="text/babel" src="grow_axis.ts"></script>
-  <script type="text/babel" src="grow_axisarc.ts"></script>
-  <script type="text/babel" src="grow_pie.ts"></script>
-  <script type="text/babel" src="grow_barchart.ts"></script>
-  <script type="text/babel" src="grow_table.ts"></script>
+
   <script type="text/babel" src="grow_ctx.ts"></script>
   <script type="text/babel" src="grow_frame.ts"></script>
 

java/jsw/glow/src/glow_array.ts

@@ -11,13 +11,11 @@ class GlowArray {
   }
 
   remove(elem) {
-    for (let i = 0; i < this.a.length; i++) {
-      if (this.a[i] === elem) {
-        this.a.splice(i, 1);
-        return 1;
-      }
+    let idx = this.a.indexOf(elem);
+    if (idx != -1) {
+      this.a.splice(idx, 1);
     }
-    return 0;
+    return (idx != -1);
   }
 
   size() {
@@ -35,10 +33,6 @@ class GlowArray {
       let key = parseInt(tokens[0], 10);
       let o;
 
-      if (this.ctx.debug) {
-        console.log("GlowArray : " + lines[i]);
-      }
-
       switch (key) {
         case GlowSave.Array:
           break;
@@ -233,10 +227,23 @@ class GlowArray {
           break;
       }
     }
+
     return i;
   }
 
   clear() {
     this.a.length = 0;
   }
+
+  forEach(callback) {
+    this.a.forEach(callback);
+  }
+
+  slice(start, end) {
+    return this.a.slice(start, end);
+  }
+
+  find(callback) {
+    return this.a.find(callback);
+  }
 }
\ No newline at end of file