Merge branch 'master' of git-bioimage.coe.drexel.edu:opensource/ncd into master

# Conflicts:
#	src/MATLAB/apps/goNISTk.m

src/MATLAB/+NWD/NWD.m

@@ -54,15 +54,15 @@ idx=strfind(term,' ');
 term(idx)='+';
 
 if strcmp(strServer,'pubmed')
-    f=Count.pubmed(term);
+    f=NWD.Count.pubmed(term);
 elseif strcmp(strServer,'amazon')
-    f=doQueryAmazon(term);
+    f=NWD.doQueryAmazon(term);
 elseif strcmp(strServer,'google')
-    f=Count.GetCountGoogle(term);
+    f=NWD.Count.GetCountGoogle(term);
 elseif strcmp(strServer,'reddit')
-    f=Count.reddit(term);
+    f=NWD.Count.reddit(term);
 else
-    f=Count.wikipedia(term);
+    f=NWD.Count.wikipedia(term);
 end
 
 % f=max(f,1); % no zero counts - sends nwd to NaN

src/MATLAB/apps/goNISTk.m

@@ -19,7 +19,6 @@ for n=1:1000
     K=length(target);  
     kMax=K+3;
     bwDigits=[];
-    bwRandom=[];
     bwRandom2=[];
     bwRandom3=[];
     parfor kk=1:kMax
@@ -41,11 +40,11 @@ for n=1:1000
     kGap(n)=Cluster.GapSpectral(dDigits,kMax,true);
     4;
     if mod(n,10)==0
-        [n, length(find(kOpt==K))/length(kOpt),length(find(kOpt2==K))/length(kOpt2),...
+        [n, length(find(kOpt2==K))/length(kOpt2),...
             length(find(kOpt3==K))/length(kOpt3) length(find(kGap==K ))/length(kGap)]
     end
 end
-accOpt=length(find(kOpt==K))/length(kOpt)
+
 accOpt2=length(find(kOpt2==K))/length(kOpt2)
 accOpt3=length(find(kOpt3==K))/length(kOpt2)
 accGap=length(find(kGap==K ))/length(kGap)