[libfann] 195/242: minor changes and eclips project
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
chrisk-guest pushed a commit to tag Version2_0_0
in repository libfann.
commit 51825957d0254548db1b75cc99f3f2f1b2760a20
Author: Steffen Nissen <lukesky at diku.dk>
Date: Mon Sep 26 19:15:16 2005 +0000
minor changes and eclips project
---
.cdtproject | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
.project | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/fann.c | 12 ++++++--
src/fann_cascade.c | 4 +--
4 files changed, 178 insertions(+), 5 deletions(-)
diff --git a/.cdtproject b/.cdtproject
new file mode 100644
index 0000000..21f18cd
--- /dev/null
+++ b/.cdtproject
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-cdt version="2.0"?>
+
+<cdtproject id="org.eclipse.cdt.make.core.make">
+<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.ELF"/>
+<extension point="org.eclipse.cdt.core.CIndexer" id="org.eclipse.cdt.core.domsourceindexer"/>
+<data>
+<item id="scannerConfiguration">
+<autodiscovery enabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile" problemReportingEnabled="true"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction useDefault="true" command="make" arguments="-f ${project_name}_scd.mk"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+</item>
+<item id="org.eclipse.cdt.core.pathentry">
+<pathentry kind="src" path=""/>
+<pathentry kind="out" path=""/>
+<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+</item>
+<item id="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="all" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>all</buildTarget>
+<stopOnError>false</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+</target>
+<target name="debug" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="examples">
+<buildCommand>make</buildCommand>
+<buildArguments>debug</buildArguments>
+<buildTarget>debug</buildTarget>
+<stopOnError>false</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+</target>
+<target name="compiletest" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="examples">
+<buildCommand>make</buildCommand>
+<buildArguments>compiletest</buildArguments>
+<buildTarget>compiletest</buildTarget>
+<stopOnError>false</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+</target>
+</buildTargets>
+</item>
+</data>
+</cdtproject>
diff --git a/.project b/.project
new file mode 100644
index 0000000..0b61b46
--- /dev/null
+++ b/.project
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>fann</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.make.core.makeBuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.arguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.core.errorOutputParser</key>
+ <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.environment</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.inc</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.clean</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.command</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.full</key>
+ <value>clean all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.auto</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>false</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.make.core.makeNature</nature>
+ <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
+ </natures>
+</projectDescription>
diff --git a/src/fann.c b/src/fann.c
index ac2f6b3..3654e1b 100644
--- a/src/fann.c
+++ b/src/fann.c
@@ -163,7 +163,7 @@ FANN_EXTERNAL struct fann *FANN_API fann_create_sparse_array(float connection_ra
for(layer_it = ann->first_layer + 1; layer_it != ann->last_layer; layer_it++)
{
num_neurons_out = layer_it->last_neuron - layer_it->first_neuron - 1;
- /*�if all neurons in each layer should be connected to at least one neuron
+ /*�if all neurons in each layer should be connected to at least one neuron
* in the previous layer, and one neuron in the next layer.
* and the bias node should be connected to the all neurons in the next layer.
* Then this is the minimum amount of neurons */
@@ -939,7 +939,9 @@ FANN_EXTERNAL void FANN_API fann_init_weights(struct fann *ann, struct fann_trai
FANN_EXTERNAL void FANN_API fann_print_parameters(struct fann *ann)
{
struct fann_layer *layer_it;
+#ifndef FIXEDFANN
unsigned int i;
+#endif
printf("Input layer :%4d neurons, 1 bias\n", ann->num_input);
for(layer_it = ann->first_layer + 1; layer_it != ann->last_layer - 1; layer_it++)
@@ -963,11 +965,14 @@ FANN_EXTERNAL void FANN_API fann_print_parameters(struct fann *ann)
#ifdef FIXEDFANN
printf("Decimal point :%4d\n", ann->decimal_point);
printf("Multiplier :%4d\n", ann->multiplier);
-#endif
+#else
printf("Training algorithm : %s\n", FANN_TRAIN_NAMES[ann->training_algorithm]);
printf("Training error function : %s\n", FANN_ERRORFUNC_NAMES[ann->train_error_function]);
printf("Training stop function : %s\n", FANN_STOPFUNC_NAMES[ann->train_stop_function]);
- printf("Bit fail limit : %5.2f\n", ann->bit_fail_limit);
+#endif
+#ifdef FIXEDFANN
+ printf("Bit fail limit :%4d\n", ann->bit_fail_limit);
+#else
printf("Learning rate : %5.2f\n", ann->learning_rate);
printf("Quickprop decay : %9.6f\n", ann->quickprop_decay);
printf("Quickprop mu : %5.2f\n", ann->quickprop_mu);
@@ -990,6 +995,7 @@ FANN_EXTERNAL void FANN_API fann_print_parameters(struct fann *ann)
printf("Cascade candidate groups :%4d\n", ann->cascade_num_candidate_groups);
printf("Cascade no. of candidates :%4d\n", fann_get_cascade_num_candidates(ann));
+#endif
}
FANN_GET(unsigned int, num_input)
diff --git a/src/fann_cascade.c b/src/fann_cascade.c
index bc367a1..cff08c1 100644
--- a/src/fann_cascade.c
+++ b/src/fann_cascade.c
@@ -994,7 +994,7 @@ FANN_EXTERNAL void fann_set_cascade_activation_functions(struct fann *ann,
}
}
- memmove(ann->cascade_activation_functions, cascade_activation_functions,
+ memcpy(ann->cascade_activation_functions, cascade_activation_functions,
ann->cascade_activation_functions_count * sizeof(enum fann_activationfunc_enum));
}
@@ -1022,6 +1022,6 @@ FANN_EXTERNAL void fann_set_cascade_activation_steepnesses(struct fann *ann,
}
}
- memmove(ann->cascade_activation_steepnesses, cascade_activation_steepnesses,
+ memcpy(ann->cascade_activation_steepnesses, cascade_activation_steepnesses,
ann->cascade_activation_steepnesses_count * sizeof(fann_type));
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git
More information about the debian-science-commits
mailing list