Merge branch 'marcus-n3rd-tweezers'

anandanand84 · anandanand84 · commit 8acaa9cd64f9 · 2018-09-04T11:42:59.000-05:00
* marcus-n3rd-tweezers:
  Added TweezerTop and TweezerBottom to README.md, package.json, and bower.json
  Ran build scripts and tests.
  Added TweezerTop and TweezerBottom to index.js and src/index.ts
  Added tests for TweezerTop and TweezerBottom indicators.
  Added TweezerTop and TweezerBottom candlestick indicators.
  Updated README.md regarding new indicators.
  Ran build scripts.
  Added hammer, hanging man, and shooting star patterns to src/index.ts
  Added hammer, hanging man, and shooting star patterns to bearish and bullish indicators.
diff --git a/README.md b/README.md
@@ -185,6 +185,8 @@ TD(Trending Down) and TU(Trending up) works fine even with lower values.
 1. [Hanging Man (Unconfirmed)](https://runkit.com/nerdacus/technicalindicator-hangingmanunconfirmed).
 1. [Shooting Star](https://runkit.com/nerdacus/technicalindicator-shootingstar).
 1. [Shooting Star (Unconfirmed)](https://runkit.com/nerdacus/technicalindicator-shootingstarunconfirmed).
+1. [Tweezer Top](https://runkit.com/nerdacus/technicalindicator-tweezertop).
+1. [Tweezer Bottom](https://runkit.com/nerdacus/technicalindicator-tweezerbottom).
 
 or
 
diff --git a/bower.json b/bower.json
@@ -76,7 +76,9 @@
     "Confirmed Inverted Hammer Pattern",
     "Unconfirmed Inverted Hammer Pattern",
     "Hanging Man",
-    "Shooting Star"
+    "Shooting Star",
+    "Tweezer Top",
+    "Tweezer Bottom"
   ],
   "homepage": "https://github.com/anandanand84/technicalindicators",
   "moduleType": [],
diff --git a/declarations/candlestick/TweezerBottom.d.ts b/declarations/candlestick/TweezerBottom.d.ts
@@ -0,0 +1,8 @@
+import StockData from '../StockData';
+import CandlestickFinder from './CandlestickFinder';
+export default class TweezerBottom extends CandlestickFinder {
+    constructor();
+    logic(data: StockData): boolean;
+    downwardTrend(data: StockData): boolean;
+}
+export declare function tweezerbottom(data: StockData): any;
diff --git a/declarations/candlestick/TweezerTop.d.ts b/declarations/candlestick/TweezerTop.d.ts
@@ -0,0 +1,8 @@
+import StockData from '../StockData';
+import CandlestickFinder from './CandlestickFinder';
+export default class TweezerTop extends CandlestickFinder {
+    constructor();
+    logic(data: StockData): boolean;
+    upwardTrend(data: StockData): boolean;
+}
+export declare function tweezertop(data: StockData): any;
diff --git a/declarations/generated.d.ts b/declarations/generated.d.ts
@@ -783,6 +783,20 @@ export class ShootingStarUnconfirmed extends ShootingStar {
 }
 export function shootingstarunconfirmed(data: StockData): any;
 
+export class TweezerTop extends CandlestickFinder {
+    constructor();
+    logic(data: StockData): boolean;
+    upwardTrend(data: StockData): boolean;
+}
+export function tweezertop(data: StockData): any;
+
+export class TweezerBottom extends CandlestickFinder {
+    constructor();
+    logic(data: StockData): boolean;
+    downwardTrend(data: StockData): boolean;
+}
+export function tweezerbottom(data: StockData): any;
+
 /**
   * Calcaultes the fibonacci retracements for given start and end points
   *
diff --git a/declarations/index.d.ts b/declarations/index.d.ts
@@ -69,6 +69,8 @@ export { hangingman } from './candlestick/HangingMan';
 export { hangingmanunconfirmed } from './candlestick/HangingManUnconfirmed';
 export { shootingstar } from './candlestick/ShootingStar';
 export { shootingstarunconfirmed } from './candlestick/ShootingStarUnconfirmed';
+export { tweezertop } from './candlestick/TweezerTop';
+export { tweezerbottom } from './candlestick/TweezerBottom';
 export { fibonacciretracement } from './drawingtools/fibonacci';
 export { predictPattern, PatternDetector } from './patterndetection/patterndetection';
 export { AvailablePatterns } from './patterndetection/patterndetection';
diff --git a/dist/browser.es6.js b/dist/browser.es6.js
diff --git a/dist/browser.es6.js.map b/dist/browser.es6.js.map
diff --git a/dist/browser.js b/dist/browser.js
diff --git a/dist/browser.js.map b/dist/browser.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/index.js b/index.js
@@ -73,6 +73,8 @@ export function getAvailableIndicators () {
   AvailableIndicators.push('hangingmanunconfirmed');
   AvailableIndicators.push('shootingstar');
   AvailableIndicators.push('shootingstarunconfirmed');
+  AvailableIndicators.push('tweezertop');
+  AvailableIndicators.push('tweezerbottom');
 
   AvailableIndicators.push('predictPattern');
   AvailableIndicators.push('hasDoubleBottom');
diff --git a/lib/candlestick/Bearish.js b/lib/candlestick/Bearish.js
@@ -11,6 +11,7 @@ import HangingMan from './HangingMan';
 import HangingManUnconfirmed from './HangingManUnconfirmed';
 import ShootingStar from './ShootingStar';
 import ShootingStarUnconfirmed from './ShootingStarUnconfirmed';
+import TweezerTop from './TweezerTop';
 import CandlestickFinder from './CandlestickFinder';
 let bearishPatterns = [
     new BearishEngulfingPattern(),
@@ -26,6 +27,7 @@ let bearishPatterns = [
     new HangingManUnconfirmed(),
     new ShootingStar(),
     new ShootingStarUnconfirmed(),
+    new TweezerTop()
 ];
 export default class BearishPatterns extends CandlestickFinder {
     constructor() {
diff --git a/lib/candlestick/Bullish.js b/lib/candlestick/Bullish.js
@@ -12,6 +12,7 @@ import BullishInvertedHammerStick from './BullishInvertedHammerStick';
 import HammerPattern from './HammerPattern';
 import HammerPatternUnconfirmed from './HammerPatternUnconfirmed';
 import CandlestickFinder from './CandlestickFinder';
+import TweezerBottom from './TweezerBottom';
 let bullishPatterns = [
     new BullishEngulfingPattern(),
     new DownsideTasukiGap(),
@@ -26,6 +27,7 @@ let bullishPatterns = [
     new BullishInvertedHammerStick(),
     new HammerPattern(),
     new HammerPatternUnconfirmed(),
+    new TweezerBottom()
 ];
 export default class BullishPatterns extends CandlestickFinder {
     constructor() {
diff --git a/lib/candlestick/TweezerBottom.js b/lib/candlestick/TweezerBottom.js
@@ -0,0 +1,23 @@
+import CandlestickFinder from './CandlestickFinder';
+import { averageloss } from '../Utils/AverageLoss';
+import { averagegain } from '../Utils/AverageGain';
+export default class TweezerBottom extends CandlestickFinder {
+    constructor() {
+        super();
+        this.name = 'TweezerBottom';
+        this.requiredCount = 5;
+    }
+    logic(data) {
+        return this.downwardTrend(data) && data.low[3] == data.low[4];
+    }
+    downwardTrend(data) {
+        // Analyze trends in closing prices of the first three or four candlesticks
+        let gains = averagegain({ values: data.close.slice(0, 3), period: 2 });
+        let losses = averageloss({ values: data.close.slice(0, 3), period: 2 });
+        // Downward trend, so more losses than gains
+        return losses > gains;
+    }
+}
+export function tweezerbottom(data) {
+    return new TweezerBottom().hasPattern(data);
+}
diff --git a/lib/candlestick/TweezerTop.js b/lib/candlestick/TweezerTop.js
@@ -0,0 +1,23 @@
+import CandlestickFinder from './CandlestickFinder';
+import { averageloss } from '../Utils/AverageLoss';
+import { averagegain } from '../Utils/AverageGain';
+export default class TweezerTop extends CandlestickFinder {
+    constructor() {
+        super();
+        this.name = 'TweezerTop';
+        this.requiredCount = 5;
+    }
+    logic(data) {
+        return this.upwardTrend(data) && data.high[3] == data.high[4];
+    }
+    upwardTrend(data) {
+        // Analyze trends in closing prices of the first three or four candlesticks
+        let gains = averagegain({ values: data.close.slice(0, 3), period: 2 });
+        let losses = averageloss({ values: data.close.slice(0, 3), period: 2 });
+        // Upward trend, so more gains than losses
+        return gains > losses;
+    }
+}
+export function tweezertop(data) {
+    return new TweezerTop().hasPattern(data);
+}
diff --git a/lib/index.js b/lib/index.js
@@ -69,6 +69,8 @@ export { hangingman } from './candlestick/HangingMan';
 export { hangingmanunconfirmed } from './candlestick/HangingManUnconfirmed';
 export { shootingstar } from './candlestick/ShootingStar';
 export { shootingstarunconfirmed } from './candlestick/ShootingStarUnconfirmed';
+export { tweezertop } from './candlestick/TweezerTop';
+export { tweezerbottom } from './candlestick/TweezerBottom';
 export { fibonacciretracement } from './drawingtools/fibonacci';
 export { predictPattern, PatternDetector } from './patterndetection/patterndetection';
 export { AvailablePatterns } from './patterndetection/patterndetection';
diff --git a/package.json b/package.json
@@ -93,7 +93,9 @@
     "Confirmed Inverted Hammer Pattern",
     "Unconfirmed Inverted Hammer Pattern",
     "Hanging Man",
-    "Shooting Star"
+    "Shooting Star",
+    "Tweezer Top",
+    "Tweezer Bottom"
   ],
   "author": "anand.anand84@gmail.com",
   "license": "MIT",
diff --git a/src/candlestick/Bearish.ts b/src/candlestick/Bearish.ts
@@ -11,6 +11,7 @@ import HangingMan from './HangingMan';
 import HangingManUnconfirmed from './HangingManUnconfirmed';
 import ShootingStar from './ShootingStar';
 import ShootingStarUnconfirmed from './ShootingStarUnconfirmed';
+import TweezerTop from './TweezerTop';
 import StockData from '../StockData';
 import CandlestickFinder from './CandlestickFinder';
 
@@ -28,6 +29,7 @@ let bearishPatterns = [
     new HangingManUnconfirmed(),
     new ShootingStar(),
     new ShootingStarUnconfirmed(),
+    new TweezerTop()
 ];
 
 export default class BearishPatterns extends CandlestickFinder {
diff --git a/src/candlestick/Bullish.ts b/src/candlestick/Bullish.ts
@@ -13,6 +13,7 @@ import HammerPattern from './HammerPattern';
 import HammerPatternUnconfirmed from './HammerPatternUnconfirmed';
 import StockData from '../StockData';
 import CandlestickFinder from './CandlestickFinder';
+import TweezerBottom from './TweezerBottom';
 
 let bullishPatterns = [
     new BullishEngulfingPattern(),
@@ -28,6 +29,7 @@ let bullishPatterns = [
     new BullishInvertedHammerStick(),
     new HammerPattern(),
     new HammerPatternUnconfirmed(),
+    new TweezerBottom()
 ];
 
 export default class BullishPatterns extends CandlestickFinder {
diff --git a/src/candlestick/TweezerBottom.ts b/src/candlestick/TweezerBottom.ts
@@ -0,0 +1,28 @@
+import StockData from '../StockData';
+import CandlestickFinder from './CandlestickFinder';
+import { averageloss } from '../Utils/AverageLoss';
+import { averagegain } from '../Utils/AverageGain';
+
+export default class TweezerBottom extends CandlestickFinder {
+    constructor() {
+        super();
+        this.name = 'TweezerBottom';
+        this.requiredCount = 5;
+    }
+
+    logic (data:StockData) {
+        return this.downwardTrend(data) && data.low[3] == data.low[4];
+    }
+
+    downwardTrend (data:StockData) {
+        // Analyze trends in closing prices of the first three or four candlesticks
+        let gains = averagegain({ values: data.close.slice(0, 3), period: 2 });
+        let losses = averageloss({ values: data.close.slice(0, 3), period: 2 });
+        // Downward trend, so more losses than gains
+        return losses > gains;
+    }
+}
+
+export function tweezerbottom(data:StockData) {
+  return new TweezerBottom().hasPattern(data);
+}
diff --git a/src/candlestick/TweezerTop.ts b/src/candlestick/TweezerTop.ts
@@ -0,0 +1,28 @@
+import StockData from '../StockData';
+import CandlestickFinder from './CandlestickFinder';
+import { averageloss } from '../Utils/AverageLoss';
+import { averagegain } from '../Utils/AverageGain';
+
+export default class TweezerTop extends CandlestickFinder {
+    constructor() {
+        super();
+        this.name = 'TweezerTop';
+        this.requiredCount = 5;
+    }
+
+    logic (data:StockData) {
+        return this.upwardTrend(data) && data.high[3] == data.high[4];
+    }
+
+    upwardTrend (data:StockData) {
+        // Analyze trends in closing prices of the first three or four candlesticks
+        let gains = averagegain({ values: data.close.slice(0, 3), period: 2 });
+        let losses = averageloss({ values: data.close.slice(0, 3), period: 2 });
+        // Upward trend, so more gains than losses
+        return gains > losses;
+    }
+}
+
+export function tweezertop(data:StockData) {
+  return new TweezerTop().hasPattern(data);
+}
diff --git a/src/index.ts b/src/index.ts
@@ -74,10 +74,11 @@ export { hangingman }                  from './candlestick/HangingMan';
 export { hangingmanunconfirmed }       from './candlestick/HangingManUnconfirmed';
 export { shootingstar }                from './candlestick/ShootingStar';
 export { shootingstarunconfirmed }     from './candlestick/ShootingStarUnconfirmed';
+export { tweezertop }                  from './candlestick/TweezerTop';
+export { tweezerbottom }               from './candlestick/TweezerBottom';
 
 export  { fibonacciretracement}        from './drawingtools/fibonacci';
 
-
 export  { predictPattern, PatternDetector }              from './patterndetection/patterndetection';
 export  { AvailablePatterns }              from './patterndetection/patterndetection';
 export  { hasDoubleBottom}              from './patterndetection/patterndetection';
diff --git a/test/candlestick/TweezerBottom.js b/test/candlestick/TweezerBottom.js
@@ -0,0 +1,23 @@
+var TweezerBottom   = require('../../lib/candlestick/TweezerBottom').default;
+var assert          = require('assert');
+var drawCandleStick = require('draw-candlestick');
+var fs              = require('fs');
+
+var testData = {
+  open: [40.90, 36.00, 33.10, 30.10, 26.13],
+  high: [41.80, 37.60, 35.90, 31.60, 33.60],
+  close: [36.00, 33.10, 29.50, 26.13, 31.00],
+  low: [28.00, 27.70, 26.90, 25.90, 25.90],
+};
+
+describe('Tweezer Bottom : ', function() {
+   before(function() {
+    var imageBuffer = drawCandleStick(testData);
+    fs.writeFileSync(`${__dirname}/images/TweezerBottom.png`,imageBuffer);
+  });
+  it(`Check whether the supplied data has Tweezer Bottom`, function() {
+    var tweezerBottom = new TweezerBottom();
+    var result        = tweezerBottom.hasPattern(testData);
+    assert.deepEqual(result, true, `Invalid result for Tweezer Bottom`);
+  });
+})
diff --git a/test/candlestick/TweezerTop.js b/test/candlestick/TweezerTop.js
diff --git a/test/candlestick/images/TweezerBottom.png b/test/candlestick/images/TweezerBottom.png
diff --git a/test/candlestick/images/TweezerTop.png b/test/candlestick/images/TweezerTop.png
