TOPLEVEL_MAJOR_VERSION = 0
-TOPLEVEL_MINOR_VERSION = 0
-TOPLEVEL_PATCH_LEVEL = 78
-# use to send patches, always empty for released version:
-# include separator: ".postfix", "-pl" makes rpm barf
+TOPLEVEL_MINOR_VERSION = 1
+TOPLEVEL_PATCH_LEVEL = 0
+# use to send patches, always empty for released version:
+# include separator: ".postfix", don't use -,
+# it makes rpm barf
TOPLEVEL_MY_PATCH_LEVEL =
echo "export PATH=$PATH:$lelie/current/bin/out/"
fi
-configure --prefix=$root --enable-debugging --enable-printing --enable-checking
+configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
if test $warn_b = "yes" ; then
cat <<EOF
- *******************************
- Warning: configure found errors.
- Please resolve these and rerun configure
- before sending any bugreports.
- *******************************
+ **************************************************
+ Warning: configure encountered warnings or errors.
+ Please try to resolve these, and rerun configure
+ before sending a bugreport.
+ If you cannot resolve some warnings, the make
+ process may still be succesful, but be warned.
+ **************************************************
EOF
fi
Line_spacer *sp =generate_spacing_problem(curline);
Col_hpositions colhpos;
colhpos.cols = curline;
- colhpos.energy = INFTY;
+ colhpos.energy = INFTY_f;
colhpos.ugh_b_ = true;
colhpos.config = sp->default_solution();
delete sp;
Col_hpositions::Col_hpositions()
{
- energy = INFTY;
+ energy = INFTY_f;
ugh_b_ = false;
}
*/
#ifndef CONST_HH
#define CONST_HH
+#include <limits.h>
#include <math.h>
#include "real.hh"
const Real INFTY=HUGE_VAL;
+const Real INFTY_f=(Real)INT_MAX;
+
#endif
virtual bool do_try_request( Request* req_l );
virtual bool try_request(Request*r) { return Performer::try_request(r) ; }
+ // <ugh>
+ virtual void set_track( int& track_i_r );
+ virtual int get_track_i() const;
+ // </ugh>
+
protected:
virtual Translator* find_get_translator_l( String name, String id );
bool is_bottom_performer_b() const;
virtual Performer_group_performer* find_performer_l( String name, String id );
-
virtual void do_print()const;
+
private:
Pointer_list<Performer*> perf_p_list_;
virtual void process_requests();
virtual void set( Moment mom );
+ // <ugh>
+ virtual void set_track( int& track_i_r );
+ virtual int get_track_i() const;
+ // </ugh>
+
virtual bool try_request( Request* req_l );
virtual void do_removal_processing();
virtual void play_event( Midi_item* l );
virtual void do_removal_processing();
virtual void do_creation_processing();
+ // <ugh>
+ virtual void set_track( int& track_i_r );
+ virtual int get_track_i() const;
+ // </ugh>
private:
void header();
Moment midi_mom_;
Midi_track* midi_track_p_;
+
+ int track_i_;
};
#endif // STAFF_PERFORMER_HH
int
min_elt_index(Vector v)
{
- Real m=INFTY; int idx=-1;
+ Real m=INFTY_f;
+ int idx=-1;
for (int i = 0; i < v.dim(); i++){
if (v(i) < m) {
idx = i;
m = v(i);
}
- assert(v(i) <= INFTY);
+ assert(v(i) <= INFTY_f);
}
return idx;
}
if (direction.norm() > EPS) {
mtor << act.status() << '\n';
- Real minalf = INFTY;
+ Real minalf = INFTY_f;
Inactive_iter minidx(act);
return;
// ugh, need to know channel (===track===staff) too
- int channel_i = 0;
+ int channel_i = get_track_i();
Moment mom = get_mom();
if ( !off_mom_ ) { // start note
off_mom_ = mom + note_req_l_->duration();
i->process_requests();
}
+//<ugh>
+int
+Performer_group_performer::get_track_i() const
+{
+ int track_i = Performer::get_track_i();
+
+ for ( int i = 0; i < nongroup_l_arr_.size(); i++ )
+ nongroup_l_arr_[ i ]->set_track( track_i );
+
+ return track_i;
+}
+
+void
+Performer_group_performer::set_track( int& track_i_r )
+{
+ for ( PCursor<Performer*> i( perf_p_list_.top() ); i.ok(); i++ )
+ i->set_track( track_i_r );
+}
+//</ugh>
+
bool
Performer_group_performer::do_try_request( Request* req_l )
{
{
}
+//<ugh>
+int
+Performer::get_track_i() const
+{
+ return daddy_perf_l_->get_track_i();
+}
+
+void
+Performer::set_track( int& )
+{
+}
+//</ugh>
+
bool
Performer::do_try_request( Request* req_l )
{
trans_l->start();
while ( iter->ok() || trans_l->moments_left_i() ) {
- Moment w = INFTY;
+ Moment w = INFTY_f;
if (iter->ok() ) {
w = iter->next_moment();
iter->print();
#include <math.h>
+#include <limits.h>
#include "spring-spacer.hh"
#include "p-col.hh"
#include "debug.hh"
assert(sol_vec.dim());
Array<bool> fix_b_arr;
fix_b_arr.set_size(cols.size() + loose_col_arr_.size());
- Real utter_right_f=-INFTY;
- Real utter_left_f =INFTY;
+ Real utter_right_f=-INFTY_f;
+ Real utter_left_f =INFTY_f;
for (int i=0; i < loose_col_arr_.size(); i++) {
fix_b_arr[loose_col_arr_[i].rank_i_] = false;
}
}
if ( d_iter.ok() && now >= d_iter.when()) {
Durations_iter d2 = d_iter;
- Moment shortest = INFTY;
+ Moment shortest = (Real)INT_MAX; //ugh INFTY;
while (d2.ok() && d2.when() <= now) {
shortest = shortest <? d2.duration();
d2.next();
// lieve wendy, nu heb je mijn track_i_ / get_staff_i weggehaald...
// zie ook note-performer: ugh
// ugh, need to know channel (===track===staff) too
- int channel_i = 0;
+ int channel_i = track_i_;
Midi_instrument instrument( channel_i, instrument_str() );
midi_track_p_->add( Moment( 0 ), &instrument );
midi_track_p_->add( delta_t, l);
}
+
+//<ugh>
+int
+Staff_performer::get_track_i() const
+{
+ return track_i_;
+}
+
+void
+Staff_performer::set_track( int& track_i_r )
+{
+ track_i_ = track_i_r++;
+}
+//</ugh>
+
Interval__instantiate(Rational);
Interval__instantiate(int);
-#ifdef AIX
-const Real INFTY = 1e8; // ARGh. AIX sucks
+const Real INFTY_f = (Real)INT_MAX;
+#if defined AIX || defined _WIN32
+const Real INFTY = 1e8; // ARGh. AIX sucks -- so does doze
#else
const Real INFTY = HUGE_VAL;
#endif
current = stupid_solution(current.cols);
current.energy = - 1; // make sure we break out.
} else
- current.energy = INFTY; // make sure we go back
+ current.energy = INFTY_f; // make sure we go back
} else {
current = solve_line(current.cols);
current.print();
projects / lilypond.git / commitdiff