Transformed into independent module!!!

Chunk
1 parent 10b4f63f
Showing 24 changed files with 55 additions and 50 deletions Show diff stats
mdata/CV.py
mdata/CV.pyc
mdata/MSR.py
mdata/MSR.pyc
mfeat/HOG.py
mfeat/HOG.pyc
mfeat/IntraBlockDiff.py
mfeat/IntraBlockDiff.pyc
mfeat/__init__.py
mfeat/__init__.pyc
mmodel/SVM.py
mmodel/SVM.pyc
mspark/SC.py
mspark/SC.pyc
msteg/__init__.py
msteg/__init__.pyc
msteg/steganalysis/ChiSquare.py
msteg/steganalysis/MPB.py
msteg/steganalysis/MPB.pyc
msteg/steganography/F3.py
 # -*- coding: utf-8 -*-
 __author__ = 'chunk'
-from mdata import *
-from mfeat import HOG, IntraBlockDiff
-from mspark import SC
+from . import *
+from ..mfeat import HOG, IntraBlockDiff
+from ..mspark import SC
+from ..common import *
 import os, sys
 from PIL import Image
 from hashlib import md5
 import csv
 import shutil
-from common import *
 import json
 import collections
 import happybase
 # -*- coding: utf-8 -*-
 __author__ = 'chunk'
-from mdata import *
-from mfeat import HOG, IntraBlockDiff
-from mspark import SC
+from . import *
+from ..mfeat import HOG, IntraBlockDiff
+from ..mspark import SC
+from ..common import *
 import os, sys
 import base64
@@ -12,7 +13,6 @@ from io import BytesIO
 from hashlib import md5
 import csv
 import shutil
-from common import *
 import json
 import collections
 import itertools
@@ -7,9 +7,9 @@ chunkplus@gmail.com
 """
 __author__ = 'hadoop'
-from mfeat import *
+from . import *
+from ..common import *
-from common import *
 import numpy as np
 from PIL import Image
 import cv2
 __author__ = 'chunk'
-from mfeat import *
+from . import *
+from ..common import *
+from ..mjpeg import *
+from ..msteg import *
+from ..msteg.steganalysis import MPB
-from common import *
 import numpy as np
-from mjpeg import *
-from msteg import *
-from  msteg.steganalysis import MPB
-
-
 class FeatIntraBlockDiff(FeatureBase):
     def __init__(self):
         FeatureBase.__init__(self)
 __author__ = 'chunk'
-from common import *
+from ..common import *
+
 import numpy as np
 from PIL import Image
 import cv2
@@ -5,12 +5,12 @@ SVM Model.
 chunkplus@gmail.com
 2014 Dec
 '''
-from mfeat import *
-from mmodel import *
-from svmutil import *
-from mspark import SC
+from ..mfeat import *
+from . import *
+from .svmutil import *
+from ..mspark import SC
+from ..common import *
-from common import *
 import numpy as np
 import csv
 import json
 __author__ = 'chunk'
+from ..common import *
+
 import sys
-from common import *
 from dependencies import *
 from pyspark import SparkConf, SparkContext
 from pyspark.mllib.classification import LogisticRegressionWithSGD, SVMWithSGD
@@ -2,8 +2,8 @@ __author__ = &#39;chunk&#39;
 import numpy as np
-import mjpeg
-from common import *
+from ..mjpeg import Jpeg
+from ..common import *
 __all__ = ['StegBase', 'sample_key']
@@ -31,7 +31,7 @@ class StegBase(object):
         """
         Returns DCT coefficients of the cover image.
         """
-        self.cov_jpeg = mjpeg.Jpeg(img_path)
+        self.cov_jpeg = Jpeg(img_path)
         self.key = self.cov_jpeg.getkey()
         self.cov_data = self.cov_jpeg.getCoefBlocks()
         return self.cov_data
@@ -22,7 +22,7 @@ from scipy.stats import chisquare
 import matplotlib.pyplot as plt
 import itertools as it
-from msteg import *
+from .. import *
 class ChiSquare(StegBase):
@@ -6,9 +6,10 @@ Yun Q. Shi, et al - A Markov Process Based Approach to Effective Attacking JPEG 
 import time
 import math
 import numpy as np
-from msteg import *
-import mjpeg
-from common import *
+
+from .. import *
+from ...mjpeg import Jpeg,colorMap
+from ...common import *
 import csv
 import json
@@ -237,8 +238,8 @@ class MPB(StegBase):
                 with open('res/tmp.model', 'rb') as modelfile:
                     clf = pickle.load(modelfile)
-        im = mjpeg.Jpeg(image, key=sample_key)
-        ciq = im.coef_arrays[mjpeg.colorMap['Y']]
+        im = Jpeg(image, key=sample_key)
+        ciq = im.coef_arrays[colorMap['Y']]
         tpm = self.get_trans_prob_mat(ciq)
         return clf.predict(tpm)
@@ -268,8 +269,8 @@ class MPB(StegBase):
                 svm = cv2.SVM()
                 svm.load('res/svm_data.model')
-        im = mjpeg.Jpeg(image, key=sample_key)
-        ciq = im.coef_arrays[mjpeg.colorMap['Y']]
+        im = Jpeg(image, key=sample_key)
+        ciq = im.coef_arrays[colorMap['Y']]
         tpm = self.get_trans_prob_mat(ciq)
         return svm.predict(tpm)
@@ -3,8 +3,8 @@ __author__ = &#39;chunk&#39;
 import math
 import numpy as np
-from msteg import *
-from common import *
+from .. import *
+from ...common import *
 class F3(StegBase):
@@ -11,8 +11,9 @@ which is not included in the original description of F4.
 """
 import numpy as np
-from msteg import *
-from common import *
+
+from .. import *
+from ...common import *
 class F4(StegBase):
@@ -2,9 +2,10 @@ __author__ = &#39;chunk&#39;
 import numpy as np
 import numpy.random as rnd
-from msteg import *
-import mjpeg
-from common import *
+
+from .. import *
+from ...common import *
+from ...mjpeg import Jpeg
 class F4(StegBase):
@@ -22,7 +23,7 @@ class F4(StegBase):
         """
         Returns DCT coefficients of the cover image.
         """
-        self.cov_jpeg = mjpeg.Jpeg(img_path, key=self.key)
+        self.cov_jpeg = Jpeg(img_path, key=self.key)
         cov_data = self.cov_jpeg.getsignal(channel='Y')
         self.cov_data = np.array(cov_data, dtype=np.int16)
@@ -26,10 +26,11 @@ which embedding function (one of JSteg, F3, F4) should be used.
 import math
 import numpy as np
 import numpy.random as rnd
-from msteg import *
-from F4 import F4
-import mjpeg
-from common import *
+
+from .. import *
+from .F4 import F4
+from ...mjpeg import Jpeg
+from ...common import *
 class F5(StegBase):
@@ -53,7 +54,7 @@ class F5(StegBase):
         """
         Returns DCT coefficients of the cover image.
         """
-        self.cov_jpeg = mjpeg.Jpeg(img_path, key=self.key)
+        self.cov_jpeg = Jpeg(img_path, key=self.key)
         cov_data = self.cov_jpeg.getsignal(channel='Y')
         self.cov_data = np.array(cov_data, dtype=np.int16)
@@ -2,8 +2,9 @@ __author__ = &#39;chunk&#39;
 import time
 import numpy as np
-from msteg import *
-from common import *
+
+from .. import *
+from ...common import *
 class LSB(StegBase):
1	__author__ = 'chunk'	1	__author__ = 'chunk'
2		2
3	-from common import *	3	+from ..common import *
		4	+
4	import numpy as np	5	import numpy as np
5	from PIL import Image	6	from PIL import Image
6	import cv2	7	import cv2
	@@ -22,7 +22,7 @@ from scipy.stats import chisquare		@@ -22,7 +22,7 @@ from scipy.stats import chisquare
22	import matplotlib.pyplot as plt	22	import matplotlib.pyplot as plt
23	import itertools as it	23	import itertools as it
24		24
25	-from msteg import *	25	+from .. import *
26		26
27		27
28	class ChiSquare(StegBase):	28	class ChiSquare(StegBase):
	@@ -3,8 +3,8 @@ __author__ = 'chunk'		@@ -3,8 +3,8 @@ __author__ = 'chunk'
3		3
4	import math	4	import math
5	import numpy as np	5	import numpy as np
6	-from msteg import *
7	-from common import *	6	+from .. import *
		7	+from ...common import *
8		8
9		9
10	class F3(StegBase):	10	class F3(StegBase):