Changeset 4498


Ignore:
Timestamp:
Feb 11, 2015, 3:26:07 PM (4 years ago)
Author:
nmedfort
Message:

Temporary check in. Still getting table formatting right.

Location:
docs/Working/icGrep
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • docs/Working/icGrep/data/icgrep-mt-scatter-mt.csv

    r4481 r4498  
    11MATCHPERCENTAGE,MEAN,STDDEV,COUNT
    2 0,1.125495043972018,0.43424943543718536,3380
    3 5,0.9266282901741288,0.29552168927192135,44
    4 10,1.1268545250309403,0.3999783774304804,19
    5 15,1.2056124701165516,0.3195034108922092,64
    6 20,1.0892127044053521,0.3263362193800323,104
    7 25,1.0847708637974036,0.4307550521579548,68
    8 30,1.233888230553301,0.5197547885395039,55
    9 35,1.1006281070467736,0.4330515018145675,29
    10 40,1.0390359724474374,0.4638352917999036,27
    11 45,1.249232402036932,0.3851325740984287,23
    12 50,0.8036314819159366,0.18193055535787778,15
    13 55,1.4639525442050803,0.4312719828334629,7
    14 60,1.199622715792515,0.3657213815947433,30
    15 65,1.2793777713081667,0.2697229860168878,26
    16 70,1.1350527777359418,0.41016971916676026,76
    17 75,1.344209497502531,0.40402694337915035,88
    18 80,1.803631353850466,0.6313032504846177,45
    19 85,1.5023607896873281,0.8598663206462732,38
    20 90,1.2723897355425782,0.35465108486703034,10
     20,1.1191669266412474,0.4329257069144139,3380
     35,0.9326227584862034,0.3082164357212258,44
     410,1.1109087343008406,0.3952703048032993,19
     515,1.2001930530511031,0.3193412269384006,64
     620,1.0872380625771447,0.3259662197476489,104
     725,1.0716284875464677,0.43905239889331354,68
     830,1.2486811090713898,0.5388952744107314,55
     935,1.0898376110519192,0.42678136200783484,29
     1040,1.0309278732805782,0.46388422204759083,27
     1145,1.2526505025248913,0.38630261111656544,23
     1250,0.7947168764306975,0.17795137197556488,15
     1355,1.4600708161196128,0.4118565635433331,7
     1460,1.19160243565033,0.3616981725199013,30
     1565,1.2672529903947989,0.26920564908883704,26
     1670,1.1368376065012584,0.42234731648798035,76
     1775,1.3447708723720886,0.416419134852328,88
     1880,1.7935757663880973,0.6368757726448665,45
     1985,1.4919672619149666,0.8596661391085333,38
     2090,1.2648117801091519,0.3508570840156954,10
  • docs/Working/icGrep/data/icgrep-mt3-scatter-mt.csv

    r4481 r4498  
    11MATCHPERCENTAGE,MEAN,STDDEV,COUNT
    2 0,0.9578179062839217,0.46339715306878204,3413
    3 5,0.7465260700394447,0.2822893071645399,44
    4 10,1.0106444239874741,0.41702640750706016,20
    5 15,1.0526533777749267,0.33951060957620927,64
    6 20,0.9281494907902523,0.3189041993120877,104
    7 25,0.9662112319343309,0.40784067786258615,68
    8 30,1.187671629743302,0.5614316997843155,55
    9 35,1.0698563436593236,0.45184437817042017,29
    10 40,0.9916108398696325,0.4545408069113271,27
    11 45,1.2169338734885662,0.3751524326886746,23
    12 50,0.7513379711827528,0.22024301671204233,15
    13 55,1.4780768191903815,0.4556863136268525,7
    14 60,1.1550424510401744,0.37845419650673834,30
    15 65,1.3616508043248452,0.28726091821743754,26
    16 70,1.0971327948123573,0.47079849467674906,76
    17 75,1.2622905566251517,0.4769790436078787,88
    18 80,1.7762763702601758,0.6994518273155832,45
    19 85,1.4280924615404136,0.9332001326609655,38
    20 90,1.2997430413805013,0.3998190286888145,10
     20,0.9501851693895197,0.4608568742048198,3413
     35,0.7311801372206298,0.26252782589720924,44
     410,1.004484300785314,0.4206451898545948,20
     515,1.041841669229509,0.33250866437115756,64
     620,0.9192413979540405,0.3112320262046938,104
     725,0.9722331326306416,0.42754188350942834,68
     830,1.19855112035775,0.5652699216764491,55
     935,1.0541525406241365,0.44498770443326563,29
     1040,0.9929360544898734,0.46050855285394093,27
     1145,1.196844168884188,0.377194962307141,23
     1250,0.7510125216882422,0.21779859970641852,15
     1355,1.462098061842465,0.43055655328706405,7
     1460,1.1378108423655793,0.37640948901146176,30
     1565,1.3490086777259702,0.26876476580248193,26
     1670,1.0956529489826357,0.48000992097781936,76
     1775,1.260014984298051,0.48244042705601603,88
     1880,1.7750951174372376,0.7124889095365443,45
     1985,1.4214865086080808,0.9348711649623498,38
     2090,1.2933082730068919,0.40309058400189074,10
  • docs/Working/icGrep/evaluation.tex

    r4494 r4498  
    9090of more complex expressions as shown in Table \ref{table:complexexpr}.
    9191
    92 \begin{table}
    93 \begin{center}
    94 \begin{tabular}{|c|r|r|r|}  \hline
    95 Regular & \multicolumn{3}{|c|}{CPU cycles per byte} \\ \cline{2-4}
    96 Expression & icGrep{} & pcre2grep & ugrep \\ \hline
    97 blah    & 1 & 1000 & 100 \\ \hline
    98 \end{tabular}
     92% \begin{table}
     93% \begin{center}
     94% \begin{tabular}{|c|r|r|r|}  \hline
     95% Regular & \multicolumn{3}{|c|}{CPU cycles per byte} \\ \cline{2-4}
     96% Expression & icGrep{} & pcre2grep & ugrep \\ \hline
     97% blah  & 1 & 1000 & 100 \\ \hline
     98% \end{tabular}
     99% \caption{Matching Times for Complex Expressions}\label{table:complexexpr}
     100% \end{center}
     101% \end{table}
     102
     103\begin{table}[ht]\centering % requires booktabs
     104\small
     105\begin{tabular}{@{}p{2.7cm}p{10.8cm}@{}}
     106\textbf{Name}&\textbf{Regular Expression}\\
     107\toprule
     108alphanumeric \#1&\verb`^[\p{L}\p{N}]*((\p{L}\p{N})|(\p{N}\p{L}))[\p{L}\p{N}]*$`\\
     109\midrule
     110alphanumeric \#2&\verb`[\p{L}\p{N}]*((\p{L}\p{N})|(\p{N}\p{L}))[\p{L}\p{N}]*`\\
     111\midrule
     112arabic&\verb`^[\p{Arabic}\p{Common}]*\p{Arabic}[\p{Arabic}\p{Common}]*$`\\
     113\midrule
     114currency&\verb`(\p{Sc}\s*(\d*|(\d{1,3}([,.]\d{3})*))([,.]\d{2}?)?)|`\newline\verb`((\d*|(\d{1,3}([,.]\d{3})*))([,.]\d{2}?)?\s*\p{Sc})`\\
     115\midrule
     116email &\verb`([^\p{Z}<]+@[\p{L}\p{M}\p{N}.-]+\.(\p{L}\p{M}*){2,6})(>|\p{Z}|$)`\\
     117\bottomrule
     118\end{tabular}
     119\caption{Regular Expressions}\label{table:regularexpr}
     120\end{table}
     121
     122\begin{table}[h]\centering % requires booktabs
     123\small
     124\begin{tabular}{@{}p{2.7cm}r@{~--~}rr@{~--~}rr@{~--~}rr@{~--~}rr@{~--~}r@{}}
     125Expression&\multicolumn{2}{>{\centering}p{2.2cm}}{icgrep}&\multicolumn{2}{>{\centering}p{2.2cm}}{icgrep-mt2}&\multicolumn{2}{>{\centering}p{2.2cm}}{icgrep-mt3}&\multicolumn{2}{>{\centering}p{2.2cm}}{pcre2grep}&\multicolumn{2}{>{\centering}p{2.2cm}}{ugrep541}\\
     126\toprule
     127alphanumeric \#1&2.4&5.0&2.0&4.1&2.0&4.1&8.2&11.3&8.8&11.3\\
     128alphanumeric \#2&2.3&4.9&1.9&4.0&2.0&4.0&209.9&563.5&182.3&457.9\\
     129arabic&1.5&3.4&1.1&2.4&1.1&2.5&7.5&270.8&8.9&327.8\\
     130currency&0.7&2.1&0.6&1.5&0.4&1.3&188.4&352.3&52.8&152.8\\
     131email&3.0&6.9&0.6&2.1&0.4&1.9&67.2&1442.0&108.8&1022.3\\
     132\bottomrule
     133\end{tabular}
    99134\caption{Matching Times for Complex Expressions}\label{table:complexexpr}
    100 \end{center}
    101135\end{table}
     136
     137
     138
     139
     140
     141
     142
     143
     144
     145
     146
     147
     148
    102149
    103150\subsection{Optimizations of Bitwise Methods}
  • docs/Working/icGrep/fig-executor.tex

    r4476 r4498  
    11\begin{figure}[tbh]
    22\begin{center}
     3
     4\pgfdeclarelayer{threads}
     5\pgfdeclarelayer{components}
     6\pgfsetlayers{threads,main}
     7
    38\tikzstyle{block} = [rectangle, draw, text width=15em, text centered, minimum height=1.75em, thick, font=\ttfamily\bfseries, node distance=3.5em]
    49\tikzstyle{line} = [draw, ->, line width=1.4pt]
    510\tikzstyle{separator} = [draw, line width=0.125em, dashed]
     11\tikzstyle{thread} = [rectangle, corners=rounded, draw, text width=15em, text centered, minimum height=1.75em, thick, font=\ttfamily\bfseries, node distance=3.5em]
    612\tikzset{block/.append style={execute at begin node=\footnotesize}}   
    713\begin{tikzpicture}[node distance=3cm, auto, >=stealth]
    814
    915    % Place nodes
    10     \node [draw=none] (InputData) {Input Data};
     16    \node [draw=none] (InputData) {Streaming Input Data};
    1117    \node [block, below of=InputData] (S2P) {Transposition};
    1218    \node [block, below of=S2P] (RequiredStreamsGenerator) {Required Streams Generator};
    1319    \node [block, below of=RequiredStreamsGenerator] (JITFunction) {Dynamic Matcher};
    14     \node [block, right of=JITFunction, node distance=20em] (NamedPropertyLibaray) {Named Property Library};
     20    \node [block, right of=JITFunction, node distance=20em] (NamedPropertyLibrary) {Named Property Library};
    1521    \node [block, below of=JITFunction] (MatchScanner) {Match Scanner};
    16     \node [draw=none, below of=MatchScanner, node distance=3.5em] (OutputResult) {Output Result};
     22    \node [draw=none, below of=MatchScanner, node distance=3.5em] (OutputResult) {Streaming Output Result};
    1723   
    1824    % Draw edges
     
    2026    \path [line] (S2P) -- (RequiredStreamsGenerator);
    2127    \path [line] (RequiredStreamsGenerator) -- (JITFunction);
    22     \path [line] (NamedPropertyLibaray) -- (JITFunction);
     28    \path [line] (NamedPropertyLibrary) -- (JITFunction);
    2329    \path [line] (JITFunction) -- (MatchScanner);
    2430    \path [line] (MatchScanner) -- (OutputResult);
    25    
     31
     32    \begin{pgfonlayer}{threads}
     33        \path (S2P.north west)+(-.1,.3) node (a) {};
     34        \path (S2P.south east)+(+1.7,-0.1) node (b) {};
     35        \path[fill=green!20,rounded corners, draw=green, solid] (a) rectangle (b);
     36        \node [draw=none,above=-0.1cm of S2P.north east] (t1) {Transposition Thread};
     37
     38        \path (RequiredStreamsGenerator.north west)+(-.1,.3) node (a) {};
     39        \path (RequiredStreamsGenerator.south east)+(+2,-0.1) node (b) {};
     40        \path[fill=blue!20,rounded corners, draw=blue, solid] (a) rectangle (b);
     41        \node [draw=none,above=-0.1cm of RequiredStreamsGenerator.north east] (t1) {Stream Generator Thread};
     42
     43        \path (JITFunction.north west)+(-.1,.3) node (a) {};
     44        \path (NamedPropertyLibrary.south east)+(+.1,-0.1) node (b) {};
     45        \path[fill=red!20,rounded corners, draw=red, solid] (a) rectangle (b);
     46        \node [draw=none,above=-0.1cm of JITFunction.north east] (t1) {Matcher Thread};
     47
     48    \end{pgfonlayer}{threads}
    2649\end{tikzpicture}
    2750
  • docs/Working/icGrep/icgrep.tex

    r4495 r4498  
    44\usepackage{pgfplots}
    55\usepackage{pgfplotstable}
    6 
     6\usepackage{booktabs,siunitx}
    77\usepackage{subfig}
    88\usepackage{amsmath}
Note: See TracChangeset for help on using the changeset viewer.