eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 01:39:19 +02:00
Code Issues 123 Wiki Activity

Wyrzucenie niepotrzebnych plików mover.

Browse Source 
Rozpoczecie wyrzucania zmiennych Borlanda.
This commit is contained in:
firleju
2016-10-17 06:47:35 +02:00
parent 529f70123a
commit ab34354584
14 changed files with 132 additions and 2033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1059
McZapkie/MOVER.h
View File

File diff suppressed because it is too large Load Diff

21
McZapkie/Mover.cpp
View File

@@ -6,30 +6,27 @@ distributed with this file, You can
obtain one at
http://mozilla.org/MPL/2.0/.
*/
#include "system.hpp"
#include "classes.hpp"
#include <MATH.H>
#include <FLOAT.H>
#include <typeinfo>
#include <fstream> // std::ifstream
#include <sstream>
#include <istream>
#include <istream>
#include <iostream>
#include <stdio.h> // sprintf()
#include <stdlib.h>
#include <math.h>
#include <cmath>
#include <math>
#include <stdio.h>
#include "Mover.h"
#include "globals.h"
#include "qutils.h"
#include "mctools.hpp"
#include "logs.h"
#include "hamulce.hpp"
#include "Oerlikon_ESt.hpp"
#include "../globals.h"
//#include "../qutils.h"
#include "mctools.h"
#include "../logs.h"
#include "hamulce.h"
#include "Oerlikon_ESt.h"
//---------------------------------------------------------------------------
#pragma package(smart_init)
@@ -37,7 +34,7 @@ http://mozilla.org/MPL/2.0/.
// Jeœli jakieœ zmienne nie s¹ u¿ywane w mover.pas, te¿ mo¿na je przenosiæ.
// Przeniesienie wszystkiego na raz zrobi³o by zbyt wielki chaos do ogarniêcia.
const dEpsilon = 0.01; // 1cm (zale¿y od typu sprzêgu...)
const double dEpsilon = 0.01; // 1cm (zale¿y od typu sprzêgu...)
const double CouplerTune = 0.1; // skalowanie tlumiennosci
long Trunc(float f)
@@ -64,7 +61,7 @@ double TMoverParameters::current(double n, double U)
// w zaleznosci od polozenia nastawnikow MainCtrl i ScndCtrl oraz predkosci obrotowej n
// a takze wywala bezpiecznik nadmiarowy gdy za duzy prad lub za male napiecie
// jest takze mozliwosc uszkodzenia silnika wskutek nietypowych parametrow
const ep09resED = 5.8; // TODO: dobrac tak aby sie zgadzalo ze wbudzeniem
const float ep09resED = 5.8; // TODO: dobrac tak aby sie zgadzalo ze wbudzeniem
double R, MotorCurrent;
double Rz, Delta, Isf;

5
McZapkie/Oerlikon_ESt.h
View File

@@ -19,10 +19,7 @@ http://mozilla.org/MPL/2.0/.
#include "hamulce.h" // Pascal unit
#include "friction.h" // Pascal unit
#include <SysUtils.hpp> // Pascal unit
#include <mctools.hpp> // Pascal unit
#include <SysInit.hpp> // Pascal unit
#include <System.hpp> // Pascal unit
#include "mctools.h" // Pascal unit
#include <string>
/*

14
McZapkie/Oerlikon_ESt.hpp
View File

@@ -11,9 +11,9 @@
#pragma option push -w-
#pragma option push -Vx
#include <hamulce.h> // Pascal unit
#include <friction.hpp> // Pascal unit
#include <friction.h> // Pascal unit
#include <SysUtils.hpp> // Pascal unit
#include <mctools.hpp> // Pascal unit
#include <mctools.h> // Pascal unit
#include <SysInit.hpp> // Pascal unit
#include <System.hpp> // Pascal unit
@@ -23,17 +23,17 @@ namespace Oerlikon_est
{
//-- type declarations -------------------------------------------------------
class DELPHICLASS TPrzekladnik;
class PASCALIMPLEMENTATION TPrzekladnik : public Hamulce::TReservoir
class PASCALIMPLEMENTATION TPrzekladnik : public TReservoir
{
typedef Hamulce::TReservoir inherited;
typedef TReservoir inherited;
public:
Hamulce::TReservoir* *BrakeRes;
Hamulce::TReservoir* *Next;
TReservoir* *BrakeRes;
TReservoir* *Next;
virtual void __fastcall Update(double dt);
public:
#pragma option push -w-inl
/* TReservoir.Create */ inline __fastcall TPrzekladnik(void) : Hamulce::TReservoir() { }
/* TReservoir.Create */ inline __fastcall TPrzekladnik(void) : TReservoir() { }
#pragma option pop
public:

151
McZapkie/mctools.cpp
View File

@@ -13,24 +13,24 @@ Copyright (C) 2007-2014 Maciej Cierniak
*/
#include "mctools.h"
#include <cmath>
#include <istream>
#include <fstream>
using namespace std;
/*================================================*/
std::string Ups(std::string s)
{
int jatka;
std::string swy;
swy = "";
{
long jatka_end = s.length() + 1;
for (jatka = 0; jatka < jatka_end; jatka++)
swy = swy + UpCase(s[jatka]);
}
return swy;
} /*=Ups=*/
//std::string Ups(std::string s)
//{
// int jatka;
// std::string swy;
//
// swy = "";
// {
// long jatka_end = s.length() + 1;
// for (jatka = 0; jatka < jatka_end; jatka++)
// swy = swy + UpCase(s[jatka]);
// }
// return swy;
//} /*=Ups=*/
int Max0(int x1, int x2)
{
@@ -50,22 +50,18 @@ int Min0(int x1, int x2)
double Max0R(double x1, double x2)
{
double result;
if (x1 > x2)
Max0R = x1;
return x1;
else
Max0R = x2;
return result;
return x2;
}
double Min0R(double x1, double x2)
{
double result;
if (x1 < x2)
Min0R = x1;
return x1;
else
Min0R = x2;
return result;
return x2;
}
int Sign(double x)
@@ -111,7 +107,7 @@ bool FuzzyLogic(double Test, double Threshold, double Probability)
{
if ((Test > Threshold) && (!DebugModeFlag))
return
(Random < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/;
(Random() < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/;
else
return false;
}
@@ -120,53 +116,48 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability)
{
if ((Test > Threshold))
return
(Random < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/;
(Random() < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/;
else
return false;
}
std::string ReadWord(std::ifstream &infile)
std::string ReadWord(std::ifstream& infile)
{
std::string result;
std::string s;
std::string s = "";
char c;
bool nextword;
bool nextword = false;
s = "";
nextword = false;
while ((!eof(infile)) && (!nextword))
while ((!infile.eof()) && (!nextword))
{
read(infile, c);
if (c in _Spacesigns)
infile.get(c);
if (_spacesigns.find(c) != string::npos)
if (s != "")
nextword = true;
if (!(c in _Spacesigns))
s = s + c;
if (_spacesigns.find(c) == string::npos)
s += c;
}
ReadWord = s;
return result;
return s;
}
std::string Cut_Space(std::string s, int Just)
{
std::string result;
unsigned char ii;
int ii;
switch (Just)
{
case CutLeft:
{
ii = 0;
while ((ii < length(s)) && (s[ii + 1] == _SPACE))
while ((ii < s.length()) && (s[ii + 1] == _SPACE))
++ii;
s = Copy(s, ii + 1, length(s) - ii);
s = s.substr(ii + 1, s.length() - ii);
}
case CutRight:
{
ii = length(s);
ii = s.length();
while ((ii > 0) && (s[ii] == _SPACE))
--ii;
s = Copy(s, 1, ii);
s = s.substr(0, ii);
}
case CutBoth:
{
@@ -174,8 +165,7 @@ std::string Cut_Space(std::string s, int Just)
s = Cut_Space(s, CutRight);
}
}
Cut_Space = s;
return result;
return s;
}
/*Cut_Space*/
@@ -214,30 +204,37 @@ std::string DWE(std::string s) /*Delete While Equal sign*/
std::string Ld2Sp(std::string s) /*Low dash to Space sign*/
{
std::string s2 = "";
char tmp[] = { "_" };
//std::string s2 = "";
char tmp[] = { (char)"_", (char)" " };
for (int b = 0; b < s.length(); ++b)
{
if (s[b] == tmp[0])
s2 = s2 + " ";
else
s2 = s2 + s[b];
}
return s2;
s[b] = tmp[1];
//{
// if (s[b] == tmp[0])
// s2 = s2 + " ";
// else
// s2 = s2 + s[b];
//}
// return s2;
}
std::string Tab2Sp(std::string s) /*Tab to Space sign*/
{
std::string s2 = "";
char tmp[] = { (char)9 };
//std::string s2 = "";
char tmp[] = { (char)9, (char)" " };
for (int b = 0; b < s.length(); ++b)
{
if (s[b] == tmp[0])
s2 = s2 + " ";
else
s2 = s2 + s[b];
s[b] = tmp[0];
}
return s2;
return s;
//{
// if (s[b] == tmp[0])
// s2 = s2 + " ";
// else
// s2 = s2 + s[b];
//}
//return s2;
}
void ComputeArc(double X0, double Y0, double Xn, double Yn, double R, double L, double dL,
@@ -288,9 +285,9 @@ void ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double R
if (dX != 0)
gamma = atan(dY * 1.0 / dX);
else if (dY > 0)
gamma = Pi * 1.0 / 2;
gamma = pi * 1.0 / 2;
else
gamma = 3 * Pi * 1.0 / 2;
gamma = 3 * pi * 1.0 / 2;
if (R != 0)
alfa = L * 1.0 / R;
Xout = X0 + L * cos(alfa * 1.0 / 2 - gamma);
@@ -301,44 +298,36 @@ void ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double R
double Xhor(double h)
{
double result;
Xhor = h * Hstep + Xmin;
return result;
return h * Hstep + Xmin;
}
double Yver(double v)
{
double result;
Yver = (Vsize - v) * Vstep + Ymin;
return result;
return (Vsize - v) * Vstep + Ymin;
}
long Horiz(double x)
{
long result;
x = (x - Xmin) * 1.0 / Hstep;
if (x > -MaxInt)
if (x < MaxInt)
Horiz = Round(x);
if (x > -INT_MAX)
if (x < INT_MAX)
return Round(x);
else
Horiz = MaxInt;
return INT_MAX;
else
Horiz = -MaxInt;
return result;
return -INT_MAX;
}
long Vert(double Y)
{
long result;
Y = (Y - Ymin) * 1.0 / Vstep;
if (Y > -MaxInt)
if (Y < MaxInt)
Vert = Vsize - Round(Y);
if (Y > -INT_MAX)
if (Y < INT_MAX)
return Vsize - Round(Y);
else
Vert = MaxInt;
return INT_MAX;
else
Vert = -MaxInt;
return result;
return -INT_MAX;
}
void ClearPendingExceptions()

20
McZapkie/mctools.h
View File

@@ -16,8 +16,10 @@ http://mozilla.org/MPL/2.0/.
/*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/
#include <string>
#include <istream>
#include <fstream>
#include <time.h>
using namespace std;
/*Ra: te sta³e nie s¹ u¿ywane...
_FileName = ['a'..'z','A'..'Z',':','\','.','*','?','0'..'9','_','-'];
@@ -31,6 +33,7 @@ http://mozilla.org/MPL/2.0/.
static char _EOL[2] = { (char)13, (char)10 };
//static char const _SPACE = " ";
static char _Spacesigns[4] = { (char)" ",(char)9, (char)13, (char)10};
static string _spacesigns = " " + (char)9 + (char)13 + (char)10;
static int const CutLeft = -1;
static int const CutRight = 1;
static int const CutBoth = 0; /*Cut_Space*/
@@ -54,6 +57,17 @@ double Max0R(double x1, double x2);
double Min0R(double x1, double x2);
int Sign(double x);
inline long Round(float f)
{
return (long)(f + 0.5);
//return lround(f);
}
inline int Random()
{
srand(time(NULL));
return rand();
}
/*funkcje logiczne*/
bool TestFlag(int Flag, int Value);
@@ -66,8 +80,8 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability);
/*to samo ale zawsze niezaleznie od DebugFlag*/
/*operacje na stringach*/
std::string ReadWord( std::ifstream & infile); /*czyta slowo z wiersza pliku tekstowego*/
std::string Ups(std::string s);
std::string ReadWord( std::ifstream& infile); /*czyta slowo z wiersza pliku tekstowego*/
//std::string Ups(std::string s);
std::string Cut_Space(std::string s, int Just);
std::string ExtractKeyWord(std::string InS, std::string KeyWord); /*wyciaga slowo kluczowe i lancuch do pierwszej spacji*/
std::string DUE(std::string s); /*Delete Until Equal sign*/