Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

Untitled diff

Créé il y a 8 ansLe diff n'expire jamais

0 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

122 lignes

8 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

130 lignes

var util = require('../../core/util');

var _ = require('lodash');

var fs = require('fs');

var toml = require('toml');

var config = util.getConfig();

var dirs = util.dirs();

var log = require(dirs.core + 'log');

var CandleBatcher = require(dirs.core + 'candleBatcher');

var moment = require('moment');

var isLeecher = config.market && config.market.type === 'leech';

var Actor = function(done) {

_.bindAll(this);

this.done = done;

this.batcher = new CandleBatcher(config.tradingAdvisor.candleSize);

this.strategyName = config.tradingAdvisor.method;

this.setupStrategy();

var mode = util.gekkoMode();

// the stitcher will try to pump in historical data

// so that the strat can use this data as a "warmup period"

// the realtime "leech" market won't use the stitcher

if(mode === 'realtime' && !isLeecher) {

var Stitcher = require(dirs.tools + 'dataStitcher');

var stitcher = new Stitcher(this.batcher);

stitcher.prepareHistoricalData(done);

} else

done();

}

Actor.prototype.setupStrategy = function() {

if(!fs.existsSync(dirs.methods + this.strategyName + '.js'))

util.die('Gekko can\'t find the strategy "' + this.strategyName + '"');

log.info('\t', 'Using the strategy: ' + this.strategyName);

const strategy = require(dirs.methods + this.strategyName);

// bind all trading strategy specific functions

// to the WrappedStrategy.

const WrappedStrategy = require('./baseTradingMethod');

_.each(strategy, function(fn, name) {

WrappedStrategy.prototype[name] = fn;

});

let stratSettings;

if(config[this.strategyName]) {

stratSettings = config[this.strategyName];

}

this.strategy = new WrappedStrategy(stratSettings);

this.strategy

.on('advice', this.relayAdvice)

.on(

'stratWarmupCompleted',

e => this.deferredEmit('stratWarmupCompleted', e)

)

.on(

'stratUpdate',

e => this.deferredEmit('stratUpdate', e)

).on('stratNotification',

e => this.deferredEmit('stratNotification', e)

)

this.strategy

.on('tradeCompleted', this.processTradeCompleted);

this.batcher

.on('candle', _candle => {

const { id, ...candle } = _candle;

this.deferredEmit('stratCandle', candle);

this.emitStratCandle(candle);

// save when the next bigCandle should be.

this.nextBigCandleAt = candle.start.clone().add(4, 'hours');

});

}

// HANDLERS

// process the 1m candles

Actor.prototype.processCandle = function(candle, done) {

if(!this.nextBigCandleAt) {

// on first candle we know the next one will be in 4 hours

this.nextBigCandleAt = candle.start.clone().add(4, 'hours');

}

log.info('\t Next Candle Update:', this.nextBigCandleAt.fromNow())

this.candle = candle;

const completedBatch = this.batcher.write([candle]);

if(completedBatch) {

this.next = done;

} else {

done();

this.next = _.noop;

}

this.batcher.flush();

}

// propogate a custom sized candle to the trading strategy

Actor.prototype.emitStratCandle = function(candle) {

this.strategy.tick(candle, this.next);

}

Actor.prototype.processTradeCompleted = function(trade) {

this.strategy.processTrade(trade);

}

// pass through shutdown handler

Actor.prototype.finish = function(done) {

this.strategy.finish(done);

}

// EMITTERS

Actor.prototype.relayAdvice = function(advice) {

advice.date = this.candle.start.clone().add(1, 'minute');

this.deferredEmit('advice', advice);

}

module.exports = Actor;

Différences enregistrées

Texte d'origine

Ouvrir un fichier

var util = require('../../core/util');
var _ = require('lodash');
var fs = require('fs');
var toml = require('toml');

var config = util.getConfig();
var dirs = util.dirs();
var log = require(dirs.core + 'log');
var CandleBatcher = require(dirs.core + 'candleBatcher');

var moment = require('moment');
var isLeecher = config.market && config.market.type === 'leech';

var Actor = function(done) {
  _.bindAll(this);

this.done = done;

this.batcher = new CandleBatcher(config.tradingAdvisor.candleSize);

this.strategyName = config.tradingAdvisor.method;

this.setupStrategy();

var mode = util.gekkoMode();

// the stitcher will try to pump in historical data
  // so that the strat can use this data as a "warmup period"
  //
  // the realtime "leech" market won't use the stitcher
  if(mode === 'realtime' && !isLeecher) {
    var Stitcher = require(dirs.tools + 'dataStitcher');
    var stitcher = new Stitcher(this.batcher);
    stitcher.prepareHistoricalData(done);
  } else
    done();
}

Actor.prototype.setupStrategy = function() {

if(!fs.existsSync(dirs.methods + this.strategyName + '.js'))
    util.die('Gekko can\'t find the strategy "' + this.strategyName + '"');

log.info('\t', 'Using the strategy: ' + this.strategyName);

const strategy = require(dirs.methods + this.strategyName);

// bind all trading strategy specific functions
  // to the WrappedStrategy.
  const WrappedStrategy = require('./baseTradingMethod');

_.each(strategy, function(fn, name) {
    WrappedStrategy.prototype[name] = fn;
  });

let stratSettings;
  if(config[this.strategyName]) {
    stratSettings = config[this.strategyName];
  }

this.strategy = new WrappedStrategy(stratSettings);
  this.strategy
    .on('advice', this.relayAdvice)
    .on(
      'stratWarmupCompleted',
      e => this.deferredEmit('stratWarmupCompleted', e)
    )
    .on(
      'stratUpdate',
      e => this.deferredEmit('stratUpdate', e)
    ).on('stratNotification',
      e => this.deferredEmit('stratNotification', e)
    )

this.strategy
    .on('tradeCompleted', this.processTradeCompleted);

this.batcher
    .on('candle', _candle => {
      const { id, ...candle } = _candle;
      this.deferredEmit('stratCandle', candle);
      this.emitStratCandle(candle);
    });
}

// HANDLERS
// process the 1m candles
Actor.prototype.processCandle = function(candle, done) {
  this.candle = candle;
  const completedBatch = this.batcher.write([candle]);
  if(completedBatch) {
    this.next = done;
  } else {
    done();
    this.next = _.noop;
  }
  this.batcher.flush();
}

// propogate a custom sized candle to the trading strategy
Actor.prototype.emitStratCandle = function(candle) {
  this.strategy.tick(candle, this.next);
}

Actor.prototype.processTradeCompleted = function(trade) {
  this.strategy.processTrade(trade);
}

// pass through shutdown handler
Actor.prototype.finish = function(done) {
  this.strategy.finish(done);
}

// EMITTERS
Actor.prototype.relayAdvice = function(advice) {
  advice.date = this.candle.start.clone().add(1, 'minute');
  this.deferredEmit('advice', advice);
}

module.exports = Actor;

Texte modifié

Ouvrir un fichier

var util = require('../../core/util');
var _ = require('lodash');
var fs = require('fs');
var toml = require('toml');

var config = util.getConfig();
var dirs = util.dirs();
var log = require(dirs.core + 'log');
var CandleBatcher = require(dirs.core + 'candleBatcher');

var moment = require('moment');
var isLeecher = config.market && config.market.type === 'leech';

var Actor = function(done) {
  _.bindAll(this);

this.done = done;

this.batcher = new CandleBatcher(config.tradingAdvisor.candleSize);

this.strategyName = config.tradingAdvisor.method;

this.setupStrategy();

var mode = util.gekkoMode();

Actor.prototype.setupStrategy = function() {

if(!fs.existsSync(dirs.methods + this.strategyName + '.js'))
    util.die('Gekko can\'t find the strategy "' + this.strategyName + '"');

log.info('\t', 'Using the strategy: ' + this.strategyName);

const strategy = require(dirs.methods + this.strategyName);

// bind all trading strategy specific functions
  // to the WrappedStrategy.
  const WrappedStrategy = require('./baseTradingMethod');

_.each(strategy, function(fn, name) {
    WrappedStrategy.prototype[name] = fn;
  });

let stratSettings;
  if(config[this.strategyName]) {
    stratSettings = config[this.strategyName];
  }

this.strategy
    .on('tradeCompleted', this.processTradeCompleted);

this.batcher
    .on('candle', _candle => {
      const { id, ...candle } = _candle;
      this.deferredEmit('stratCandle', candle);
      this.emitStratCandle(candle);
      // save when the next bigCandle should be.
      this.nextBigCandleAt = candle.start.clone().add(4, 'hours');
    });
}

// HANDLERS
// process the 1m candles
Actor.prototype.processCandle = function(candle, done) {
  if(!this.nextBigCandleAt) {
    // on first candle we know the next one will be in 4 hours
	this.nextBigCandleAt = candle.start.clone().add(4, 'hours');
  }
  log.info('\t Next Candle Update:', this.nextBigCandleAt.fromNow())

this.candle = candle;
  const completedBatch = this.batcher.write([candle]);
  if(completedBatch) {
    this.next = done;
  } else {
    done();
    this.next = _.noop;
  }
  this.batcher.flush();
}

// propogate a custom sized candle to the trading strategy
Actor.prototype.emitStratCandle = function(candle) {
  this.strategy.tick(candle, this.next);
}

Actor.prototype.processTradeCompleted = function(trade) {
  this.strategy.processTrade(trade);
}

// pass through shutdown handler
Actor.prototype.finish = function(done) {
  this.strategy.finish(done);
}

// EMITTERS
Actor.prototype.relayAdvice = function(advice) {
  advice.date = this.candle.start.clone().add(1, 'minute');
  this.deferredEmit('advice', advice);
}

module.exports = Actor;