Fixed SMAIndicator (not reversing results anymore)

This commit is contained in:
7u83 2017-11-18 00:51:19 +01:00
parent 3e19afbe25
commit 6b4d5bbc9c

View File

@ -32,6 +32,7 @@ import gui.Globals;
* @author 7u83 <7u83@mail.ru> * @author 7u83 <7u83@mail.ru>
*/ */
public class SMAIndicator implements Indicator { public class SMAIndicator implements Indicator {
private OHLCData parent; private OHLCData parent;
OHLCData indicator; OHLCData indicator;
@ -41,43 +42,46 @@ public class SMAIndicator implements Indicator {
indicator = new OHLCData(); indicator = new OHLCData();
} }
int len=30; int len = 38;
float getAt(int pos) { float getAt(int pos) {
if (parent.size()==0) if (parent.size() == 0) {
return 0; return 0;
}
int start = pos - len; int start = pos - len;
if(start<0) if (start < 0) {
start = 0; start = 0;
}
float sum = 0; float sum = 0;
for (int i=start; i<pos; i++){ for (int i = start; i <= pos; i++) {
//sum += parent.get(i).getAverage(); //sum += parent.get(i).getAverage();
sum += parent.get(i).close; sum += parent.get(i).close;
} }
if (pos-start==0){ /*if (pos - start == 0) {
return 0; return 0;
} }*/
return sum/(start-pos); return sum / (pos - start + 1);
} }
void update() { void update() {
parent = Globals.se.getOHLCdata(60000 * 10); parent = Globals.se.getOHLCdata(60000 * 10);
if (parent.size()==0) if (parent.size() == 0) {
return; return;
}
/* if (parent.size()==indicator.size()){ if (parent.size() == indicator.size()) {
int i = parent.size() - 1; int i = parent.size() - 1;
OHLCDataItem p = parent.get(i); OHLCDataItem p = parent.get(i);
float pr = this.getAt(i); float pr = this.getAt(i);
OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0); OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0);
this.indicator.set(i, it);
return; return;
} }
*/
for (int i = indicator.size(); i < parent.size(); i++) { for (int i = indicator.size(); i < parent.size(); i++) {
OHLCDataItem p = parent.get(i); OHLCDataItem p = parent.get(i);
float pr = this.getAt(i); float pr = this.getAt(i);
@ -85,8 +89,6 @@ public class SMAIndicator implements Indicator {
this.indicator.add(it); this.indicator.add(it);
} }
} }
@ -94,9 +96,6 @@ public class SMAIndicator implements Indicator {
update(); update();
return indicator; return indicator;
} }
} }