Fixed SMAIndicator (not reversing results anymore)
This commit is contained in:
parent
3e19afbe25
commit
6b4d5bbc9c
@ -31,72 +31,71 @@ 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;
|
||||||
|
|
||||||
public SMAIndicator(OHLCData parent){
|
public SMAIndicator(OHLCData parent) {
|
||||||
this.parent=parent;
|
this.parent = parent;
|
||||||
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);
|
||||||
OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0);
|
OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0);
|
||||||
|
|
||||||
this.indicator.add(it);
|
this.indicator.add(it);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public OHLCData getData(){
|
public OHLCData getData() {
|
||||||
update();
|
update();
|
||||||
return indicator;
|
return indicator;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user