Skip to content

Commit eee0fc8

Browse files
committed
Modified the autoloader and the composer.json
Changed the autoloader to a psr-0 compatible one Changed the composer.json to use a psr-0 autoloader Commited the file deletions
1 parent 0c2dff6 commit eee0fc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+17
-3491
lines changed

autoloader.php

+14-64
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,19 @@
11
<?php
2-
/* * * * * * * * * * * * * * * * *
3-
* Automatically generated file *
4-
* ! Edit with caution *
5-
* * * * * * * * * * * * * * * * */
62

7-
spl_autoload_register( function ($name) {
8-
static $files = array(
9-
"NlpTools\Models\FeatureBasedNB"=>"/models/feature_based_nb.php",
10-
"NlpTools\Models\LinearModel"=>"/models/linear_model.php",
11-
"NlpTools\Models\MultinomialNBModel"=>"/models/multinomial_nb.php",
12-
"NlpTools\Models\Lda"=>"/models/lda.php",
13-
"NlpTools\Models\Maxent"=>"/models/maxent.php",
14-
"NlpTools\Tokenizers\Tokenizer"=>"/tokenizers/tokenizer.php",
15-
"NlpTools\Tokenizers\WhitespaceTokenizer"=>"/tokenizers/whitespace_tokenizer.php",
16-
"NlpTools\Tokenizers\ClassifierBasedTokenizer"=>"/tokenizers/classifier_based_tokenizer.php",
17-
"NlpTools\Tokenizers\WhitespaceAndPunctuationTokenizer"=>"/tokenizers/whitespace_punctuation_tokenizer.php",
18-
"NlpTools\FeatureFactories\DataAsFeatures"=>"/feature_factories/data_as_features.php",
19-
"NlpTools\FeatureFactories\FeatureFactory"=>"/feature_factories/feature_factory.php",
20-
"NlpTools\FeatureFactories\FunctionFeatures"=>"/feature_factories/callables_as_features.php",
21-
"NlpTools\Random\Generators\GeneratorI"=>"/random/src/NlpTools/Random/Generators/GeneratorI.php",
22-
"NlpTools\Random\Generators\FromFile"=>"/random/src/NlpTools/Random/Generators/FromFile.php",
23-
"NlpTools\Random\Generators\MersenneTwister"=>"/random/src/NlpTools/Random/Generators/MersenneTwister.php",
24-
"NlpTools\Random\Distributions\Normal"=>"/random/src/NlpTools/Random/Distributions/Normal.php",
25-
"NlpTools\Random\Distributions\Gamma"=>"/random/src/NlpTools/Random/Distributions/Gamma.php",
26-
"NlpTools\Random\Distributions\Dirichlet"=>"/random/src/NlpTools/Random/Distributions/Dirichlet.php",
27-
"NlpTools\Random\Distributions\AbstractDistribution"=>"/random/src/NlpTools/Random/Distributions/AbstractDistribution.php",
28-
"NlpTools\Clustering\CentroidFactories\Hamming"=>"/clustering/hamming_centroid.php",
29-
"NlpTools\Clustering\CentroidFactories\Euclidean"=>"/clustering/euclidean_centroid.php",
30-
"NlpTools\Clustering\CentroidFactories\CentroidFactory"=>"/clustering/centroid_factory.php",
31-
"NlpTools\Clustering\Clusterer"=>"/clustering/cluster.php",
32-
"NlpTools\Clustering\KMeans"=>"/clustering/k_means.php",
33-
"NlpTools\Clustering\CentroidFactories\MeanAngle"=>"/clustering/mean_angle_centroid.php",
34-
"NlpTools\Classifiers\MultinomialNBClassifier"=>"/classifier/multinomial_nb_classifier.php",
35-
"NlpTools\Classifiers\Classifier"=>"/classifier/classifier.php",
36-
"NlpTools\Classifiers\FeatureBasedLinearClassifier"=>"/classifier/feature_based_linear_classifier.php",
37-
"NlpTools\Similarity\JaccardIndex"=>"/similarity/jaccard_index.php",
38-
"NlpTools\Similarity\Euclidean"=>"/similarity/euclidean.php",
39-
"NlpTools\Similarity\Distance"=>"/similarity/distance.php",
40-
"NlpTools\Similarity\Simhash"=>"/similarity/simhash.php",
41-
"NlpTools\Similarity\CosineSimilarity"=>"/similarity/cosine_similarity.php",
42-
"NlpTools\Similarity\Similarity"=>"/similarity/similarity.php",
43-
"NlpTools\Similarity\HammingDistance"=>"/similarity/hamming.php",
44-
"NlpTools\Stemmers\RegexStemmer"=>"/stemmers/regex_stemmer.php",
45-
"NlpTools\Stemmers\Stemmer"=>"/stemmers/stemmer.php",
46-
"NlpTools\Stemmers\PorterStemmer"=>"/stemmers/porter_stemmer.php",
47-
"NlpTools\Optimizers\FeatureBasedLinearOptimizer"=>"/optimizers/feature_based_optimizer.php",
48-
"NlpTools\Optimizers\MaxentGradientDescent"=>"/optimizers/maxent_grad_descent.php",
49-
"NlpTools\Optimizers\ExternalMaxentOptimizer"=>"/optimizers/external_maxent_optimizer.php",
50-
"NlpTools\Optimizers\MaxentOptimizer"=>"/optimizers/maxent.php",
51-
"NlpTools\Optimizers\GradientDescentOptimizer"=>"/optimizers/grad_descent.php",
52-
"NlpTools\Documents\TokensDocument"=>"/documents/tokens_document.php",
53-
"NlpTools\Documents\Document"=>"/documents/document.php",
54-
"NlpTools\Documents\TrainingSet"=>"/documents/training_set.php",
55-
"NlpTools\Documents\WordDocument"=>"/documents/word_document.php",
56-
"NlpTools\Documents\TrainingDocument"=>"/documents/training_document.php",
57-
);
58-
59-
if (isset($files[$name]))
3+
spl_autoload_register(function ($className) {
4+
$className = ltrim($className,'\\');
5+
$fileName = __DIR__.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR;
6+
$namespace = '';
7+
$lastNsPos = strrpos($className,'\\');
8+
if ($lastNsPos!==false)
609
{
61-
include(__DIR__.$files[$name]);
10+
$namespace = substr($className,0,$lastNsPos);
11+
$className = substr($className,$lastNsPos+1);
12+
$fileName .= str_replace('\\',DIRECTORY_SEPARATOR,$namespace).DIRECTORY_SEPARATOR;
6213
}
63-
else
64-
{
65-
throw new Exception("Class not found $name");
66-
}
67-
});
14+
$fileName .= str_replace('_',DIRECTORY_SEPARATOR,$className).'.php';
15+
16+
if (file_exists($fileName))
17+
require($fileName);
18+
});
6819

69-
?>

classifier/classifier.php

-17
This file was deleted.

classifier/feature_based_linear_classifier.php

-67
This file was deleted.

classifier/multinomial_nb_classifier.php

-74
This file was deleted.

clustering/centroid_factory.php

-20
This file was deleted.

clustering/cluster.php

-30
This file was deleted.

clustering/euclidean_centroid.php

-54
This file was deleted.

0 commit comments

Comments
 (0)